Nearly done skyEditor, refactoring...
Merge remote-tracking branch 'origin/master'