fix link to git repo
Merge branch 'dev' into gh-pages