Hotfix in promotion calculation
Merge branch 'master' into hotfix
Updated Version 3.0.14
Merge branch 'master' into develop

Conflicts:
	version.txt
Updates to make the content and category sync more efficient.
Updated Version 3.0.14.039
More optimization in mura sync of content / category
Adds Indexes to Content and Category Entities for CMS integration.
Updated Version 3.0.14.040
Bugfix for points out
Closes #1796
Merge branch 'develop' into develop-importantissues
Updated Version 3.0.14.041
Minor tweaks to loyalty transaction views and adding more logic to
orderItem receive
Merge remote-tracking branch 'origin/develop' into feature-loyalty
Bug fix for loyalty program Item receive