Merge branch 'site-config'

Conflicts:
	index.html