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
[Music]Fin implémentation Song, modification songSearcher
Merge origin/master
[Music]Commentaire fonction player dans apiMusic
Merge pull request #6 from LO23/master

Update
Merge pull request #167 from Elthum/master

[Music]Fin implémentation Song, modification songSearcher
[music] rename ApiMusicFromNetwork
Merge pull request #185 from jibzou/master

[music] rename ApiMusicFromNetwork
mise à jour de la vue de la barre de recherche
mise à jour de la vue de la barre de recherche
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