Reimplemented getInstance() custom settings methods.
Merge pull request #1047 from SalesforceFoundation/feature/1046-user-custom-setting-bug

Reimplemented getInstance() custom settings methods.
Merge dev into feature/983-data-importer