Test for includes with find using both hasMany and belongsTo
Renamed foreignKeyObject to foreignKeyAttribute
Merge branch 'master' of github.com:sequelize/sequelize
Fixed incorrect expect test
Merge branch 'attributes_field_find_includes' of https://github.com/Dahlgren/sequelize into Dahlgren-attributes_field_find_includes
fix(model/attributes): make aliased primary keys for the main table work in cases of a subquery select
fix(model/attributes): fix mapping back serial values from postgres inserts with aliased fields
fix/feat(model/find): only apply limit: 1 if not querying on primary key
update changelog
check that options.where exists before checking for key in it
test case for primary key autoincrement renameColumn
fix sqlite test
feat(hasMany): addAssociation is no-op if passed false/null/undefined
test unable to reproduce #1750, closes #1750
Merge branch 'master' into feature/remove-cli

Conflicts:
	changelog.md