Fixed bug in util.ftl where getSingular() was not being used
Minor fix
Changed getSingular() to also accept the name of an entity
Added new case to ExpandedSelection
Minor optimization
Minor fix
Fixed some sql statements
Removed unused declarations
Merge pull request #4 from scapev/master