asdfasd
Merge branch 'master' of https://github.com/Krachbum/schulung.git

Conflicts:
	BusinessLogic/src/at/gv/brz/training/krachbum/bom/Zeitverwaltung.java
fxghs
serwer