change template
Merge branch 'bootstrap' into gh-pages