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