Merge origin/master into Category

Conflicts:
	BitMusic/bitmusic/profile/Category.java
Merge pull request #348 from fab441/usertests

Merge origin/master into Category