Loading database connection parameters from configuration file that can
be specified by the user.
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