regstration
Merge branch 'master' of https://github.com/vsomov/SchoolPortal.git

Conflicts:
	school-service/src/main/java/school/service/implementation/UserServiceImpl.java
	school-web/pom.xml
	school-web/src/main/webapp/views/tiles/sidebar.jsp