editor config
Merge pull request #49 from xiuxiude/editorconfig

editor config
Merg branch 'origin/fix-login'
Merge remote-tracking branch 'upstream/master'

sync with upstream