bootstrap3 updates
font awesome 4 updates
Merge branch 'bootstrap3'