Changed resource.nickname to resource.short_name and added a csv import capability