BZ-9036: city switcher
Merge branch 'master' of https://github.com/NoesisEnergy/bootstrap.git

Conflicts:
	src/main/js/noesis/bootstrap/community/controllers/communityController.js
merge fixer