Modif User

Conflicts:
	BitMusic/bitmusic/profile/Category.java