Merge branch 'master' into api-1.1
Renamed font to avoid name collison.
Added FontAwesome 4.1 as a dependency.
Merge branch 'master' into api-1.1

Conflicts:
	library.json
	styles/cp-editor.css
Merge branch 'api-1.1' into api-1.2

Conflicts:
	library.json
	scripts/cp-editor.js