Order Promotion Discount Bugfix
Merge branch 'master' into develop

Conflicts:
	version.txt
Merge branch 'develop' into feature-standalone

Conflicts:
	com/service/PromotionService.cfc
	version.txt
Translated the fix in promotions from 2.3.6