alphabetize categories
Merge branch 'master' into ui