[ci skip] Update the api docs for sequelize.query with the right type for callee
Resolves #2206
Add test for more than one model per transaction
Remove spaces
Merge pull request #2213 from javiercornejo/issue-2206

Resolves #2206: Error creating pg_temp.testfunc()
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
Merge remote-tracking branch 'upstream/master'