[distributed] Removed duplicated funcitonality
Merge branch 'master' of github.com:ejoerns/candis

Conflicts:
	master/src/candis/server/ClientConnection.java