added yellow to emergency block, fixed font awesome file placement
Merge branch 'master' into test