Resolve conflit between Tchap and Element Web 1.11.25 (#475)

* Resolve conflit between Tchap and Element Web 1.11.25
* Add patch-package to package.json
* Move patches temporary to other path
* Remove unnecessary patch
* Fix patch-package position in package.json
* Move back patches-unfixed to patches
* Add merge script
* Adaptation of 15 patches
* Update merge Script
* Adapt Hide Location patch
* Remove patch user-friendlier-encrypted-messages
* activate-cross-signing-and-secure-storage-react - to test : checkDeviceTrust without isCrossSigningSupported
* add-a-help-tab-in-menu-to-redirect-to-external-tchap-faq
* remove old patch activate-cross-signing-and-secure-storage-react
* patch :  auto-accept-tac
* update patch better-help-settings
* update patch : cross signing ui
* patch update : disable-access-options
* update patch : forgot-password, removed one file from patch
* remove old patch :  hide-location-if-no-map-server
* update patch : login
* Adapt patch simplify-exchange-key-message
* update patch : password-policy
* restore Tchap configuration in package json
* remove lint error
* change version to 4.2.0
* remove conf files from eslint
* reactivate patches in package

---------

Co-authored-by: olivier <odelcroi@gmail.com>

.eslintignore

@@ -3,3 +3,7 @@ src/vector/modernizr.js
 src/component-index.js
 # Auto-generated file
 src/modules.ts
+
+# remove those files from eslint
+test/.eslintrc.js
+test/setupTests.js

.eslintrc.js

@@ -19,7 +19,6 @@ module.exports = {
     },
     overrides: [
         {
-<<<<<<< HEAD
             files: [
                 "src/**/*.{ts,tsx}",
                 "test/**/*.{ts,tsx}",
@@ -32,10 +31,6 @@ module.exports = {
                 "plugin:matrix-org/typescript",
                 "plugin:matrix-org/react",
             ],
-=======
-            files: ["src/**/*.{ts,tsx}", "test/**/*.{ts,tsx}"],
-            extends: ["plugin:matrix-org/typescript", "plugin:matrix-org/react"],
->>>>>>> v1.11.25
             // NOTE: These rules are frozen and new rules should not be added here.
             // New changes belong in https://github.com/matrix-org/eslint-plugin-matrix-org/
             rules: {