Add bootstrap 3 grid system to css folder, fix icon not displaying on newly added col, row
Merge remote-tracking branch 'origin/master'