Started working on MusicService test class (tests for addToLocalCatalogCommand and removeFromLocalCatalogCommand)
Merge origin/master
Merge origin/master
Completed IntegrateRemoteCatalog method and added getCatalogForPeer (which gets authorized parts of the user's catalog for a peer, in order to integrate it)
Merge origin/master
Completed JUnit tests for addToLocalCatalogCommand and removeFromLocalCatalogCommand
Merge origin/master

Conflicts:
	src/fr/utc/lo23/sharutc/controler/service/MusicServiceImpl.java
Finished implementing getCatalogForPeer using new parts of the searchMusic method