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

Conflicts:
	.idea/workspace.xml
	borsch-core/target/checkstyle-cachefile
	borsch-core/target/checkstyle-result.xml
	borsch-core/target/classes/com/exadel/borsch/dao/DishDAO.class
	borsch-core/target/classes/com/exadel/borsch/dao/impl/DishDAOImpl.class
	borsch-core/target/classes/com/exadel/borsch/dao/impl/UserDAOImpl$1.class
	borsch-core/target/classes/com/exadel/borsch/dao/impl/UserDAOImpl.class
	borsch-core/target/classes/com/exadel/borsch/entity/Dish.class
	borsch-core/target/classes/com/exadel/borsch/service/DishService.class
	borsch-core/target/classes/com/exadel/borsch/service/impl/DishServiceImpl.class
	borsch-web/src/main/webapp/WEB-INF/jsp/views/admin/addUser.jspx
	borsch-web/src/main/webapp/WEB-INF/jsp/views/admin/editUser.jspx
	borsch-web/src/main/webapp/WEB-INF/jsp/views/registration.jspx
	borsch-web/target/borsch/WEB-INF/classes/com/exadel/borsch/web/controllers/AdminController.class
	borsch-web/target/borsch/WEB-INF/classes/layouts.xml
	borsch-web/target/borsch/WEB-INF/jsp/layouts/default.jspx
	borsch-web/target/borsch/WEB-INF/jsp/views/dishes-list.jspx
	borsch-web/target/borsch/WEB-INF/jsp/views/registration.jspx
	borsch-web/target/borsch/WEB-INF/lib/borsch-core-1.0-SNAPSHOT.jar
	borsch-web/target/classes/com/exadel/borsch/web/controllers/AdminController.class
	borsch-web/target/classes/layouts.xml
	target/checkstyle-cachefile