Merge branch 'master' into gh-pages

Conflicts:
	css/.sass-cache/4f20bc8e0ca78cc910b50af009be4b6491482a21/style.scssc
	css/style.css
	css/style.scss