(Re)add colors for Git diff added/removed lines
Update options and apply updates to settings.jar
Merge pull request #261 from jcassee/restore-git-diff

(Re)add colors for Git diff added/removed lines
Merge pull request #279 from yous/patch-jetbrains-settings

Update options and apply updates to settings.jar