Add .idea folder to gitignore. Remove this folders from repository.
Merge branch 'master' into develop