Author Selection done
Merge branch 'master' of https://github.com/ischweizer/phdpapertool

Conflicts:
	app/views/paper/create.blade.php