oppg885
Merge branch 'check-insteadof-showsol' of https://github.com/h5p/h5p-drag-question

Conflicts:
	js/dragquestion.js