reverted yestarday .... määäh
Merge branch 'develop' into feature-discount-cleanup
specs
Merge branch 'develop' into feature-discount-cleanup
fixed testsuite, ready to go!?