zwischenstAND
Merged 'dev'.

Conflicts:
	app/base/main.js
zwischenstand
fixed settings/keys/... route
zwischenstand
Finish authentication-route