update to bootstrap 3.1.1
Merge branch 'bootstrap311'