intermediate
intermediate 2
Merge branch 'master' of
https://github.com/deib-polimi/modaclouds-space4cloud.git

Conflicts:
	.classpath
	META-INF/MANIFEST.MF
	pom.xml
	src/it/polimi/modaclouds/space4cloud/chart/Logger2JFreeChartImage.java
	src/it/polimi/modaclouds/space4cloud/db/DatabaseConnector.java
	src/it/polimi/modaclouds/space4cloud/line/CmcqnModel.java
	src/it/polimi/modaclouds/space4cloud/line/ObjectFactory.java
	src/it/polimi/modaclouds/space4cloud/line/Processor.java
	src/it/polimi/modaclouds/space4cloud/line/SEFF.java
	src/it/polimi/modaclouds/space4cloud/line/Station.java
	src/it/polimi/modaclouds/space4cloud/line/Workload.java
	src/it/polimi/modaclouds/space4cloud/line/package-info.java
	src/it/polimi/modaclouds/space4cloud/mainProgram/Space4Cloud.java
	src/it/polimi/modaclouds/space4cloud/optimization/OptEngine.java
	src/it/polimi/modaclouds/space4cloud/optimization/PartialEvaluationOptimizationEngine.java
	src/it/polimi/modaclouds/space4cloud/optimization/evaluation/CostEvaluator.java
	src/it/polimi/modaclouds/space4cloud/optimization/evaluation/EvaluationServer.java
	src/it/polimi/modaclouds/space4cloud/optimization/solution/impl/Instance.java
	src/it/polimi/modaclouds/space4cloud/optimization/solution/impl/Solution.java
	src/it/polimi/modaclouds/space4cloud/utils/Constants.java
Fixed some runtime merge bugs