Merge remote-tracking branch 'remotes/origin/refactor_kanpe' into refactor_kanpe
Rename hotel_search -> hotels_search

Modified:   plans_controller.rb