Правка меню
Merge branch 'master' of github.com:sanerrus/java.stroy

Conflicts:
	WEB-INF/templates/adminpage.vm
	WEB-INF/templates/index.vm