Merge branch 'master' into Facial-Recognition-Timeline

Author: ShenranChen

.gitignore

@@ -17,10 +17,6 @@ website/build
 .env.development.local
 .env.test.local
 .env.production.local
-package.json
-package-lock.json
-website/package-lock.json
-website/package.json
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*