Some Cleanup
[testdist] fixed compatibility for distributed simulation
[distributed] Some cleanup
Merge branch 'master' of github.com:ejoerns/candis

Still containing not buildable code in testdist

Conflicts:
	master/src/candis/server/Connection.java
	master/src/candis/server/JobDistributionIOServer.java
	testdist/src/candis/distributed/test/JobDistributionIOTestServer.java
	testdist/src/candis/distributed/test/TestDroid.java
	testdist/src/candis/distributed/test/TestServerStateMachine.java
Merge branch 'master' of github.com:ejoerns/candis
[droid] Fixed broken merge in BackgroundService.java