updated font-awesome4 to 4.2
Merge pull request #973 from nnscr/master

updated font-awesome4 to 4.2
Merge branch 'mergeMaster20141208'

* mergeMaster20141208:
  updated font-awesome4 to 4.2