Cleanup old files
Merge branch 'master' into gh-pages
Fix font-size on buttons