merge master to music
Merge remote-tracking branch 'origin/develop/music' into develop/scene-simple

Conflicts:
	assets/js/render.js
merge with scene-simple
music loop
speed change
delete speedlog
speed increase
add speed coefficient
Merge remote-tracking branch 'origin/develop/music' into develop/scene-simple

Conflicts:
	assets/js/render.js
End screen
Merge branch 'develop/scene-simple' into develop/attraptor
scoring fixed