Merge branch 'master' into develop
Upgrade Font Awesome to 3.2.1
Add Font Awesome 3.2.1
Disable compression filters when debugging
Merge branch 'develop'
Bump version