one shot
Merge branch 'develop' into feature/start_and_end_trip_location

Conflicts:
	client/app/views/admin/disposition/DispositionView.js
Review.