Ui editor

Current changes for UIEditor to Development branch.