fix 349

- if there is a conflict while updating, get latest revision from db instead of cache
Merge pull request #350 from hermanccw/fix-349

Fix infinite loop in -[CBLDocument update:]

fixes #349