reporting: reorder menu, associate settings page correctly

src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml

@@ -7,9 +7,7 @@
         <Password order="2" url="/system_usermanager_passwordmg.php" cssClass="fa fa-key fa-fw"/>
         <Logout order="3" url="/index.php?logout" cssClass="fa fa-sign-out fa-fw"/>
     </Lobby>
-    <Reporting order="15" cssClass="fa fa-area-chart">
-        <Settings order="100" url="/reporting_settings.php" cssClass="fa fa-cog fa-fw"/>
-    </Reporting>
+    <Reporting order="15" cssClass="fa fa-area-chart"/>
     <System order="20" cssClass="fa fa-server">
         <Trust order="120" cssClass="fa fa-certificate fa-fw">
             <Certificates url="/system_certmanager.php">

src/opnsense/mvc/app/models/OPNsense/Diagnostics/Menu/Menu.xml

 <menu>
     <Reporting>
         <Health order="10" url="/ui/diagnostics/systemhealth/" cssClass="fa fa-heartbeat fa-fw"/>
-        <Insight order="20" url="/ui/diagnostics/networkinsight/" cssClass="fa fa-binoculars fa-fw" />
-        <NetFlow order="30" url="/ui/diagnostics/netflow/" cssClass="fa fa-rss fa-fw"/>
+        <Settings order="20" url="/reporting_settings.php" cssClass="fa fa-cog fa-fw"/>
+        <Insight order="30" url="/ui/diagnostics/networkinsight/" cssClass="fa fa-binoculars fa-fw" />
+        <NetFlow order="40" url="/ui/diagnostics/netflow/" cssClass="fa fa-rss fa-fw"/>
     </Reporting>
     <System>
         <Diagnostics order="160" url="/ui/diagnostics/activity/" cssClass="fa fa-medkit fa-fw"/>