merge works
	modified:   src/main/java/org/tuwien/swalab2/swazam/peer/HostCache.java
Merge branch 'master' of github.com:msmolle/swa