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

Conflicts:
	styles/interactive-video-editor.css