better way of identifying daoFactories
Merge branch 'order-by-nested-associations-v2' of https://github.com/overlookmotel/sequelize into order-by-nested-associations-v2

Conflicts:
	lib/dialects/abstract/query-generator.js