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
Corrected some methods and added some comments about contact & category
Changed the categoryId management
One == changed for an equals (== or != is not the equivalent to .equals method, == and != deal with references, like pointer in C++, it doesn't read the value)
One TODO and one FIXME added
Corrected AddContact

Deleted FIXME on CreateCategory. Normally, two categories can have the
same name (but they will have two different id).
little optimization and I removed an unsed variable
Implemented missing part of music commands
Removed conversationId add need, conv.Id is passed automatically at message creation, reading is still dev responsabiility.
Merge branch 'master' of https://github.com/SharUTC/SharUTC.git
Merge
Added 2 missing commands : Add/RemoveMusicTo/FromCategory
Added an event on music when a category is removed or added
Updated Music class , added default public category for new local instance, so user doesn't have to link music or peer to authorize listening and others, also changed returned list for an unmodifable list with add and remove methods from previous commit
Revert to previous ways of passing ConversationID, we can't simply put the value in each message, sometimes it must be copied, so we must define it manually
add new tests in importWholeProfile