commit
Merge branch 'Deployment-LAPLUS' of https://github.com/e9-dbeech/Cab9 into Deployment-LAPLUS

Conflicts:
	master/angular/masterModule.js