Using generics
Merge branch 'master' of github.com:idega/com.idega.block.dataquery into BRANCH_PLATFORM_5