Bugfix and some more merge logging.
Do not merge while database synchronization is in progress.
Allow items to be reordered by dragging them. Other cosmetic UI changes.
Merge branch 'master' into gh-pages