merging Gauravs changes for bootstrap 3 upgrade