hierarchy page: drag-n-drop done
Merge remote-tracking branch 'origin/master'