LO23/BitMusic — pull request #353 by fab441 (2013-12-03 17:25:55+00:00)
Title: Merge origin/master into Category

Conflicts:
BitMusic/bitmusic/profile/Category.java