Add editorconfig
Merge branch 'develop'