fix menu
fix menu
fix menu
Merge branch 'master' of https://github.com/skrauchenia/borsch

Conflicts:
	borsch-core/src/main/java/com/exadel/borsch/dao/Dish.java
	borsch-web/src/main/resources/spring-security.xml
	borsch-web/src/main/webapp/WEB-INF/jsp/home.jsp
	borsch-web/src/main/webapp/WEB-INF/jsp/menu.jsp