merge conflict
cluster analysis code

Conflicts:
	src/cern/ch/mathexplorer/clusteranalysis/ClusterAnalyzer.java
proofreading fixes