changes for bootstrap 3
merging