[Add] intellij/settings.jar
Merge remote-tracking branch 'origin/master'