added .idea dir to gitignore
Merge branch 'development'