change tel number
Live settings
Merge branch 'dev' of https://github.com/cadman/insel-ulm into dev

Conflicts:
	content/de/local.xml
	content/site.xml
Merge branch 'live' into dev