6/1
Merge branch 'modeling-users' of https://github.com/DaedalusRU/sample_app into modeling-users

Conflicts:
	.idea/workspace.xml