unlock update controller in finally block (#294)
DuplicateResolver (not completed! #294 and #309)

- work is done by DuplicateResolver
- added a checkbox (always do) to duplication warning dialog and changed the button text (TEXT STILL HAS TO BE DEFINED)
Merge remote-tracking branch 'origin/ribbons' into ribbons