[Profile] Ajout de la partie encryption
[Profile] Prise en compte des modifications de Category dans UserTest
Merge branch 'master' of https://github.com/LO23/BitMusic into JasyptLib

Conflicts:
	BitMusic/bitmusic/profile/api/ApiProfileImpl.java
	BitMusic/bitmusic/profile/classes/User.java
Merge branch 'master' of https://github.com/LO23/BitMusic into JasyptLib
Merge branch 'master' of https://github.com/LO23/BitMusic into JasyptLib
Merge pull request #274 from jcokimle/JasyptLib

[Profile] Voir commentaires précédents