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

Conflicts:
	version.txt