Merge branch 'dev' of github.com:cismet/cids-navigator into dev
Merge branch 'dev' of github.com:cismet/cids-navigator into dev
Merge branch 'dev' of github.com:cismet/cids-navigator into dev
Merge branch 'dev' of github.com:cismet/cids-navigator into dev
Merge branch 'dev' of github.com:cismet/cids-navigator into dev
Merge remote-tracking branch 'origin/dev' into dev
Merge branch 'dev' of github.com:cismet/cids-navigator into dev
fix #67
Merge branch 'dev' of github.com:cismet/cids-navigator into dev
fix #67
Merge branch 'dev' of github.com:cismet/cids-navigator into dev
fix #67
Merge branch 'dev' of github.com:cismet/cids-navigator into dev
Merge branch 'dev' of github.com:cismet/cids-navigator into dev
#61 in NavigatorAttributeEditorGui added getEditorObject() and cancelEditing(). And if the user wants to delete an element which is currently edited, ask him if he is sure. If yes, also close the editor
#61 in MethodManager, merged the two methods showOptionDialogDeleteNode() and showOptionDialogDeleteCurrentlyEditedNode()
Merge branch 'bug/61-delete-currently-edited-object' into dev
#68 added a boolean to SearchResultsTree, which enables the alphabetic sort. This boolean is provided by arguments of the previous method calls.
Merge branch 'bug/68-sort-results-geosearch' into dev
jalopy. closes #68