Merge remote-tracking branch 'origin/refactor_kanpe' into refactor_yota
hotel_search を hotels_search に直す(完全版)

Update:   app/assets/javascripts/plans.js
Update:   app/views/plans/tabs/_hotel.html.erb
Update:   config/routes.rb
Rename addplanCallback -> addCardToPlan

Modified:   plans.js
Merge remote-tracking branch 'remotes/origin/refactor_yota' into refactor_kanpe

Conflicts:
	app/assets/javascripts/plans.js
Refator format rakuten api data before return

Modified:   assets/javascripts/plans.js
Modified:   services/rakuten_service.rb