Merge branch 'develop'

package.json

@@ -27,7 +27,7 @@
     "bowser": "^2.11.0",
     "connect-typeorm": "^1.1.4",
     "cookie-parser": "^1.4.5",
-    "country-code-emoji": "^2.2.0",
+    "country-flag-icons": "^1.2.9",
     "csurf": "^1.11.0",
     "email-templates": "^8.0.3",
     "express": "^4.17.1",
@@ -83,6 +83,7 @@
     "@types/bcrypt": "^3.0.0",
     "@types/body-parser": "^1.19.0",
     "@types/cookie-parser": "^1.4.2",
+    "@types/country-flag-icons": "^1.2.0",
     "@types/csurf": "^1.11.0",
     "@types/email-templates": "^8.0.2",
     "@types/express": "^4.17.11",