cleanup and small fix for resource: Should research further
bug | fixed catalogue generation, added empty translation key handling to importer
merged from master