style anpassen: login form / upload
Merge branch 'master' of https://github.com/papyrus-project/papyrus

Conflicts:
	css/style_master.css