switch to bootstrap 3 in octopus
Merge branch 'master' into develop