added a system to add only the columns / joins nedded for the query
Merge branch 'master-namespace' of git://github.com/Evaneos/berthe into HEAD