added mergeimport to client functionality
typo fix
support 'merge here...' in treebrowser
merge import function call bugfix
bugfixes in mergeimport
bugfix
bugfix: drag&drop parentID vs ROOT item's new '' ID was causing move instead of reposition
bugfix: go to parent button
Merge branch 'master' into colors