Add DB Settings
Some Settings Changes
Merge branch 'dev' into live
Merge branch 'dev' into live
Merge branch 'dev' into live
Merge branch 'dev' into live
TO LIVE
Add Live Emailadressen
Merge branch 'dev' into live

Conflicts:
	content/de/contact.xml
Delete Backupdats
Merge branch 'dev' into live

Conflicts:
	content/de/contact.xml
Rebase contact.xml
Register Link
Add Data to Register Confirmation Template
Changed Contact Form
Changed Form Global
To Live
Merge branch 'live' into dev

Conflicts:
	content/de/local.xml