tests for .and()/.or() in includes
Merge branch 'master' into include-and-or-tests
Use getWhereConditions for include.where
Changelog
Merge pull request #1361 from sequelize/include-and-or-tests

Include: support .and()/.or() - Fixes #1341 & #1291
Merge branch 'master' into milestones/2.0.0