I changed some stuff
Merge github.com:/kassick92/canvasge

Conflicts:
	scripts/ResourceManager.js