[CB,HB]{other}GIT sucks again
Merge branch 'server' of https://github.com/heinzburgstaller/sw14_xp_01 into server

Conflicts:
	HoiServer/.classpath