added admin
Merge branch 'master' of https://github.com/iwogar/language_app

Conflicts:
	.idea/workspace.xml