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

Hey, sorry I set the wrong pull request first. Please merge this into your featureCapacityMarket_VX2 branch, I introduced the recent changes from develop.