cleanup
Merge remote-tracking branch 'origin/master'
 added Manufacturer test model in order to write more sophisticated  join tests
modelQueryBuilder: optimize duplicated joins
Merge remote-tracking branch 'origin/master'