add .editorconfig & refactoring indent from 4 to 2 spaces
merge conflicts with marexandre/master