refactoring
Merge remote-tracking branch 'origin/feature/admin' into feature/admin

Conflicts:
	build.gradle
	novotvir.iml
	src/main/resources/conf/spring/services.xml