Fix economy rewards
Merge remote-tracking branch 'origin/master'

Conflicts:
	ChangeLog.txt
Fix economy rewards