Merge remote-tracking branch 'origin/szzh' into szzh

app/views/courses/_course.html.erb

@@ -73,7 +73,7 @@
 			<%= l(:lable_course_end)  %>
 		</span>
       <% else %>
-          <%#= join_in_course_for_list(@course, User.current,['regular'])%>
+          <%= join_in_course_for_list(@course, User.current,['regular'])%>
       <% end -%>
 	</div>
 </div>

app/views/repositories/show.html.erb

@@ -17,7 +17,6 @@
             版本库地址：<%= h @repository.url %>
         <% end %>
         <!-- added by bai -->
-        <div class="fb"><a href="http://<%=Setting.host_name %>/forums/1/memos/1232" class=" c_blue ">点击查看如何提交代码</a></div>
         <div class="cl"></div>
       </div>
   <% else %>