Merging branches gh-pages and master