- Update font awesome to v4
Merge branch 'origin/master'

Conflicts:
	convert-font-awesome/convert-font-awesome.csproj