Saving changes
Merge branch 'for-sergei' of https://github.com/skrauchenia/borsch into for-sergei

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