Merge pull request #1 from pi-engine/master

update trunk Pi master
Merge pull request #2 from pi-engine/master

update with Pi Master
Update Font Awesome 3.2.1
Merge pull request #127 from krisxoofoo/master

Update Font Awesome 3.2.1