Disabled termPayment as an option for account payments. Added validation
against termPayment during accountPayment entity save context.
removed unnecessary comma
Improved the validation of paymentMethodType property on an
AccountPayment entity.
Added rbkey 'admin.entity.define.addAccountPayment_error' for possible
errors when adding account payment.
Merge branch 'master' of ssh://git@github.com/ten24/Slatwall into hotfix-acctpaymentoptions
Undoing a commit of an accidental comment made when testing.
Updated Version 3.1.36
Fixes issues with Mura 6.1 and duplicate content tab display.
Merge branch 'master' into hotfix
Updated Version 3.1.37
Merge branch 'master' into develop

Conflicts:
	version.txt
Removed automatic calculatedProperty update on entityLoad
Updated Version 3.1.37.122
Merge branch 'develop' of ssh://git@github.com/ten24/Slatwall into
feature-fileobjects

Conflicts:
	config/resourceBundles/en.properties