Integrated market and broker
Changed structure of demand payload
Merge pull request #97 from johnttan/integrateAll#96

Integrate all#96