BZ-12246 Mark-up for branding settings
Merge branch 'master' of https://github.com/NoesisEnergy/bootstrap

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