HFJ-179: Prepared for new API version. Using new resize events, removed some deprecated stuff. Fixed a bug in CP editor.
Had to bump patch version, because patchversion 7 was uploaded to h5p.org while testing
Merge branch 'master' of b.amendor.com:h5p

Conflicts:
	example_content/interactive-video/H5PEditor.InteractiveVideo/library.json
HFJ-217: Added bookmarks to IV.
Updated code problems discovered by jshint
Merge branch 'api-1.0'

Conflicts:
	example_content/boardgame/H5P.Boardgame/library.json
	example_content/boardgame/H5P.MultiChoice/library.json
	example_content/boardgame/H5P.QuestionSet/library.json
	example_content/coursepresentation/H5P.CoursePresentation/library.json
	example_content/drag-question/H5P.DragQuestion/css/dragquestion.css
	example_content/interactive-video/H5PEditor.InteractiveVideo/library.json
Merge branch 'api-1.0' into iv-1.1

Conflicts:
	example_content/interactive-video/H5PEditor.InteractiveVideo/library.json
Merge branch 'iv-1.1' of b.amendor.com:h5p into iv-1.1
HFJ-217:
Fixed bookmarks poping up when not playing (when pressed twice in menu).
Removed debug logging.
Removed bookmarks menu when there are no bookmarks.
Do not hide bookmark menu when adding a bookmark fails.
Auto edit of bookmarks when added.
Pressing enter when editing a bookmark now saves it.
Auto clearing of input field when editing bookmark if default value.
Fixed editing bookmark input one pixel to large.
HFJ-217: Added warning message when trying to add two bookmarks at same location
HFJ-217: Improved warning message and fixed typos
HFJ-217: Fixed IE and Safari-issue
Merge branch 'api-1.2' into iv-1.1

Conflicts:
	example_content/blanks/H5P.Blanks/css/blanks.css
	example_content/coursepresentation/H5P.CoursePresentation/library.json
	example_content/interactive-video/H5P.InteractiveVideo/library.json
	example_content/interactive-video/H5P.InteractiveVideo/scripts/interactive-video.js
	example_content/interactive-video/H5PEditor.InteractiveVideo/library.json
	example_content/interactive-video/H5PEditor.InteractiveVideo/styles/interactive-video-editor.css
Merge branch 'iv-1.1' of b.amendor.com:h5p into iv-1.1
HFJ-217: Fixed usage of correct params in editor.
Fixed no drawing of dots for subtitles.
Removed calls to non-existing IV function.
Merge branch 'api-1.2' into iv-1.1
Merge branch 'api-1.0'
Merge branch 'api-1.2' into iv-1.1
Merge branch 'master' into api-1.1