main.js weg
Merged 'dev'.

Conflicts:
	app/base/main.js
Finish authentication-route