BeforeDavidMerge1610
Merge https://github.com/e9-dbeech/Cab9
WIP-Booking-16102013
Commit
Merge https://github.com/e9-dbeech/Cab9 into DavidMerge1710

Conflicts:
	bookings/bookingModule.js
	bookings/partials/table-view.html
	master/angular/masterModule.js