Merge branch 'hotfix/0.0.6'
Updated editor settings
Merge branch 'hotfix/0.0.7' into develop