added bootstrap/awesomefont
Merge with master - fix minor conflict on CSS file