Merge remote-tracking branch 'origin/master' into vincent

Conflicts:
	src/main.js
Merge remote-tracking branch 'origin/vincent' into vincent

Conflicts:
	src/main.js
Add sound
Add sound
bug fix transition
Add sound
bug fix transition