Added more monityoring.
Updated monitoring element in DaaS Web Service
Improved monitoring elements.
Removed bug on monitoring
Updated monitoring.
um.
Updated monitoring.
Updated worklaod a bit.
Merging master in DaaSForSalsa

Merge https://github.com/tuwiendsg/DaaSM2M into DaaSForSalsa

Conflicts:
	DaaSWebClient/scripts/daas-service
	DaaSWebClient/src/main/java/at/ac/tuwien/dsg/daas/DaaSDelegate.java
	WorkloadGeneration/scripts/workloadGenerator.py