Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop

app/controllers/managements_controller.rb

@@ -114,7 +114,7 @@ class ManagementsController < ApplicationController
       @users = User.where(:id => user_id).where("mail like '%#{params[:research_contents]}%'").order("created_on desc")
     elsif params[:research_condition] == "phone"
       if params[:research_contents].blank?
-        @users = User.where(:id => user_id).where("phone is null").order("created_on desc")
+        @users = User.where(:id => user_id).order("created_on desc")
       else
         @users = User.where(:id => user_id).where("phone like '%#{params[:research_contents]}%'").order("created_on desc")
       end