Updated texts
Merge branch 'master' into api-1.1
Merge branch 'master' of github.com:h5p/h5p-editor-course-presentation
Merge branch 'master' into api-1.1
Correct usage of font awesome
Correct usage of font awesome - bumped version
Merge branch 'api-1.1' into cp-1.1

Conflicts:
	library.json