Kaveri3012/emlab-generation — pull request #1 by JCRichstein (2013-07-22 10:15:39+00:00)
Title: Feature capacity market vx2

I merged the bug-removals and new stuff from develop into your VX2 branch.