Added fontawesome
Merge branch 'master' into controls
Added controls
Convert directive to attr