Update button styles
Merge branch 'master' into gh-pages

Conflicts:
	charts/css/styles.css