Add Bootstrap JS/CSS
Merge branch 'bootstrap'