Add .idea to .gitignore
Merge branch 'master' into tomerge