Test case fixes
Merge branch 'develop' into feature
Fixes bugs in delivery confirmation template
Cleaned up the order delivery template
Bugfix in the default payment method data.
Updated Version 3.2.032.031