[DF-792] is fixed.
[DF-791] issue is fixed.
Merge remote-tracking branch 'DAVA/development' into UIEditor
Merge pull request #121 from adebt/UIEditor

[DF-792] is fixed.