Merge pull request #8 from kdop/master

Merged the two modules
Merge pull request #9 from kdop/master

modules merged
Updates in the GUI and preperations for correct M-tree indexing.
Merge pull request #10 from Larsenik/master

Clean up and updates of the GUI code and preparations for the M-tree indexing via the probabilities from the classifier.
21/5 changes