All the bootstrap+jquery we need
Update to bootstrap classes
Merge branch feature/bootstrap into master