Solve conflicts of rename daoFactory on my commits

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

lib/dialects/abstract/query-generator.js

@@ -788,8 +788,12 @@ module.exports = (function() {
             joinQueryItem += joinType + self.quoteTable(table, as) + " ON " + joinOn
 
             if (include.where) {
+<<<<<<< HEAD
 
               joinQueryItem += " AND " + ( where = self.getWhereConditions(include.where, self.sequelize.literal(self.quoteIdentifier(as)), include.model, whereOptions) )
+=======
+              joinQueryItem += " AND " + ( where = self.getWhereConditions(include.where, self.sequelize.literal(self.quoteIdentifier(as)), include.daoFactory, whereOptions) )
+>>>>>>> FETCH_HEAD
 
               // If its a multi association we need to add a where query to the main where (executed in the subquery)
               if (subQuery && association.isMultiAssociation && include.required) {

lib/model.js

@@ -1539,8 +1539,13 @@ module.exports = (function() {
     // otherwise this code will never run on includes of a already conditionable where
     if ( options.include && options.include.length ) {
       options.include.forEach(function(include) {
+<<<<<<< HEAD:lib/model.js
         if( typeof include == 'object' && include.model ){
           paranoidClause.call( include.model, include )
+=======
+        if( typeof include == 'object' && include.daoFactory || include.model ){
+          paranoidClause.call( include.daoFactory || include.model, include )
+>>>>>>> FETCH_HEAD:lib/dao-factory.js
         }
       })
     }