Merge pull request #27 from clicktravel-steffan/master

FC-82 Allow retries when write to database fails due to optimistic locking