Update bootstrap
Fix checkbox breakage in Settings dialog
Merge branch 'update-bootstrap'

* update-bootstrap:
  Fix checkbox breakage in Settings dialog
  Update bootstrap