added .idea to .gitignore
remove alert
add .idea to .gitignore
add .idea to .gitignore
remove alert
Merge branch 'develop'