folder name changed for gh-pages
Merge branch 'dev' into gh-pages