Working on editor
Merge branch 'dev' of github.com:Ezphares/sw705e13 into dev