* bugfix: ParameterOptimizationRun.parseFromFile: added handling of
missing optimizationMethod, optimizationCriterion and
optimizationIterations attributes
Merge branch 'graphmatch' of https://github.com/wiwie/clusteval.git into
graphmatch

Conflicts:
	clusteval/clustevalServer.log
	clusteval/test/de/clusteval/run/TestRun.java