Updated Bootstrap and AngularJS
Merge branch 'master' into demo