bootstrap3 adjustments
bootstrap3 adjustments
Merge remote-tracking branch 'cactid/bootstrap3' into bootstrap3