Added .editorconfig
Added .gitignore
Merge branch 'master' into develop