Add font awesome css and fonts
Apply shopping cart font to nav-bar
Some small changes to category bar layout
Merge remote-tracking branch 'origin/master'