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

Conflicts:
	src/main/js/bootstrap.deps.js
	src/main/js/noesis/bootstrap/Entry.js
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	src/main/js/bootstrap.deps.js
	src/main/js/noesis/bootstrap/Entry.js