wMerge branch 'development' into aws-migration-master

Author: MasaGon

.gitignore

@@ -98,6 +98,10 @@ key.json
 amplify/\#current-cloud-backend
 amplify/.config/local-*
 amplify/mock-data
+<<<<<<< HEAD
+=======
+amplify/team-provider-info.json
+>>>>>>> development
 amplify/backend/amplify-meta.json
 amplify/backend/awscloudformation
 build/