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

Conflicts:
	novotvir.iml