login
Merge remote-tracking branch 'origin/master'

Conflicts:
	ASUTP/References/FacilityType/facilityTypeCtrl.js
	Common/Scripts/Application/DataService/dataSvc.js