Merge remote-tracking branch 'origin/from_music' into from_kino

Conflicts:
	bin/frontbone.js