add font awesome
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/app.css
	js/app.js
	js/build/app.min.js

merged