focus fix login screen
Merge remote-tracking branch 'origin/master'

Conflicts:
	Printmanager/.idea/gradle.xml
Merge branch 'master' of https://github.com/BasThomas/SMPT42