Merge branch 'articles' into develop
Update Author page
Merge branch 'develop' into gh-pages