Home
Merge branch 'master' of https://github.com/VladAbramov/work-project

Conflicts:
	src/main/java/by/premia/olga/project/controller/AdminController.java
	src/main/java/by/premia/olga/project/util/Pages.java
	src/main/webapp/WEB-INF/config/spring-security.xml
	src/main/webapp/WEB-INF/tags/navbar.tag