Fixed MainPeer
Merge branch 'master' of github.com:Graf-Nostro/SWAzam

* 'master' of github.com:Graf-Nostro/SWAzam:
  more onadmin interface
  MainPeer.java merged
  Changed Music library to find fingerprint by fingerprint
  jsp aenderungen

Conflicts:
	SWAzamPeer/src/main/tuwien/ac/at/swazam/peer/MainPeer.java
Fixed MainPeer