When saving with FAIL_IF_NOT_CONFLICTIN merge mode, the merge is done on the client instead of doing a refetch / Added a button in AccountEditor
Merge pull request #89 from wmathurin/unstable20

When saving with FAIL_IF_NOT_CONFLICTING merge mode, the merge is done on...