git wieder funktionsfaheig bauen
bla.
Merge branch 'master' of https://github.com/n-multimedia/plattform

Conflicts:
	sites/all/modules/onlinekurslabor/custom_general/modules/h5p_integration/wysiwyg_plugin/plugin.js
annotationlist fix zeilenumbruch