playing with scaling policy
Merge branch 'master' of https://github.com/tarator/AIC13G3P3

# By roman-schmid
# Via roman-schmid
* 'master' of https://github.com/tarator/AIC13G3P3:
  new Scaling Policy

Conflicts:
	src/main/java/at/ac/tuwien/infosys/aic13/cloudscale/configuration/ConfigurationProvider.java
ec2 deplyoment
no message
Merge branch 'master' of https://github.com/tarator/AIC13G3P3

# By Roman
# Via Roman
* 'master' of https://github.com/tarator/AIC13G3P3:
  Minor bugfixes