diff --git a/Jenkinsfile b/Jenkinsfile
index 974d78be..89d08d69 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,7 +17,7 @@ pipeline {
 
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=698']) {
+        withEnv(['NEXT_BUILD_NUMBER=699']) {
           // env.versionNumber = VersionNumber(versionNumberString : '5.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '5.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
             env.APP_NAME = 'MAPO'
diff --git a/MP-Tablet/Fermate.aspx b/MP-Tablet/Fermate.aspx
new file mode 100644
index 00000000..fb1841b4
--- /dev/null
+++ b/MP-Tablet/Fermate.aspx
@@ -0,0 +1,22 @@
+<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/Bootstrap.Master" AutoEventWireup="true" CodeBehind="Fermate.aspx.cs" Inherits="MoonProTablet.Fermate" %>
+<%@ Register Src="~/WebUserControls/mod_dettMacchina.ascx" TagName="mod_dettMacchina" TagPrefix="uc1" %>
+<%@ Register Src="~/WebUserControls/mod_dichiarazione.ascx" TagName="mod_dichiarazione" TagPrefix="uc2" %>
+<%@ Register Src="~/WebUserControls/mod_insComm.ascx" TagPrefix="uc1" TagName="mod_insComm" %>
+<%@ Register Src="~/WebUserControls/mod_directLinks.ascx" TagPrefix="uc1" TagName="mod_directLinks" %>
+
+<asp:Content ID="Content1" ContentPlaceHolderID="HeadContent" runat="server">
+</asp:Content>
+<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
+    <div class="container-flow m-3" role="main">
+    <div class="row">
+      <div class="col-12 col-sm-7 col-md-8">
+        <uc1:mod_dettMacchina ID="mod_dettMacchina1" runat="server" />
+        <uc1:mod_insComm runat="server" ID="mod_insComm" showSalva="false" labelAddCommento="Dich Retroattiva" />
+        <uc2:mod_dichiarazione ID="mod_dichiarazione1" runat="server" />
+      </div> 
+      <div class="col-12 col-sm-5 col-md-4">
+        <uc1:mod_directLinks runat="server" ID="mod_directLinks" />
+      </div>
+    </div>
+  </div>
+</asp:Content>
diff --git a/MP-Tablet/Fermate.aspx.cs b/MP-Tablet/Fermate.aspx.cs
new file mode 100644
index 00000000..fc1c4128
--- /dev/null
+++ b/MP-Tablet/Fermate.aspx.cs
@@ -0,0 +1,62 @@
+using SteamWare;
+using System;
+using System.Web.UI;
+
+namespace MoonProTablet
+{
+  public partial class Fermate : System.Web.UI.Page
+  {
+    protected void Page_Load(object sender, EventArgs e)
+    {
+      if (!Page.IsPostBack)
+      {
+        Session["TipoLink"] = "EditMacch";
+        // se c'è una data/ora in sessione la imposto...
+        if (memLayer.ML.isInSessionObject("inizioStato"))
+        {
+          try
+          {
+            DateTime dataOraEv = Convert.ToDateTime(memLayer.ML.objSessionObj("inizioStato"));
+            mod_insComm.dataEv = dataOraEv;
+            memLayer.ML.emptySessionVal("inizioStato");
+          }
+          catch
+          { }
+        }
+      }
+      mod_dichiarazione1.eh_newVal += new EventHandler(mod_dichiarazione1_eh_newVal);
+      mod_insComm.eh_inserting += mod_insComm1_eh_inserting;
+      mod_insComm.eh_reset += mod_insComm1_eh_reset;
+    }
+
+    void mod_insComm1_eh_reset(object sender, EventArgs e)
+    {
+    }
+
+    void mod_insComm1_eh_inserting(object sender, EventArgs e)
+    {
+    }
+    /// <summary>
+    /// chiama udpate x evento in controller dichiarazioni
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    void mod_dichiarazione1_eh_newVal(object sender, EventArgs e)
+    {
+      mod_dettMacchina1.doUpdate();
+      // controllo: se è "aperto" ins dichiarazione metto pure quella...
+      if (!mod_dichiarazione1.insRealtime)
+      {
+        if (mod_insComm.commento != "")
+        {
+          // chiamo insert SE C'E' commento
+          mod_insComm.salvaCommento();
+        }
+        // elimino data ev! e quindi realtime!
+        memLayer.ML.emptySessionVal("dataOraEv");
+        // ricarico pagina!
+        Response.Redirect("Commenti.aspx");
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/MP-Tablet/Fermate.aspx.designer.cs b/MP-Tablet/Fermate.aspx.designer.cs
new file mode 100644
index 00000000..33fe46c6
--- /dev/null
+++ b/MP-Tablet/Fermate.aspx.designer.cs
@@ -0,0 +1,51 @@
+//------------------------------------------------------------------------------
+// <generato automaticamente>
+//     Codice generato da uno strumento.
+//
+//     Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
+//     il codice viene rigenerato. 
+// </generato automaticamente>
+//------------------------------------------------------------------------------
+
+namespace MoonProTablet {
+    
+    
+    public partial class Fermate {
+        
+        /// <summary>
+        /// Controllo mod_dettMacchina1.
+        /// </summary>
+        /// <remarks>
+        /// Campo generato automaticamente.
+        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// </remarks>
+        protected global::MoonProTablet.WebUserControls.mod_dettMacchina mod_dettMacchina1;
+        
+        /// <summary>
+        /// Controllo mod_insComm.
+        /// </summary>
+        /// <remarks>
+        /// Campo generato automaticamente.
+        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// </remarks>
+        protected global::MoonProTablet.WebUserControls.mod_insComm mod_insComm;
+        
+        /// <summary>
+        /// Controllo mod_dichiarazione1.
+        /// </summary>
+        /// <remarks>
+        /// Campo generato automaticamente.
+        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// </remarks>
+        protected global::MoonProTablet.WebUserControls.mod_dichiarazione mod_dichiarazione1;
+        
+        /// <summary>
+        /// Controllo mod_directLinks.
+        /// </summary>
+        /// <remarks>
+        /// Campo generato automaticamente.
+        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// </remarks>
+        protected global::MoonProTablet.WebUserControls.mod_directLinks mod_directLinks;
+    }
+}
diff --git a/MP-Tablet/MP-Tablet.csproj b/MP-Tablet/MP-Tablet.csproj
index 2cdd8901..fb248a3d 100644
--- a/MP-Tablet/MP-Tablet.csproj
+++ b/MP-Tablet/MP-Tablet.csproj
@@ -225,6 +225,7 @@
     <Content Include="DettaglioMacchina.aspx" />
     <Content Include="Dichiarazione.aspx" />
     <Content Include="favicon.ico" />
+    <Content Include="Fermate.aspx" />
     <Content Include="fixODL.aspx" />
     <Content Include="fonts\fontawesome-webfont.svg" />
     <Content Include="Global.asax" />
@@ -555,6 +556,13 @@
     <Compile Include="Dichiarazione.aspx.designer.cs">
       <DependentUpon>Dichiarazione.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Fermate.aspx.cs">
+      <DependentUpon>Fermate.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Fermate.aspx.designer.cs">
+      <DependentUpon>Fermate.aspx</DependentUpon>
+    </Compile>
     <Compile Include="fixODL.aspx.cs">
       <DependentUpon>fixODL.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
diff --git a/MP-Tablet/MP-Tablet.csproj.user b/MP-Tablet/MP-Tablet.csproj.user
index 6ee978d6..1fe66ae0 100644
--- a/MP-Tablet/MP-Tablet.csproj.user
+++ b/MP-Tablet/MP-Tablet.csproj.user
@@ -12,5 +12,29 @@
     <UseGlobalApplicationHostFile />
     <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
   </PropertyGroup>
-  <ProjectExtensions />
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
+        <WebProjectProperties>
+          <StartPageUrl>
+          </StartPageUrl>
+          <StartAction>CurrentPage</StartAction>
+          <AspNetDebugging>True</AspNetDebugging>
+          <SilverlightDebugging>False</SilverlightDebugging>
+          <NativeDebugging>False</NativeDebugging>
+          <SQLDebugging>False</SQLDebugging>
+          <ExternalProgram>
+          </ExternalProgram>
+          <StartExternalURL>
+          </StartExternalURL>
+          <StartCmdLineArguments>
+          </StartCmdLineArguments>
+          <StartWorkingDirectory>
+          </StartWorkingDirectory>
+          <EnableENC>True</EnableENC>
+          <AlwaysStartWebServerOnDebug>True</AlwaysStartWebServerOnDebug>
+        </WebProjectProperties>
+      </FlavorProperties>
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/SQL Utils/SqlUpdate_5.0.sql b/SQL Utils/SqlUpdate_5.0.sql
index 7735c16f..2f0e3e66 100644
--- a/SQL Utils/SqlUpdate_5.0.sql	
+++ b/SQL Utils/SqlUpdate_5.0.sql	
@@ -6,3 +6,9 @@ UPDATE LinkMenuJQM
  WHERE idxLink=14 OR Testo='Logout'
 GO
 
+
+UPDATE LinkMenuJQM
+   SET NavigateUrl = '~/Fermate.aspx'
+ WHERE Testo = 'Fermate'
+GO
+