unit1: v5 (bootstrap + carousel)
Merge branch 'master' into gh-pages