Merge branch 'feature/admin' of https://github.com/originalrusyn/novotvir into feature/admin

Conflicts:
	novotvir.iml
Merge branch 'feature/admin' of https://github.com/originalrusyn/novotvir into feature/admin

Conflicts:
	novotvir.iml
Merge remote-tracking branch 'origin/feature/admin' into feature/admin

Conflicts:
	build.gradle
	novotvir.iml
	src/test/java/novotvir/security/service/impl/CustomTokenBasedRememberMeServicesImplTest.groovy
refactoring