Merge github.com:h5p/h5p-interactive-video into api-1.2
Merge branch 'api-1.2' of github.com:h5p/h5p-interactive-video into api-1.2
Made video resize compatible with newer core versions.
Merge branch 'master' into api-1.1

Conflicts:
	scripts/interactive-video.js
Merge branch 'api-1.1' into api-1.2

Conflicts:
	scripts/interactive-video.js
Merge branch 'api-1.2' into iv-1.1

Conflicts:
	library.json
	scripts/interactive-video.js
Merge branch 'iv-1.1' into iv-1.2

Conflicts:
	library.json