Users form
Users form
Wery big change
Merge branch 'branch_01'

Conflicts:
	src/main/java/com/company/permgen/webapp/controller/UserController.java
	src/main/java/com/company/permgen/webapp/utils/DbUtil.java
	src/main/webapp/WEB-INF/pages/header.jsp
	src/main/webapp/WEB-INF/security.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/company/permgen/webapp/model/User.java
	src/main/resources/dataSource.xml
	src/main/webapp/WEB-INF/security.xml