Update package.json
Fix object syntax for belongsto and hasMany. Closes #2164. Also properly merge existing attributes with those added by associations
Add a test for merging of existing attribute with foreign key attribute
Fix inflection at 1.3.8
Rename fieldName in foreign key objecst to name
Merge pull request #2222 from janmeier/master

Fix object syntax for hasmany and belongsto foreign keys