Merge github.com:h5p/h5p-question-set into api-1.2
Updated texts
Merge branch 'master' into api-1.1
Merge branch 'api-1.2' of github.com:h5p/h5p-question-set into api-1.2
Merge branch 'api-1.1' into api-1.2