-automatic redirect after login
Merge branch 'master' of https://github.com/ischweizer/phdpapertool

Conflicts:
	app/routes.php