Added correct stuff from .idea folder per https://intellij-support.jetbrains.com/entries/23393067
Merge remote-tracking branch 'origin/master'