Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Fix naming issue causing tests to fail when testing model that extends BaseModel
Extract model relationship namespaces to config file to allow models to be easily extended without breaking relationships.
Merge branch 'bgallagh3r-master' into develop
Updates changelog.