* configuration can be done through system properties as well as
environment variables now (system properties have priority)
Merge branch 'master' of
https://github.com/deib-polimi/modaclouds-app-level-dc.git

Conflicts:
	doc/user-manual.md