a
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	.idea/obrazki.iml
	.idea/workspace.xml