trying something
trying something
trying something
trying something
Merge pull request #821 from corinnecurcie/stable

team page updated fixes #820
Merge remote-tracking branch 'upstream/stable' into stable
got some shit
got some shit
got some stuff
got some stuff
Merge pull request #824 from HakuG/stable

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

Fixed the other problem as well
changing admin listed categories