mockito test
Merge branch 'master' of https://github.com/vsomov/SchoolPortal

Conflicts:
	school-web/src/main/java/school/controller/GlobalHandlerException.java