Reverted to jekyll
merge with master
translation
Merge branch 'develop' into gh-pages
Merge remote-tracking branch 'origin/gh-pages' into gh-pages