Fixes small bug with promotion logic when using a merchandise qualifier.
 Updated to version 3.0.8
Merge branch 'master' into develop

Conflicts:
	version.txt
Closes #1748 and Updated Version to 3.0.9
Merge branch 'master' into develop

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