kp
FICKENMerge branch 'master' of github.com:Bagception/BagceptionMasterControlService

Conflicts:
	src/de/uniulm/bagception/mcs/services/MasterControlServer.java
Merge branch 'master' of github.com:Bagception/BagceptionMasterControlService