Work in editor

I merged master branch to workInEditor, all working fine, but still needs testing. Hope it will be in production soon.