[DF-348] UI Editor. Fix for DF-654 and DF-676.
[DF-348] UI Editor. Fix for DF-680, DF-676, DF-675, DF-654.
Merge pull request #81 from adebt/UIEditor

Ui editor