Merge branch 'api-1.2' of github.com:h5p/h5p-editor-course-presentation into api-1.2

Conflicts:
	library.json
Simplified some styles.
Merge branch 'master' into api-1.1
Merge branch 'api-1.1' into api-1.2
Merge branch 'api-1.2' into cp-1.1

Conflicts:
	library.json