Merge branch 'master' into develop/scene-simple
Resolved conflicts
Refactoring + good and bad objects
Merge branch 'develop/scene-simple' into develop/attraptor

Conflicts:
	assets/js/render.js