merging gh-pages and develop