Inserted options to all getTableName calls. This allows overriding getTableName and constructing dynamic tablenames based on specific options.
Updated the getTableName documentation to include the options param
Merge branch 'master' into pass-options-to-getTableName

Conflicts:
	lib/model.js
Fixed merge conflict, added documentation to getTableName params and fixed a typo
sequelize.query not work if there is an empty space in start of query #1960
Merge pull request #1963 from smali-kazmi/fix-issue-1960

Fix of issue # 1960 (closes #1960)
Merge pull request #1952 from quiddle/pass-options-to-getTableName

Pass options to getTableName function
Add test for hasMany set method with custom primary keys
Fix bug in hasMany.set when models have custom primary keys
Fix unit test
Merge pull request #1974 from LJ1102/fix-hasmany-set-custom-primary-keys-master

Fix hasmany set custom primary keys
Merge pull request #1961 from seegno/fix-transaction-api

Remove callback from transaction API in favor of promises
Fix change column migration for enums on Postgres
Merge branch 'fix-change-column-for-enums' into production