Removed .idea folder and added to gitignore
Merge branch 'release-1.6.1'