current progress
fixed remodelling
merge
added zproperty
undo disabling datasources
Merge pull request #57 from ssbunyk/remodel

Remodel, ZEN-9902