Merge branch 'master' into demo

Conflicts:
	.sass-cache/2689f835e8476fac4bed27aae6bc8f4b96a0a082/style.scssc