Merge "Refactor album names out of Category class" into tm-dev