DB Pre-Merge
Test
Merge https://github.com/e9-dbeech/Cab9 into DavidMerge0810-Cron

Conflicts:
	Controller/BookingController.cs
	bookings/partials/new-booking.html
	master/angular/masterModule.js
Commit