Ability to extend file object using attributes
Fixed issue with dependency injection not working properly between
parent and child bean factories
Merge branch 'master' of ssh://git@github.com/ten24/Slatwall into hotfix-serviceinjection
Cleaned up beanInfo property reference
Update AccountPayment.json

Fixed to valid json
Updated Version 3.1.49
Merge remote-tracking branch 'tdhatcher/hotfix-serviceinjection' into hotfix
Bean Factory code cleanup
Updated Version 3.1.50
Merge branch 'master' into develop

Conflicts:
	version.txt
Merge remote-tracking branch 'origin/feature-documentattribute' into develop
Updated Version 3.1.50.130
Merge branch 'develop' of ssh://git@github.com/ten24/Slatwall into feature-auditversioning