Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/educoder into develop

app/controllers/home_controller.rb

@@ -29,7 +29,7 @@ class HomeController < ApplicationController
     @subjects = Subject.where(homepage_show: 1).includes(:shixuns, :repertoire).limit(8)
 
     @tea_users = User.where(homepage_teacher: 1).includes(:user_extension).limit(10).order("experience desc")
-    @stu_users = User.includes(:user_extension).where(user_extensions: {identity: 1}).limit(10).order("experience desc")
+    @stu_users = User.where(is_test: 0).includes(:user_extension).where(user_extensions: {identity: 1}).limit(10).order("experience desc")
   end
 
   def search