DB PreMerge 20131206
Merge branch 'Deployment-LAPLUS' of https://github.com/tarpitgrover/Cab9 into MergeTarpitBranch

Conflicts:
	drivers/DriverModule.js
	master/angular/masterModule.js
DB Changes
TG WIP 08122013