Woring with jaxb.
Merge remote-tracking branch 'origin/master'

Conflicts:
	org.promasi.client_swing/Data/Logs/all.log
	org.promasi.client_swing/Data/SinglePlayer/Tutorial/Company