diff --git a/.vs/config/applicationhost.config b/.vs/config/applicationhost.config
index c4cea66..47dffd4 100644
--- a/.vs/config/applicationhost.config
+++ b/.vs/config/applicationhost.config
@@ -184,6 +184,30 @@
                     <binding protocol="http" bindingInformation="*:14285:localhost" />
                 </bindings>
             </site>
+            <site name="GPW_Barcode" id="5">
+                <application path="/" applicationPool="Clr4IntegratedAppPool">
+                    <virtualDirectory path="/" physicalPath="C:\Users\samuele.STEAMWAREWIN\Documents\VisualStudioProjects\GPW\GPW\GPW_Barcode" />
+                </application>
+                <bindings>
+                    <binding protocol="http" bindingInformation="*:17423:localhost" />
+                </bindings>
+            </site>
+            <site name="GPW_Commesse" id="6">
+                <application path="/" applicationPool="Clr4IntegratedAppPool">
+                    <virtualDirectory path="/" physicalPath="C:\Users\samuele.STEAMWAREWIN\Documents\VisualStudioProjects\GPW\GPW\GPW_Commesse" />
+                </application>
+                <bindings>
+                    <binding protocol="http" bindingInformation="*:17481:localhost" />
+                </bindings>
+            </site>
+            <site name="GPW_Admin" id="7">
+                <application path="/" applicationPool="Clr4IntegratedAppPool">
+                    <virtualDirectory path="/" physicalPath="C:\Users\samuele.STEAMWAREWIN\Documents\VisualStudioProjects\GPW\GPW\GPW_Admin" />
+                </application>
+                <bindings>
+                    <binding protocol="http" bindingInformation="*:17490:localhost" />
+                </bindings>
+            </site>
             <siteDefaults>
                 <logFile logFormat="W3C" directory="%IIS_USER_HOME%\Logs" />
                 <traceFailedRequestsLogging directory="%IIS_USER_HOME%\TraceLogFiles" enabled="true" maxLogFileSizeKB="1024" />
@@ -1062,4 +1086,24 @@
             </security>
         </system.webServer>
     </location>
+    <location path="GPW_Commesse">
+        <system.webServer>
+            <security>
+                <authentication>
+                    <windowsAuthentication enabled="true" />
+                    <anonymousAuthentication enabled="false" />
+                </authentication>
+            </security>
+        </system.webServer>
+    </location>
+    <location path="GPW_Admin">
+        <system.webServer>
+            <security>
+                <authentication>
+                    <windowsAuthentication enabled="true" />
+                    <anonymousAuthentication enabled="false" />
+                </authentication>
+            </security>
+        </system.webServer>
+    </location>
 </configuration>
