BZ-9999 fixed build
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	src/main/js/noesis/bootstrap/portfolio/controllers/facilityCreateController.js