Merge pull request #824 from HakuG/stable

Fixed mapbox problem
Merge pull request #825 from HakuG/stable

Fixed the other problem as well
changing admin listed categories
Merge pull request #829 from corinnecurcie/stable

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

changing admin listed categories
Merge remote-tracking branch 'upstream/stable' into stable
work