Conflict solved
KNN-extension functionality added
Minor clean-ups
Improving efficiency in operations in ROI functions, by using set functions.
Default value of spinbox for knnextension is set to 0 when performing actions: recluster, remove unselected and set clusters.
Changing view to representatives after 'Set Clusters' callback
Setting representatives view when k=0 for knnextension functionality.
Extend function only available in expanded view
Streamlines view is kept when number of neighbours is set to 0 by the user.
Removing some stuff from Ui_mainwindow.py
Returning to version in which extend clusters is always enabled.
Streamlines view is kept when number of neighbours is set to 0 by the user.
Fixed bug when removing representatives after the knn extension
Merge pull request #8 from dporro/cluster-extend

Cluster extend functionality added