0710
Merge branch 'master' of https://github.com/Viehauktion/viehauktion

Conflicts:
	sendconfirmationmails.sh
	sendendedmails.sh