modify mapper delete a bit, add delete in abstract service, fix delete choice in catalogmanager
Merge pull request #74 from nclundsten/hotfix/delete-choice

modify mapper delete a bit, add delete in abstract service, fix delete c...