part 3
Merge branch 'master' of github.com:Donnervoegel/java
usermanual ui screens are updated
Merge branch 'master' of https://github.com/firethanatos/java into firethanatos-master

Conflicts:
	docs/userManual.tex