Fix fontawesome
Merge branch 'controls'
Merge branch 'master' of https://github.com/justinryder/PandAngular