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.