Merge branch 'master' into gh-pages
Fix font-size on buttons
Merge branch 'gh-pages'
Removed unused controller