bootstrap fixed for version 3
Merge branch 'master' into LIVE