1909 1400
Merge branch 'master' of https://github.com/dennispoppe/XML-Vorlagen

Conflicts:
	server/imagick.php