updating bootstrap, and adding bootstrap-ui
Merge remote-tracking branch 'origin/master'