Update with grunt-fontello
code cleanup
Updated yarrp support
Resolve merge conflict
Merge branch 'foundation-5' of https://github.com/rtCamp/rtpanel.git into foundation-5
Resolve merge conflict