Resolved Conflicts
Merge branch 'master' of
https://github.com/KMDTeamProject/project_imprint_plus.git

Conflicts:
	src/imprintplus/method/clustering/AbstractClusterer.java
	src/imprintplus/method/clustering/WekaClusterer.java
	src/imprintplus/method/model/MixtureModel.java