-
Merge remote-tracking branch 'origin/master'

Conflicts:
	Groep3Cria/public/javascript/sequencer/sequencerRenderer.js