removed idea files
updated gitignore
Merge branch 'master' into develop