Fixed build.
Fixed build.
Merge branch 'master' of github.com:conxgit/oryx-editor