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

Conflicts:
BitMusic/bitmusic/profile/Category.java