Added security joins
Merge branch 'goalio-2.4' of git://github.com/goalio/doctrine2 into goalio-2.4