schick machne
Merge branch 'origin/feature-gui'

Conflicts:
	app/less/app.less
	app/routes/login/login.html
update