Update for Shop Class

Updates to add in a Shop. Which is completely unfinished.
Merge branch 'master' of https://github.com/iargue/Genisis_Proof_Of_Concept

Conflicts:
	build/js/base.js