gh-pages renabled
Merge branch 'master' into develop