modified:   ../swazam-peer/src/main/java/org/tuwien/swalab2/swazam/peer/ConnectionHandler.java
Merge branch 'master' of github.com:msmolle/swa
	modified:   src/main/java/org/tuwien/swalab2/swazam/client/communication/ClientRestClient.java
port  +1

	modified:   src/main/java/org/tuwien/swalab2/swazam/client/Client.java
Merge branch 'master' of github.com:msmolle/swa