Modified:   app/views/plans/tabs/_hotel.html.haml
Modified:   app/views/plans/tabs/_place.html.haml
Deleted:    app/views/plans/tabs/_place.html.erb
Merge branch 'haml' into HEAD