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

Conflicts:
	css/summary.css
	library.json
Merge branch 'api-1.1' into api-1.2
Merge branch 'api-1.2' into summary-1.1

Conflicts:
	library.json