Fixed whitebox diagram being renamed
Merge branch 'master' of https://github.com/Contramalgra/java

Conflicts:
	docs/testCases.tex
Added logo to login screen

Recreated login screen so that it's editable in netbeans.
Updated new login page

:)
Merge branch 'master' of github.com:Contramalgra/java into Contramalgra-master

Conflicts:
	src/gui/LoginScreen.java
Merge branch 'master' of github.com:Donnervoegel/java