Merge branch 'gh-pages'
fixed issue with carousel controls
Merge branch 'master' into gh-pages