Merge origin/master into Category

Conflicts:
	BitMusic/bitmusic/profile/Category.java
Merge origin/master into Category

Conflicts:
	BitMusic/bitmusic/profile/Category.java