Using generics
Removed useless code
Merge branch 'master' of git+ssh://github.com/idega/is.idega.idegaweb.egov.application into BRANCH_PLATFORM_5