Merge branch 'master' into liquidvisual

Conflicts:
	src/_includes/footer.html