Merge branch 'feature-yurochko-auth'

Conflicts:
	gui/gui.pro.user