new design
Merge branch 'develop' of https://github.com/stserakhau/andrey_korzhenevsky into develop

Conflicts:
	borsch-web/src/main/java/com/exadel/borsch/web/controllers/IndexController.java
	borsch-web/src/main/resources/layouts.xml
	borsch-web/src/main/webapp/WEB-INF/jsp/layouts/default.jspx
	borsch-web/src/main/webapp/WEB-INF/jsp/views/admin/addDish.jspx
	borsch-web/src/main/webapp/WEB-INF/jsp/views/body.jspx
	borsch-web/src/main/webapp/WEB-INF/jsp/views/enter.jspx
	borsch-web/src/main/webapp/WEB-INF/jsp/views/header.jspx
fix problems