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
added file entity
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
Fixes account sync performance bug
Merge branch 'master' into hotfix
added File entity, FileService, and FileDAO
added getFiles() method to HibachiEntity
updated product admin view to add "Files" tab
created file related tags
Merge branch 'develop' of ssh://git@github.com/ten24/Slatwall into
feature-fileobjects

Conflicts:
	config/resourceBundles/en.properties
updates to file upload behavior during save to retain original file
extension
added non-persistent property specifically for use with file uploading
added ability to delete file