merge between customer project and git version
Merge branch 'master' of https://github.com/xrowgmbh/xrowformgenerator

Conflicts:
	datatypes/xrowformgenerator/xrowformgeneratortype.php