[DF-709] issue is fixed.
[DF-348] UIEditor. DF-643 fix.
Merge pull request #85 from adebt/UIEditor

[DF-709] issue is fixed.