Empty dialog on data conflict.
Conflict resultion seems to work now.
Minor bug fixed.
Prevent unnecessary conflict.
Adapted dialog style to page.
Conflict resolution fixed.

One of the 3 cases was not properly handled and the DOM was not properly
updated.
Translated to German (controlled user-base).
Max width of dialogs reduced.
Merge branch 'develop' into tabulator-conflict-resolution