Fix for trip modifications.
Fixed trip saving.
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	client/app/models/ServiceBooking.js
Fix for trip saving.