asdasd
check style
almost working project
Merge remote-tracking branch 'remotes/origin/master' into develop

Conflicts:
	project/borsch-web/pom.xml
	project/borsch-web/src/main/resources/applicationContext.xml
	project/borsch-web/src/main/webapp/WEB-INF/jsp/decorators/master.jsp
	project/borsch-web/src/main/webapp/WEB-INF/jsp/home.jsp
	project/borsch-web/src/main/webapp/WEB-INF/web.xml
Merge branch 'develop' of https://github.com/stserakhau/andrey_korzhenevsky into develop

Conflicts:
	.idea/workspace.xml