Merge branch 'gh-pages'
lots o changes
stash & merge to gh-pages
Merge branch 'master' into gh-pages