update to bootstrap 3
Merge branch 'bootstrap_3'