0509 1348 some changes
Merge branch 'master' of https://github.com/dennispoppe/XML-Vorlagen

Conflicts:
	server/xml/any.xml