Fix makeWhere
Merge pull request #139 from sasule/doctrine-fix

Fix mapping Doctrine dataSource
Defined template block "action" for better expandability