collision for trips from outside
Merge branch 'develop' of https://github.com/fleetster/control-tower-clean into develop

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