General improvements
Merge branch 'master' of https://github.com/skrauchenia/borsch

Conflicts:
	borsch-web/src/main/webapp/WEB-INF/jsp/dishAdd.jsp
	borsch-web/src/main/webapp/WEB-INF/jsp/menu.jsp