Departing and Arriving button now in place and working
Merge branch 'cgdevelop' into 131-arrive-depart-toggle

Conflicts:
	app/assets/javascripts/trips/trips.js
	app/views/trips/_new_or_edit_form.html.haml
	app/views/trips/_trip_form.html.haml
Merge pull request #79 from CG-CamSys/131-arrive-depart-toggle

Departing and Arriving button now in place and working
Merge branch 'cgdevelop' into 187-duplicate-trips-js