Merge remote-tracking branch 'origin/develop' into develop

Author: sds100

.gitignore

@@ -89,4 +89,8 @@ Gemfile.lock
 app/play-service-account-key.json
 
 app/.env
-.venv/
+.venv/
+/.idea/appInsightsSettings.xml
+/.idea/AndroidProjectSystem.xml
+/.idea/runConfigurations.xml
+/.idea/studiobot.xml