Added FontAwesome 4.1 as a dependency.
Merge branch 'master' into api-1.1
Merge branch 'master' into api-1.1

Conflicts:
	library.json
Merge branch 'api-1.1' of github.com:h5p/h5p-drag-question into api-1.1