Order Promotion Discount Bugfix
Merge branch 'master' into develop

Conflicts:
	version.txt