begin with registration
Merge branch 'origin/feature-gui'

Conflicts:
	app/css/app.css
	app/less/app.less
add header
update registration form
Merge branch 'origin/feature-gui'

Conflicts:
	app/css/app.css
	app/less/app.less
bugfix commit