bootstrap changes
...
styling changes
Merge branch 'master' into gh-pages
sync with master