Merge branch 'master' of https://github.com/xrowgmbh/xrowformgenerator into Branch_586ed2917e2b04202a1fa15249979c1bf1ef82a4

Conflicts:
	design/standard/templates/xrowformgenerator/xrowformmail.tpl