Changed 'button' back to 'div'
Merge branch 'master' into gh-pages