added music library

	modified:   swazam-client/src/main/java/org/tuwien/swalab2/swazam/client/Client.java
	modified:   swazam-peer/src/main/java/org/tuwien/swalab2/swazam/peer/Peer.java
	modified:   swazam-peer/src/main/java/org/tuwien/swalab2/swazam/peer/musiclibrary/Library.java
	new file:   swazam-peer/src/main/java/org/tuwien/swalab2/swazam/peer/musiclibrary/MatchResult.java
	new file:   swazam-peer/src/main/java/org/tuwien/swalab2/swazam/peer/musiclibrary/MatchResultList.java
	new file:   swazam-peer/src/main/java/org/tuwien/swalab2/swazam/peer/musiclibrary/MusicFile.java
	modified:   swazam-util/src/main/java/org/tuwien/swalab2/swazam/util/fingerprint/FingerprintFile.java
 added HostCache.merge
Merge branch 'master' of github.com:msmolle/swa