bug fixed
add test entity and dao
merging vetall1 branch with master
working on test-logs configuration
split huge test case into 3 smaller, remove some code from controller into private methods
add location to controller
add possibility rename category
add char_js
add design admin page
add test management pages
chenge config key in liquibase
fix delete admin or change
refactor names in subject service and user service
Merge branch 'master' into ivan

Conflicts:
	SSEL/src/main/java/com/softserve/entity/ConfigurationProperty.java
	SSEL/src/main/resources/messages_en.properties
	SSEL/src/main/resources/messages_ru.properties
	SSEL/src/main/resources/messages_ua.properties
	SSEL/src/test/java/com/softserve/tests/AdministratorServiceTest.java
:wq
change names in tests
special for andriy
Merge branch 'master' of https://github.com/nromanen/Ch-025
anatoliy mode master on
Merge branch 'master' into roma

Conflicts:
	SSEL/src/main/java/com/softserve/service/impl/UserServiceImpl.java
	SSEL/src/main/resources/liquibase/v-4.0/changelog-v.4.0.xml
	SSEL/src/main/resources/messages_en.properties
	SSEL/src/main/resources/messages_ru.properties
	SSEL/src/main/resources/messages_ua.properties