Add Live and Dev Globals
Add Live and Dev Mail Settings
Merge branch 'dev' into live

Conflicts:
	content/de/contact.xml