toggle highlight class on click for amenities
Merge branch 'tablet-redesign-a' of https://github.com/bensbigolbeard/marsattracts into tab-redez-merge

Conflicts:
	app/assets/javascripts/main.js
	app/controllers/trips_controller.rb
	app/views/flights/index.html.haml
Minor fix to toggle before pushing branch
Add placeholder text to select boxes
Merge branch 'tablet-redesign-a' into tab-redez-merge

Conflicts:
	app/views/flights/index.html.haml
Adjust trip PUT method to always send to correct trip
toggle highlight class on click for amenities
Minor fix to toggle before pushing branch
Add placeholder text to select boxes
Adjust trip PUT method to always send to correct trip
Merge things.