Added MarkTheWords as an action option.
Added overriding buttons for show sol and retry
Merge branch 'master' into markTheWords
Merge branch 'markTheWords'
Textual and common change for overrides
Merge branch 'bug-fix-and-more-functionality' of github.com:h5p/h5p-interactive-video into bug-fix-and-more-functionality
Merge branch 'master' into bug-fix-and-more-functionality
Merge branch 'bug-fix-and-more-functionality'
Changed semantic name enableRetryButton to enableRetry.
Merge branch 'override-buttons' of github.com:h5p/h5p-interactive-video into override-buttons
Semantics and descriptions for retry button changed.
Merge branch 'override-buttons' of github.com:h5p/h5p-interactive-video into override-buttons
Added behaviour group to subcontent.
Updated version numbers.
Merge branch 'override-buttons' of github.com:h5p/h5p-interactive-video into override-buttons
Fixed so all behaviour of subcontent wont be overwritten.
Grouped similar content and added DragText
Fixed hotspot icons to new font, and included markthewords dragtext singlechoice
Merge branch 'override-buttons' of github.com:h5p/h5p-interactive-video into override-buttons
Resolve conflicts