another fix of bootstrap
Merge branch 'develop'