change view categories
Merge branch 'master' into ivan
change eclipse component
Merge branch 'master' into ivan
relocate admin pages
set to list
add subjects
Merge branch 'master' into ivan
change spring validation
changes
Merge branch 'master' of https://github.com/nromanen/Ch-025 into hash

Conflicts:
	SSEL/src/main/java/com/softserve/controller/TeacherController.java
UpDown
change subjects page in admin
add language, no users
commit for sdc
Merge branch 'master' of https://github.com/nromanen/Ch-025 into hash

Conflicts:
	SSEL/.classpath
	SSEL/src/main/webapp/WEB-INF/views/teacher/editTopic.jsp
add relocation and users
ff
merge vs mater
Merge branch 'master' into roma

Conflicts:
	SSEL/.classpath
	SSEL/src/main/java/com/softserve/service/UserService.java
	SSEL/src/main/java/com/softserve/validator/RegistrationValidation.java
	SSEL/src/main/resources/messages_en.properties
	SSEL/src/main/resources/messages_ru.properties
	SSEL/src/main/resources/messages_ua.properties
	SSEL/src/main/webapp/WEB-INF/views/pages/login.jsp