Merge branch 'master' into BRC-1

Conflicts:
	borsch-web/src/main/webapp/assets/css/styles.css
	borsch-web/src/main/webapp/jsp/tiles/style.jsp