some changes
fcommit
Merge branch 'master' of https://github.com/nromanen/Ch-025 into hash

Conflicts:
	SSEL/src/main/resources/messages_en.properties
	SSEL/src/main/resources/messages_ru.properties
	SSEL/src/main/resources/messages_ua.properties
Merge branch 'master' into roma

Conflicts:
	SSEL/src/main/java/com/softserve/controller/TeacherController.java
TeacherController mergeconflict, delete unusing files