Merge pull request #1 from LO23/master

Update
Merge pull request #2 from LO23/master

Update
Merge pull request #3 from LO23/master

Update
Merge pull request #4 from LO23/master

Update
Merge pull request #5 from LO23/master

Update
Merge pull request #6 from LO23/master

Update
Add public in songlibrary constructor
solved conflicts from Simo
Merge pull request #193 from amina196/master

[music] fixing bug from SongSearcher
Implémentation de UserTest
Merge origin/master into Category

Conflicts:
	BitMusic/bitmusic/profile/Category.java
Merge pull request #197 from fab441/testcategory

modif Category
Merge pull request #196 from jcokimle/api

Implémentation de UserTest
added possibility to shutdown threads pool
Merge origin/master into Category

Conflicts:
	BitMusic/bitmusic/profile/Category.java
Merge pull request #198 from fab441/testcategory

modif Category
corr. pb avec mac et @ brdcast
Merge pull request #200 from VincentCharpentier/Vincent

corr. pb avec mac et @ brdcast
fixing issue #195
Merge pull request #201 from amina196/master

[music] fixing issue #195, fingers crossed