Merge dev into feature/273-static-resource
Merge dev into feature/273-static-resource
Merge dev into feature/273-static-resource
bug fix runtime error if an invalid recordtypeid is specified for Household Account or One-to-One.
Merge pull request #574 from SalesforceFoundation/feature/273-static-resource

runtime error fix for invalid recordtypeId's in settings.
Merge dev into feature/340-contact-merge