Using grunt-game-builder, reorganized project
Merge branch 'master' of https://github.com/CloudKidStudio/Spock

Conflicts:
	deploy/app/assets/js/main.js
	deploy/package.json
	package.json