Updated marketplace
Merge branch 'WorkingNewArch' of https://github.com/jaxoncreed/StarSpace into WorkingNewArch

We need this for demo or else we are screwed
Merge branch 'WorkingNewArch' of https://github.com/jaxoncreed/StarSpace into WorkingNewArch

Just cause
Marketplace more stuff
Merge branch 'WorkingNewArch' of https://github.com/jaxoncreed/StarSpace into WorkingNewArch

Stuff