Merge branch 'szzh' into develop

app/views/layouts/_user_courses_list.html.erb

@@ -3,14 +3,14 @@
       <%=link_to l(:label_my_course), user_courses_user_path(User.current.id) %>
       <ul class="course_sub_menu">
         <% course_index = 0 %>
-        <% cache User.current.courses.count do%>
+
         <%  User.current.courses.each do |course| %>
             <% if !course_endTime_timeout?(course) %>
                 <%= render :partial => 'layouts/user_homework_list', :locals => {:course => course,:course_index => course_index} %>
                 <% course_index += 1 %>
             <% end %>
         <% end %>
-       <% end %>
+
       </ul>
     </li>
 <% end %>