Cool Buttons & Status Bar Update Start
Merge branch 'master' of https://github.com/iargue/Genisis_Proof_Of_Concept

Conflicts:
	build/js/base.js