bnvbnvbn
Merge branch 'master' of
https://github.com/mgugger/CrowdLangDesigner.git

Conflicts:
	app/assets/javascripts/Canvas/KeyStrokes.js