new try
Merge branch 'master' of https://github.com/vsomov/SchoolPortal.git
add-new fitch with profile
Merge branch 'master' of https://github.com/vsomov/SchoolPortal.git

Conflicts:
	school-service/src/main/java/school/service/ScheduleService.java
	school-service/src/main/java/school/service/implementation/ScheduleServiceImpl.java