Re-imported datasets after updates of CHP and P&HP analysis.
Merge pull request #817 from quintel/capacities

Re-imported datasets after updates of CHP and P&HP analysis.