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
Merge origin/master into Category

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

modif Category
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
pb brdcast