Fix typo in the MM
Merge branch 'master' of https://github.com/SINTEF-9012/cloudml

Conflicts:
	codecs/json/sensappTEST.json
Fix bug in MM: demands are contained