Merge branch 'main' into feature/user_profile

# Conflicts:
#	public/userarea/include/topbar.php
#	public/userarea/scadenzario/include/my_deadlines_widget.php

public/userarea/include/topbar.php

@@ -100,7 +100,7 @@
                         </a>
                     </li>
                     <li>
-                        <a class="dropdown-item d-flex align-items-center" href="../users">
+                        <a class="dropdown-item d-flex align-items-center" href="user_settings.php">
                             <i class="bx bx-user fs-5"></i><span>Utente</span>
                         </a>
                     </li>
@@ -117,4 +117,4 @@
             </div>
         </nav>
     </div>
-</header>
+</header>