modified:   swazam-peer/src/main/java/org/tuwien/swalab2/swazam/peer/p2p/ConnectionHandler.java
	modified:   swazam-peer/src/main/java/org/tuwien/swalab2/swazam/peer/peerUI/Cli.java
Merge branch 'master' of github.com:msmolle/swa