Merge branch 'gh-pages' into develop-jekyll
update docs
Merge branch 'develop-jekyll' into gh-pages