Update intellij settings
Merge branch 'master' of github.com:lespea/configs