Merge branch 'master' of github.com:RyuPiT/SharePla
Merge branch 'master' into googlemap_search
Fix search-hotel -> hotel-search

Modified:   app/assets/javascripts/plans.js
Modified:   app/views/plans/tabs/_hotel.html.erb
Merge branch 'refactor_kanpe'