hotfix for bootstrap3

I've taken bootstrap3 code from dev branch and added it to the master.