Settings to Live
Merge branch 'dev' into live

Conflicts:
	content/de/contact.xml