Merge pull request #89 from wmathurin/unstable20

When saving with FAIL_IF_NOT_CONFLICTING merge mode, the merge is done on...
Merge branch 'unstable20' of github.com:forcedotcom/SalesforceMobileSDK-Shared into unstable20