merged newest development version of bootstrap3