bootstrap2 fix
conflict merge main.css
Merge remote-tracking branch 'origin/bootstrap3' into bootstrap3