remove .idea files
add .gitignore
Merge branch 'master' into app