Merge branch 'master' into develop/attraptor
removed duplicated parameters
determine collided objects
Merge branch 'develop/scene-simple' into develop/attraptor

Conflicts:
	assets/js/render.js
Fixed controls
removing objects from scene now
better points counting
Changed number of objects
Merge remote-tracking branch 'origin/develop/attraptor' into develop/scene-simple