Merge "Add .editorconfig"