Regular merge of develop

.ci/deploy.sh

@@ -47,6 +47,12 @@ do
                 ln -s ../../theme/package.json package.json
                 ln -s ../../theme theme
 
+                # reset the theme
+                cd ../../theme
+                git checkout -- templates/_index.html
+                cd $BLADE
+                echo " > Theme reset."
+
                 # add matomo
                 sed -i "/matomohead/r./../../.ci/analytics/head.html" theme/templates/_index.html
                 sed -i "/matomopolicy/r./../../.ci/analytics/policy.html" theme/templates/_index.html