Merge branch 'master' into use_haml
showのページをhtmlからhamlに変更
Merge remote-tracking branch 'origin/master' into use_haml
layouts/_headerをhamlに変更
layouts/_footerをhamlに変更
layouts/applicationをhamlに変更
Merge remote-tracking branch 'origin/master' into use_haml
plans/indexをhamlに変更

cssのtypo修正
rspecのdescribe部分をhamlに修正
plans/_addplan_formをhamlに変更
plans/_saveplan_formをhamlに変更
Merge remote-tracking branch 'origin/master' into use_haml

Conflicts:
	app/assets/stylesheets/plans.css.scss
plans/newをhamlに変更 (html2hamlサービスを使用)
Add new file:   app/views/plans/tabs/_hotel.html.haml
Deleted:    app/views/plans/tabs/_hotel.html.erb
Add new file:   app/views/plans/tabs/_message.html.haml
Modified:   app/views/plans/tabs/_message.html.haml
Deleted:    app/views/plans/tabs/_message.html.erb
Change "'data-toggle' =>  'tab'" to  data{toggle: 'tab'}
Add file:   app/views/plans/tabs/_place.html.haml
Modified:   app/views/plans/tabs/_hotel.html.haml
forgot coron.
data{toggle: 'tab'} => data: {toggle: 'tab'}