pushing so I can merge master in
Merge branch 'master' into feature/WebGL

Conflicts:
	.idea/workspace.xml
	app/static/js/App.js
	app/static/js/Matchstick/Nitro/Objects/DisplayObject3D.js
More work on getting a better workflow from scene -> render. Updates to Gruntfile and adding basic touch detection class
Merge branch 'master' of https://github.com/sortofsleepy/Matchstick