EXPERIMENTAL: New strategy for scale in
Merge branch 'master' into experimentalScaleIn

Conflicts:
	src/it/polimi/modaclouds/space4cloud/optimization/PartialEvaluationOptimizationEngine.java
Fixed format and imports
cleaned up
Fixed convergence issue in scaling in
added user manual
fixes
fixed some parts of the milp initial solution generation
Merge branch 'master' into experimentalScaleIn

Conflicts:
	.classpath
	META-INF/MANIFEST.MF
	build.properties
	src/META-INF/sun-jaxb.episode
	src/it/polimi/modaclouds/space4cloud/db/DatabaseConnector.java
	src/it/polimi/modaclouds/space4cloud/gui/RobustnessProgressWindow.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/constraints/ConstraintHandler.java
	src/it/polimi/modaclouds/space4cloud/optimization/constraints/Metric.java
	src/it/polimi/modaclouds/space4cloud/utils/ResourceEnvironmentExtentionLoader.java
fixed merge errors with the master
fixed cancellation loop bug
Merge branch 'master' into experimentalScaleIn

Conflicts:
	src/it/polimi/modaclouds/space4cloud/gui/XMLFileSelection.java
	src/it/polimi/modaclouds/space4cloud/mainProgram/Space4Cloud.java
fixed wrong merge
Merge branch 'master' into experimentalScaleIn

Conflicts:
	src/it/polimi/modaclouds/space4cloud/db/DatabaseConnector.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/EvaluationProxy.java
	src/it/polimi/modaclouds/space4cloud/optimization/evaluation/EvaluationServer.java
	src/it/polimi/modaclouds/space4cloud/utils/ConfigurationHandler.java
	src/it/polimi/modaclouds/space4cloud/utils/Constants.java
	src/it/polimi/modaclouds/space4cloud/utils/SimpleEvaluator.java
finished merge
new patch
Merge branch 'master' into experimentalScaleIn

Conflicts:
	src/META-INF/sun-jaxb.episode
	src/it/polimi/modaclouds/space4cloud/db/ProviderDBConnector.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/lqn/LQNSResultParser.java
	src/it/polimi/modaclouds/space4cloud/optimization/solution/impl/Component.java
	src/it/polimi/modaclouds/space4cloud/optimization/solution/impl/Functionality.java
	src/it/polimi/modaclouds/space4cloud/utils/RussianEvaluator.java
fixed merge on automated generated code
update to version 0.0.4
updated dependencies