Merge branch 'gh-pages'
remove button type
Merge branch 'master' into gh-pages