diff --git a/GPW.sln b/GPW.sln
index 08cf75a..9a9fe4a 100644
--- a/GPW.sln
+++ b/GPW.sln
@@ -13,6 +13,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SteamWare", "..\..\Steamwar
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GPW_Smart", "GPW_Smart\GPW_Smart.csproj", "{4A1F29A9-D692-4E42-873E-492496368777}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GPW_Barcode", "GPW_Barcode\GPW_Barcode.csproj", "{C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		218_SP|Any CPU = 218_SP|Any CPU
@@ -259,6 +261,50 @@ Global
 		{4A1F29A9-D692-4E42-873E-492496368777}.Steamware|Any CPU.Build.0 = Release|Any CPU
 		{4A1F29A9-D692-4E42-873E-492496368777}.WinLab|Any CPU.ActiveCfg = Release|Any CPU
 		{4A1F29A9-D692-4E42-873E-492496368777}.WinLab|Any CPU.Build.0 = Release|Any CPU
+		{C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.218_SP|Any CPU.ActiveCfg = Release|Any CPU
+		{C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.218_SP|Any CPU.Build.0 = Release|Any CPU
+		{C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.218_test|Any CPU.ActiveCfg = Release|Any CPU
+		{C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.218_test|Any CPU.Build.0 = Release|Any CPU
+		{C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.Alumat|Any CPU.ActiveCfg = Release|Any CPU
+		{C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.Alumat|Any CPU.Build.0 = Release|Any CPU
+		{C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.CMS|Any CPU.ActiveCfg = Release|Any CPU
+		{C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.CMS|Any CPU.Build.0 = Release|Any CPU
+		{C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.DEMO|Any CPU.ActiveCfg = Debug|Any CPU
+		{C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.DEMO|Any CPU.Build.0 = Debug|Any CPU
+		{C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.deploy|Any CPU.ActiveCfg = Debug|Any CPU
+		{C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.deploy|Any CPU.Build.0 = Debug|Any CPU
+		{C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.EQUA|Any CPU.ActiveCfg = Release|Any CPU
+		{C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.EQUA|Any CPU.Build.0 = Release|Any CPU
+		{C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.ETS|Any CPU.ActiveCfg = Release|Any CPU
+		{C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.ETS|Any CPU.Build.0 = Release|Any CPU
+		{C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.ETS-218|Any CPU.ActiveCfg = Release|Any CPU
+		{C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.ETS-218|Any CPU.Build.0 = Release|Any CPU
+		{C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.IIS|Any CPU.ActiveCfg = Release|Any CPU
+		{C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.IIS|Any CPU.Build.0 = Release|Any CPU
+		{C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.IIS01_SP|Any CPU.ActiveCfg = Release|Any CPU
+		{C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.IIS01_SP|Any CPU.Build.0 = Release|Any CPU
+		{C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.IIS01_TK|Any CPU.ActiveCfg = Release|Any CPU
+		{C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.IIS01_TK|Any CPU.Build.0 = Release|Any CPU
+		{C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.IIS01|Any CPU.ActiveCfg = Release|Any CPU
+		{C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.IIS01|Any CPU.Build.0 = Release|Any CPU
+		{C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.IIS02_SP|Any CPU.ActiveCfg = Release|Any CPU
+		{C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.IIS02_SP|Any CPU.Build.0 = Release|Any CPU
+		{C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.IIS02_TK|Any CPU.ActiveCfg = Release|Any CPU
+		{C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.IIS02_TK|Any CPU.Build.0 = Release|Any CPU
+		{C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.IIS02|Any CPU.ActiveCfg = Release|Any CPU
+		{C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.IIS02|Any CPU.Build.0 = Release|Any CPU
+		{C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.MoonProDemo-OVH|Any CPU.ActiveCfg = Release|Any CPU
+		{C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.MoonProDemo-OVH|Any CPU.Build.0 = Release|Any CPU
+		{C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.SomaschiniUSA|Any CPU.ActiveCfg = Release|Any CPU
+		{C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.SomaschiniUSA|Any CPU.Build.0 = Release|Any CPU
+		{C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.Steamware|Any CPU.ActiveCfg = Release|Any CPU
+		{C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.Steamware|Any CPU.Build.0 = Release|Any CPU
+		{C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.WinLab|Any CPU.ActiveCfg = Release|Any CPU
+		{C43C7EA3-7D2F-4ED2-9303-791AAB8BB490}.WinLab|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/GPW_Smart/Bundle.config b/GPW_Smart/Bundle.config
index 0ba3250..689b047 100644
--- a/GPW_Smart/Bundle.config
+++ b/GPW_Smart/Bundle.config
@@ -37,7 +37,7 @@
     -->
   </styleBundle>
 
-  <styleBundle path="~/Content/droid">
+  <styleBundle path="~/Content/nativeDroid/droid">
     <include path="~/Content/nativeDroid/nativedroid2.css" />
     <include path="~/Content/waves/waves.min.css" />
     <include path="~/Content/wow/animate.css" />
diff --git a/GPW_Smart/Content/nativeDroid/nativedroid2.css b/GPW_Smart/Content/nativeDroid/nativedroid2.css
index 07d628f..6ab1ff9 100644
--- a/GPW_Smart/Content/nativeDroid/nativedroid2.css
+++ b/GPW_Smart/Content/nativeDroid/nativedroid2.css
@@ -21,8 +21,8 @@
 @import url("nativedroid2.color.blue-grey.css");
 
 
-@import url("nativeDroid/flexboxgrid.min.css");
-@import url("nativeDroid/material-design-iconic-font.min.css");
+@import url("flexboxgrid.min.css");
+@import url("material-design-iconic-font.min.css");
 @import url(//fonts.googleapis.com/css?family=RobotoDraft:300,400,500,700,400italic);
 @import url(//fonts.googleapis.com/css?family=Roboto:400,300,500,400italic,700,900);
 
@@ -581,9 +581,9 @@ code {
 
 }
 
-.ui-page-theme-a .ui-btn.ui-btn-fab {
-    /*padding: 11.2px 16px;*/
-}
+/*.ui-page-theme-a .ui-btn.ui-btn-fab {
+    padding: 11.2px 16px;
+}*/
 
 .ui-btn-fab-bottom {
 
@@ -1020,9 +1020,9 @@ html >body .ui-rangeslider .ui-rangeslider-sliders .ui-slider-track:first-child
  * Popup / Dialog
  */
 
-.ui-popup .ui-header .ui-title {
-/*	margin-left: 1em;*/
-}
+/*.ui-popup .ui-header .ui-title {
+    margin-left: 1em;
+}*/
 
 .ui-popup {
     box-shadow: 0px 0px 5px rgba(0,0,0,0.1);
diff --git a/GPW_Smart/Timbrature.aspx b/GPW_Smart/Timbrature.aspx
index 084a8cc..cf977f6 100644
--- a/GPW_Smart/Timbrature.aspx
+++ b/GPW_Smart/Timbrature.aspx
@@ -8,10 +8,14 @@
     Timbrature
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
-    <uc1:mod_timbrature ID="mod_timbrature1" runat="server" />
+    <asp:ScriptManager EnablePartialRendering="true" EnableScriptGlobalization="true" EnableScriptLocalization="true" EnableCdn="false" runat="server"></asp:ScriptManager>
+    <asp:UpdatePanel runat="server" ID="pnlTimbrature">
+        <ContentTemplate>
+            <uc1:mod_timbrature ID="mod_timbrature1" runat="server" />
+        </ContentTemplate>
+    </asp:UpdatePanel>
 </asp:Content>
 <asp:Content ID="Content3" ContentPlaceHolderID="btOptContent" runat="server">
-    <asp:ScriptManager EnablePartialRendering="true" EnableScriptGlobalization="true" EnableScriptLocalization="true" EnableCdn="false" runat="server"></asp:ScriptManager>
     <asp:UpdatePanel runat="server" ID="pnlBottom">
         <ContentTemplate>
             <uc1:mod_mancTimb runat="server" ID="mod_mancTimb" />
@@ -20,6 +24,7 @@
 
     <script type="text/javascript">
         function pageLoad(sender, args) {
+            $('#<%= pnlTimbrature.ClientID %>').trigger('create');
             $('#<%= pnlBottom.ClientID %>').trigger('create');
         }
     </script>
diff --git a/GPW_Smart/Timbrature.aspx.designer.cs b/GPW_Smart/Timbrature.aspx.designer.cs
index 0947fc6..96bd20a 100644
--- a/GPW_Smart/Timbrature.aspx.designer.cs
+++ b/GPW_Smart/Timbrature.aspx.designer.cs
@@ -12,6 +12,15 @@ namespace GPW_Smart {
     
     public partial class Timbrature {
         
+        /// <summary>
+        /// pnlTimbrature control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.UpdatePanel pnlTimbrature;
+        
         /// <summary>
         /// mod_timbrature1 control.
         /// </summary>
diff --git a/GPW_Smart/Web.config b/GPW_Smart/Web.config
index 9cb98e9..9520b81 100644
--- a/GPW_Smart/Web.config
+++ b/GPW_Smart/Web.config
@@ -119,8 +119,8 @@
     <add key="TagCloudMode" value="elenco" />
     <!--Gestione auth dispositivi mobile-->
     <add key="authKey" value="keyhammer" />
-    <add key="baseUrl" value="http://iis02/GPW/" />
-    <add key="baseWebUrl" value="http://keyhammer.ath.cx:8083/GPW/" />
+    <add key="baseUrl" value="http://iis02/GPW-Smart/" />
+    <add key="baseWebUrl" value="http://keyhammer.steamware.net:8083/GPW-Smart/" />
     <!--Gestione SSRS-->
     <add key="reportBaseUrl" value="http://sql-steam/ReportServer?/Steamware/" />
     <!--<add key="reportBaseUrl" value="http://sql-steam/Reports/Pages/Report.aspx?ItemPath=/Steamware/" />-->
diff --git a/GPW_Smart/WebMasterPages/JQMob.Master b/GPW_Smart/WebMasterPages/JQMob.Master
index b41a45a..c1b05a4 100644
--- a/GPW_Smart/WebMasterPages/JQMob.Master
+++ b/GPW_Smart/WebMasterPages/JQMob.Master
@@ -33,12 +33,10 @@
     <link rel="stylesheet" href="~/Content/wow/animate.css" />
 
     <webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/jqm" />
-    <webopt:BundleReference ID="BundleReference3" runat="server" Path="~/Content/droid" />
+    <webopt:BundleReference ID="BundleReference3" runat="server" Path="~/Content/nativeDroid/droid" />
     <webopt:BundleReference ID="BundleReference4" runat="server" Path="~/Content/bootstrap" />
     <webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
 
-    <link rel="stylesheet" href="~/Content/nativeDroid/nativedroid2.css" />
-
     <asp:ContentPlaceHolder ID="head" runat="server">
     </asp:ContentPlaceHolder>
 </head>
@@ -55,7 +53,6 @@
                 </h3>
             </div>
             
-            <%--<div role="main" class="ui-content" data-inset="false" style="padding: 1em 0;">--%>
             <div role="main" class="ui-content" data-inset="false">
                 <asp:ContentPlaceHolder ID="MainContent" runat="server">
                 </asp:ContentPlaceHolder>
@@ -75,10 +72,10 @@
             </div>
         </div>
 
-        <%--<script src="../Content/waves/waves.min.js"></script>
+        <script src="../Content/waves/waves.min.js"></script>
         <script src="../Content/wow/wow.min.js"></script>
         <script src="../Scripts/nativedroid2.js"></script>
-        <script src="../Scripts/nd2settings.js"></script>--%>
+        <script src="../Scripts/nd2settings.js"></script>
 
     </form>
 </body>
diff --git a/GPW_Smart/WebUserControls/mod_sendAuthToEmail.ascx b/GPW_Smart/WebUserControls/mod_sendAuthToEmail.ascx
index da93ede..b4d4a40 100644
--- a/GPW_Smart/WebUserControls/mod_sendAuthToEmail.ascx
+++ b/GPW_Smart/WebUserControls/mod_sendAuthToEmail.ascx
@@ -10,10 +10,10 @@
 <asp:Label runat="server" ID="lblWarning" Visible="false" />
 <div class="ui-grid-a">
     <div class="ui-block-a">
-        <asp:Button runat="server" ID="btnConferma" Text="Email" CssClass="ui-btn ui-btn-icon-left ui-mini ui-btn-inline clr-btn-blue" OnClick="btnConferma_Click" />
+        <asp:LinkButton runat="server" ID="lbtSendEmail" Text="Email" CssClass="ui-btn ui-btn-icon-left ui-mini clr-btn-blue ui-icon-mail" CausesValidation="false" OnClick="lbtSendEmail_Click" />
     </div>
     <div class="ui-block-b">
-        <asp:Button runat="server" ID="btnAnnulla" Text="Annulla" CssClass="ui-btn ui-btn-icon-left ui-mini ui-btn-inline clr-btn-orange" CausesValidation="false" />
+        <asp:LinkButton runat="server" ID="lbtAnnulla" Text="Annulla" CssClass="ui-btn ui-btn-icon-left ui-mini clr-btn-orange ui-icon-back" CausesValidation="false" />
     </div>
 </div>
 <div data-role="content">
diff --git a/GPW_Smart/WebUserControls/mod_sendAuthToEmail.ascx.cs b/GPW_Smart/WebUserControls/mod_sendAuthToEmail.ascx.cs
index 1cd3e51..0775a6f 100644
--- a/GPW_Smart/WebUserControls/mod_sendAuthToEmail.ascx.cs
+++ b/GPW_Smart/WebUserControls/mod_sendAuthToEmail.ascx.cs
@@ -16,17 +16,23 @@ namespace GPW.WebUserControls
 
         }
         /// <summary>
-        /// salvo nuovo device...
+        /// resetto tutto
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        protected void btnConferma_Click(object sender, EventArgs e)
+        protected void btnAnnulla_Click(object sender, EventArgs e)
+        {
+            ddlIdxDipendente.SelectedIndex = 0;
+            lblWarning.Visible = false;
+        }
+
+        protected void lbtSendEmail_Click(object sender, EventArgs e)
         {
             // cerco key x user selezionato
             int idxDipendente = 0;
             string UserAuthKey = "";
             string destinatario = "";
-            
+
             DS_Applicazione.DipendentiRow dipendente = null;
             try
             {
@@ -43,15 +49,5 @@ namespace GPW.WebUserControls
                 DataProxy.DP.sendUserAuthEmail(destinatario, UserAuthKey, idxDipendente);
             }
         }
-        /// <summary>
-        /// resetto tutto
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void btnAnnulla_Click(object sender, EventArgs e)
-        {
-            ddlIdxDipendente.SelectedIndex = 0;
-            lblWarning.Visible = false;
-        }
     }
 }
\ No newline at end of file
diff --git a/GPW_Smart/WebUserControls/mod_sendAuthToEmail.ascx.designer.cs b/GPW_Smart/WebUserControls/mod_sendAuthToEmail.ascx.designer.cs
index 84be4ac..4ced933 100644
--- a/GPW_Smart/WebUserControls/mod_sendAuthToEmail.ascx.designer.cs
+++ b/GPW_Smart/WebUserControls/mod_sendAuthToEmail.ascx.designer.cs
@@ -40,21 +40,21 @@ namespace GPW.WebUserControls {
         protected global::System.Web.UI.WebControls.Label lblWarning;
         
         /// <summary>
-        /// btnConferma control.
+        /// lbtSendEmail control.
         /// </summary>
         /// <remarks>
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Button btnConferma;
+        protected global::System.Web.UI.WebControls.LinkButton lbtSendEmail;
         
         /// <summary>
-        /// btnAnnulla control.
+        /// lbtAnnulla control.
         /// </summary>
         /// <remarks>
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Button btnAnnulla;
+        protected global::System.Web.UI.WebControls.LinkButton lbtAnnulla;
     }
 }