type 2 changed EDGE file names (no CC), and made additional assumptio…

…ns for the disaggregation of water heating demand in the OCD EDGE region

:q

Merge branch 'master' of github.com:pik-piam/moinput