Merge pull request #150 from open-ideas/issue137_importAnnex60

New/experimental media merged from Annex60
fixed bugged ZoneExample.mo
Merge branch 'Annex60' into issue127_UnitTestCoverage