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

Conflicts:
	pom.xml
Merge branch 'master' of https://github.com/vsomov/SchoolPortal.git

Conflicts:
	school-service/src/main/java/school/service/CourseService.java