Merge pull request #18 from pi-engine/develop

Merge pull request #1196 from krisxoofoo/develop
update font awesome 4.2.0
Merge pull request #1197 from krisxoofoo/develop

Update Font-Awesome 4.2.0