Fix common CRM settings CRM-12339
Merge pull request #467 from colemanw/resources

Fix common CRM settings CRM-12339