Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

app/views/layouts/_project_info.html.erb

@@ -1,6 +1,6 @@
 <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %>
-<% teacher_num = 0 %>
+<% teacher_num = TeacherAndAssistantCount(@course) %>
-<% student_num = 0 %>
+<% student_num = studentCount(@course) %>
 <div class="pr_info_logo fl mr10 mb5">
   <% if is_excellent_course(@course) %>
     <img src="/images/course/boutique.png" width="50" height="auto" alt="精品" class="boutiqueP" />