Merge pull request #829 from corinnecurcie/stable

changing admin listed categories
Merge pull request #830 from corinnecurcie/stable

changing admin listed categories
Checking lag
Merge remote-tracking branch 'upstream/stable' into stable
work
lol
lol
Merge pull request #833 from HakuG/stable

Fixed problem, hopefully
changed back harnek's fix