diff --git a/EgtBEAMWALL.Core/Constants/ConstBeam.vb b/EgtBEAMWALL.Core/Constants/ConstBeam.vb
index 3817aa6d..dd0abf8e 100644
--- a/EgtBEAMWALL.Core/Constants/ConstBeam.vb
+++ b/EgtBEAMWALL.Core/Constants/ConstBeam.vb
@@ -264,4 +264,9 @@
    Friend Const WRH_KERF As String = "Kerf"
    Friend Const WRH_S As String = "S"
 
+   ' parametri import/export
+   Public Const EXP_PROJ As String = "EXPORTPROJ"
+   Public Const EXP_PROD As String = "EXPORTPROD"
+   Public Const BTLFILENAME As String = "BTLFILENAME"
+
 End Module
diff --git a/EgtBEAMWALL.DataLayer/Controllers/ProjController.cs b/EgtBEAMWALL.DataLayer/Controllers/ProjController.cs
index 02f1d005..d43881f6 100644
--- a/EgtBEAMWALL.DataLayer/Controllers/ProjController.cs
+++ b/EgtBEAMWALL.DataLayer/Controllers/ProjController.cs
@@ -335,6 +335,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                 //currProjs.ForEach(x => x.Locked = Locked);
                 foreach (var item in currProjs)
                 {
+               //item.ProdDbId = currProd.ProdDbId;
                     item.Locked = Locked;
                     dbCtx.Entry(item).State = System.Data.Entity.EntityState.Modified;
                 }
diff --git a/EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj b/EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj
index 3bf7bd8b..50ed7283 100644
--- a/EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj
+++ b/EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj
@@ -115,6 +115,9 @@
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
+    <Reference Include="Ionic.Zip">
+      <HintPath>..\..\..\EgtProg\EgtBEAMWALL\Ionic.Zip.dll</HintPath>
+    </Reference>
     <Reference Include="MySql.Data, Version=6.10.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
       <HintPath>..\packages\MySql.Data.6.10.9\lib\net40\MySql.Data.dll</HintPath>
     </Reference>
@@ -588,9 +591,6 @@
   <ItemGroup>
     <Resource Include="Resources\EgtBEAMWALL.ico" />
     <Resource Include="Resources\InstrumentPanel\GetDist.png" />
-    <Resource Include="Resources\ProjectManager\DxfOut.png" />
-    <Resource Include="Resources\ProjectManager\Export.png" />
-    <Resource Include="Resources\ProjectManager\Import.png" />
     <Resource Include="Resources\ProjectManager\New.png" />
     <Resource Include="Resources\ProjectManager\Open.png" />
     <Resource Include="Resources\ProjectManager\Options.png" />
@@ -703,6 +703,15 @@
   <ItemGroup>
     <Resource Include="Resources\Configuration\MachiningsTable.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\ProjectManager\ImportBTL.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\ProjectManager\ImportProject.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\ProjectManager\ExportProject.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\EgtBEAMWALL\EgtBEAMWALL.ViewerOptimizerR32.exe
diff --git a/EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb b/EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb
index ead43ef5..b20d6b86 100644
--- a/EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb
@@ -271,6 +271,8 @@ Public Class OpenProjectFileDialogVM
    ''' </summary>
    Friend Sub Delete()
       If IsNothing(SelProject) Then Return
+      ' recupero indice per riselezionare
+      Dim ProjListIndex As Integer = m_ProjectList.IndexOf(SelProject)
       If m_ProjectType = ProjectType.PROJ Then
          ' verifico se proj selezionato e' il corrente
          If Not IsNothing(Map.refProjManagerVM.CurrProj) AndAlso SelProject.nProjId = Map.refProjManagerVM.CurrProj.nProjId Then
@@ -350,6 +352,14 @@ Public Class OpenProjectFileDialogVM
             m_ProjectList.Add(New ProdFileVM(Project))
          Next
       End If
+      ' ripristino selezionato
+      If ProjListIndex >= 0 AndAlso ProjListIndex <= m_ProjectList.Count - 1 Then
+         SelProject = m_ProjectList(ProjListIndex)
+         NotifyPropertyChanged(NameOf(SelProject))
+      End If
+      ' reset dei controller per tornare in sync
+      DbControllers.m_ProjController.ResetController()
+      DbControllers.m_ProdController.ResetController()
    End Sub
 
 #End Region ' Delete
diff --git a/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerV.xaml b/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerV.xaml
index 6a1a1660..df83ba3e 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerV.xaml
+++ b/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerV.xaml
@@ -27,10 +27,10 @@
             Style="{StaticResource ToolBar_Button}">
       <Image Source="/Resources/ProjectManager/SaveAs.png" Stretch="Uniform"/>
    </Button>-->
-   <Button Command="{Binding Import_Command}"
-           ToolTip="{Binding Import_ToolTip}"
+   <Button Command="{Binding ImportBTL_Command}"
+           ToolTip="{Binding ImportBTL_ToolTip}"
            Style="{StaticResource ToolBar_Button}">
-      <Image Source="/Resources/ProjectManager/Import.png" Stretch="Uniform"/>
+      <Image Source="/Resources/ProjectManager/ImportBTL.png" Stretch="Uniform"/>
    </Button>
    <!--<Button Command="{Binding OptionsCommand}"
             ToolTip="{Binding OptionsToolTip}"
@@ -46,6 +46,16 @@
            Command="{Binding UpdateBTL_Command}"
            ToolTip="{Binding UpdateBTL_ToolTip}"
            Style="{StaticResource ToolBar_Button}"/>
+   <Button Command="{Binding ExportProject_Command}"
+           ToolTip="{Binding ExportProject_ToolTip}"
+           Style="{StaticResource ToolBar_Button}">
+      <Image Source="/Resources/ProjectManager/ExportProject.png" Stretch="Uniform"/>
+   </Button>
+   <Button Command="{Binding ImportProject_Command}"
+           ToolTip="{Binding ImportProject_ToolTip}"
+           Style="{StaticResource ToolBar_Button}">
+      <Image Source="/Resources/ProjectManager/ImportProject.png" Stretch="Uniform"/>
+   </Button>
    <Button Content=">"
            Command="{Binding GoToProd_Command}"
            ToolTip="{Binding GoToProd_ToolTip}"
diff --git a/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb b/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb
index 29e90cf7..fde1319f 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb
@@ -57,7 +57,9 @@ Public Class ProjManagerVM
    Private m_cmdSaveAs As ICommand
    Private m_cmdExport As ICommand
    Private m_cmdDxfOut As ICommand
-   Private m_cmdImport As ICommand
+   Private m_cmdImportBTL As ICommand
+   Private m_cmdImportProject As ICommand
+   Private m_cmdExportProject As ICommand
    Private m_cmdGoToProd As ICommand
    Private m_cmdSendFeedback As ICommand
 
@@ -89,9 +91,9 @@ Public Class ProjManagerVM
          Return EgtMsg(MSG_TOPCOMMANDBAR + 5)
       End Get
    End Property
-   Public ReadOnly Property Import_ToolTip As String
+   Public ReadOnly Property ImportBTL_ToolTip As String
       Get
-         Return EgtMsg(MSG_TOPCOMMANDBAR + 6)
+         Return EgtMsg(61838)
       End Get
    End Property
    Public ReadOnly Property UpdateBTL_ToolTip As String
@@ -99,6 +101,16 @@ Public Class ProjManagerVM
          Return EgtMsg(61834)
       End Get
    End Property
+   Public ReadOnly Property ExportProject_ToolTip As String
+      Get
+         Return EgtMsg(61836)
+      End Get
+   End Property
+   Public ReadOnly Property ImportProject_ToolTip As String
+      Get
+         Return EgtMsg(61837)
+      End Get
+   End Property
    Public ReadOnly Property GoToProd_ToolTip As String
       Get
          Return EgtMsg(61835)
@@ -333,24 +345,24 @@ Public Class ProjManagerVM
 
 #End Region ' SaveCommand
 
-#Region "Import"
+#Region "ImportBTL"
 
    ''' <summary>
    ''' Returns a command that do Export.
    ''' </summary>
-   Public ReadOnly Property Import_Command As ICommand
+   Public ReadOnly Property ImportBTL_Command As ICommand
       Get
-         If m_cmdImport Is Nothing Then
-            m_cmdImport = New Command(AddressOf Import)
+         If m_cmdImportBTL Is Nothing Then
+            m_cmdImportBTL = New Command(AddressOf ImportBTL)
          End If
-         Return m_cmdImport
+         Return m_cmdImportBTL
       End Get
    End Property
 
    ''' <summary>
    ''' Execute the Export.  This method is invoked by the ExportCommand.
    ''' </summary>
-   Public Sub Import()
+   Public Sub ImportBTL()
       If Not ProjFileVM.VerifyProjectModification(CurrProj, ProjectType.PROJ) Then Return
       Dim sDir As String = String.Empty
       GetMainPrivateProfileString(S_GENERAL, K_LASTIMPDIR, "", sDir)
@@ -401,7 +413,6 @@ Public Class ProjManagerVM
       If bOk Then
          ' aggiorno Db
          Dim sBTLFileName As String = Path.GetFileNameWithoutExtension(BTLDlg.FileName)
-         'UpdateBTLFileName(nProjId, sBTLFileName)
          Dim ExportDate As DateTime
          DateTime.TryParse(Map.refProjectVM.BTLStructureVM.BTLStructureM.m_sEXPDATE & " " &
                            Map.refProjectVM.BTLStructureVM.BTLStructureM.m_sEXPTIME, ExportDate)
@@ -416,7 +427,289 @@ Public Class ProjManagerVM
       Map.refMainWindowVM.UpdateTitle()
    End Sub
 
-#End Region ' Import
+#End Region ' ImportBTL
+
+#Region "ExportProject"
+
+   ''' <summary>
+   ''' Returns a command that do Export.
+   ''' </summary>
+   Public ReadOnly Property ExportProject_Command As ICommand
+      Get
+         If m_cmdExportProject Is Nothing Then
+            m_cmdExportProject = New Command(AddressOf ExportProject)
+         End If
+         Return m_cmdExportProject
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the Export.  This method is invoked by the ExportCommand.
+   ''' </summary>
+   Public Sub ExportProject()
+      If Not ProjFileVM.VerifyProjectModification(CurrProj, ProjectType.PROJ) Then Return
+      If IsNothing(CurrProj) Then Return
+      ' apro finestra di salvataggio progetto
+      Dim ExportDlg As New Microsoft.Win32.SaveFileDialog() With {.DefaultExt = ".ngexp",
+                                                                  .Filter = "ProjectExport (*.ngexp)|*.ngexp",
+                                                                  .FileName = CurrProj.nProjId.ToString("0000") & " - " & CurrProj.sBTLFileName & " - ProjectExport"}
+      If ExportDlg.ShowDialog() <> True Then Return
+      ' per ogni BTLInfo nel progetto riporto il relativo nome del BTL
+      Dim nBTLInfoProjId As Integer
+      Dim nBTLInfoLayerId As Integer = EgtGetFirstNameInGroup(GDB_ID.ROOT, BTLINFO)
+      While nBTLInfoLayerId <> GDB_ID.NULL
+         ' recupero il ProjId
+         EgtGetInfo(nBTLInfoLayerId, BTL_PRT_PROJ, nBTLInfoProjId)
+         If nBTLInfoProjId > 0 Then
+            ' recupero il BTL file name di questo proj
+            Dim BTLFileNameProj As ProjFileM = DbControllers.m_ProjController.FindByProjIdConv(nBTLInfoProjId)
+            If Not IsNothing(BTLFileNameProj) Then
+               EgtSetInfo(nBTLInfoLayerId, BTLFILENAME, BTLFileNameProj.sBTLFileName)
+            End If
+         End If
+         nBTLInfoLayerId = EgtGetNextName(nBTLInfoLayerId, BTLINFO)
+      End While
+      '' se c'e' un prod collegato
+      'If Map.refProjManagerVM.CurrProj.nProdId > 0 Then
+      '   ' scrivo quali sono i proj e prod in questo file
+      '   Dim Prod As ProdFileM = DbControllers.m_ProdController.FindCoreByProdId(Map.refProjManagerVM.CurrProj.nProdId)
+      '   EgtSetInfo(Map.refProjectVM.BTLStructureVM.BTLStructureM.nBTLInfoId, EXP_PROD, Map.refProjManagerVM.CurrProj.nProdId)
+      '   For ProjIndex = 0 To Prod.nProjIdList.Count - 1
+      '      EgtSetInfo(Map.refProjectVM.BTLStructureVM.BTLStructureM.nBTLInfoId, EXP_PROJ & ProjIndex + 1, Prod.nProjIdList(ProjIndex))
+      '   Next
+      'Else
+      '   EgtSetInfo(Map.refProjectVM.BTLStructureVM.BTLStructureM.nBTLInfoId, EXP_PROJ & 1, Map.refProjManagerVM.CurrProj.nProjId)
+      'End If
+      ' salvo info inserite
+      Map.refSceneHostVM.SaveProject()
+      ' creo file zip
+      Dim sZipToCreate As String = ExportDlg.FileName
+      If File.Exists(sZipToCreate) Then
+         File.Delete(sZipToCreate)
+      End If
+      Try
+         Using zip As New Ionic.Zip.ZipFile(sZipToCreate, Console.Out)
+            ' impacchetto tutta la cartella del progetto
+            Dim sProjectDirPath As String = If(CurrProj.nProdId > 0, CurrProj.sProdDirPath, CurrProj.sProjDirPath)
+            For Each sFile As String In Directory.GetFiles(sProjectDirPath)
+               zip.AddItem(sFile, "")
+            Next
+            ' salvo lo zip
+            zip.Save()
+         End Using
+      Catch ex1 As Exception
+         EgtOutLog("Exception in zip: " & ex1.ToString())
+         MessageBox.Show("Impossibile creare file di export")
+      End Try
+   End Sub
+
+#End Region ' ExportProject
+
+#Region "ImportProject"
+
+   ''' <summary>
+   ''' Returns a command that do Export.
+   ''' </summary>
+   Public ReadOnly Property ImportProject_Command As ICommand
+      Get
+         If m_cmdImportProject Is Nothing Then
+            m_cmdImportProject = New Command(AddressOf ImportProject)
+         End If
+         Return m_cmdImportProject
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the Export.  This method is invoked by the ExportCommand.
+   ''' </summary>
+   Public Sub ImportProject()
+      ' lista di tutti gli errori riscontrati
+      Dim ErrorList As New List(Of String)
+      If Not ProjFileVM.VerifyProjectModification(CurrProj, ProjectType.PROJ) Then Return
+      Dim sDir As String = String.Empty
+      GetMainPrivateProfileString(S_GENERAL, K_LASTIMPDIR, "", sDir)
+      ' apro finestra scelta file
+      Dim ImportDlg As New Microsoft.Win32.OpenFileDialog() With {.DefaultExt = ".ngexp",
+                                                                  .Filter = "ProjectExport (*.ngexp)|*.ngexp",
+                                                                  .CheckFileExists = True,
+                                                                  .ValidateNames = True}
+      If ImportDlg.ShowDialog() <> True Then Return
+      ' creo cartella temporanea di estrazione in Temp
+      Dim sProjectimportDir As String = Map.refMainWindowVM.MainWindowM.sTempDir & "\ProjectImport"
+      If Directory.Exists(sProjectimportDir) Then
+         Directory.Delete(sProjectimportDir, True)
+      End If
+      Directory.CreateDirectory(sProjectimportDir)
+      Try
+         Using zip As New Ionic.Zip.ZipFile(ImportDlg.FileName, Console.Out)
+            ' estraggo file da zip
+            zip.ExtractAll(sProjectimportDir)
+         End Using
+      Catch ex1 As Exception
+         EgtOutLog("Exception in zip: " & ex1.ToString())
+         MessageBox.Show("Impossibile importare file", "Errore")
+         Return
+      End Try
+      ' carico progetto
+      Dim sProjFromPath() As String = Directory.GetFiles(sProjectimportDir, "*.nge")
+      Dim bOk = EgtOpenFile(sProjFromPath(0))
+      If Not bOk Then
+         MessageBox.Show("Impossibile aprire il file", "Errore")
+         Return
+      End If
+      ' leggo proj e prod presenti dai layer BTLInfo
+      Dim ImportProjIdList As New List(Of Integer)
+      Dim NewProjIdList As New List(Of Integer)
+      Dim BTLInfoIdList As New List(Of Integer)
+      Dim BTLFileNameList As New List(Of String)
+      Dim CurrImportProjId As Integer
+      Dim nBTLInfoLayerId As Integer = EgtGetFirstNameInGroup(GDB_ID.ROOT, BTLINFO)
+      While nBTLInfoLayerId <> GDB_ID.NULL
+         ' recupero il ProjId
+         EgtGetInfo(nBTLInfoLayerId, BTL_PRT_PROJ, CurrImportProjId)
+         If CurrImportProjId > 0 Then
+            ImportProjIdList.Add(CurrImportProjId)
+            BTLInfoIdList.Add(nBTLInfoLayerId)
+            ' recupero nome file BTL Associato
+            Dim sBTLFileName As String = ""
+            EgtGetInfo(nBTLInfoLayerId, BTLFILENAME, sBTLFileName)
+            BTLFileNameList.Add(sBTLFileName)
+         End If
+         nBTLInfoLayerId = EgtGetNextName(nBTLInfoLayerId, BTLINFO)
+      End While
+      If Not ImportProjIdList.Count > 0 Then
+         MessageBox.Show("Nessun progetto trovato all'interno del file importato", "Errore")
+      End If
+      ' carico i proj
+      For nProjIndex = 0 To ImportProjIdList.Count - 1
+         Dim nImportProjId As Integer = ImportProjIdList(nProjIndex)
+         ' inizializzo nuovo proj
+         Dim nNewProjId As Integer = 0
+         Dim sNewProjDir As String = ""
+         InitNewProject(nNewProjId, sNewProjDir)
+         NewProjIdList.Add(nNewProjId)
+         ' imposto ProjId di caricamento
+         m_nLoadingProjId = nImportProjId
+         ' costruisco BTLStructure del proj
+         Map.refProjectVM.BTLStructureVM = New BTLStructureVM(BTLStructureM.CreateBTLStructure(nImportProjId))
+         ' scrivo info proj su tutti i pezzi di questo progetto
+         For Each BTLPart In Map.refProjectVM.BTLStructureVM.BTLPartVMList
+            EgtSetInfo(BTLPart.nPartId, BTL_PRT_PROJ, nNewProjId)
+         Next
+         ' riporto nuovo ProjId nel layer BTLInfo
+         EgtSetInfo(BTLInfoIdList(nProjIndex), BTL_PRT_PROJ, nNewProjId)
+         ' salvo modifiche fatte al progetto
+         bOk = bOk AndAlso Map.refSceneHostVM.MainController.SaveProject()
+         If bOk Then
+            ' copio file BTL e progetto
+            Dim sBTLFromPath As String = sProjectimportDir & "\" & BTLFileNameList(nProjIndex) & ".btl"
+            Dim sProjFileName As String = sNewProjDir & "\" & nNewProjId.ToString("0000") & ".nge"
+            If sProjFromPath.Count > 0 AndAlso Not String.IsNullOrWhiteSpace(sProjFromPath(0)) Then
+               Try
+                  If Not String.IsNullOrWhiteSpace(sBTLFromPath) AndAlso File.Exists(sBTLFromPath) Then
+                     Dim sBtlToPath As String = sNewProjDir & "\" & Path.GetFileName(sBTLFromPath)
+                     File.Copy(sBTLFromPath, sBtlToPath)
+                  Else
+                     ErrorList.Add(String.Format("File BTL del progetto {0} non trovato", nImportProjId))
+                  End If
+                  File.Copy(sProjFromPath(0), sProjFileName)
+               Catch ex As Exception
+                  EgtOutLog("Impossibile copiare il file")
+                  MessageBox.Show("Impossibile copiare il file del progetto", "Errore")
+                  Return
+               End Try
+            End If
+            ' aggiorno Db
+            Dim sBTLFileName As String = BTLFileNameList(nProjIndex)
+            Dim ExportDate As DateTime
+            DateTime.TryParse(Map.refProjectVM.BTLStructureVM.BTLStructureM.m_sEXPDATE & " " &
+                           Map.refProjectVM.BTLStructureVM.BTLStructureM.m_sEXPTIME, ExportDate)
+            DbControllers.m_ProjController.UpdateInfo(nNewProjId, sBTLFileName, Map.refProjectVM.BTLStructureVM.sLISTNAME, ExportDate)
+         Else
+            ' elimino da Db
+            DbControllers.m_ProjController.DeleteProj(nNewProjId)
+         End If
+         ' salvo il progetto PROJ
+         Map.refSceneHostVM.SaveProject()
+         ' aggiorno BTLParts su DB
+         DbControllers.m_ProjController.UpdateBtlParts(nNewProjId, Map.refProjectVM.BTLStructureVM.BTLStructureM.BTLPartMList)
+         ' resetto stato new
+         DbControllers.m_ProjController.ResetNew(nNewProjId)
+         ' resetto lock
+         DbControllers.m_ProjController.LockByProjId(nNewProjId, False)
+         DbControllers.m_ProjController.ResetController()
+      Next
+      ' se tutte le operazioni precedenti sono andate a buon fine
+      If bOk Then
+         ' sostituisco indicazione nuovi proj nei pezzi
+         Dim nDuploLayerId As Integer = EgtGetFirstNameInGroup(GDB_ID.ROOT, "DuploBase")
+         Dim nDuploId As Integer = EgtGetFirstInGroup(nDuploLayerId)
+         While nDuploId <> GDB_ID.NULL
+            ' recupero vecchio proj
+            Dim nOldProjId As Integer
+            EgtGetInfo(nDuploId, BTL_PRT_PROJ, nOldProjId)
+            ' lo cerco nella lista
+            Dim nOldProjIndex As Integer = ImportProjIdList.IndexOf(nOldProjId)
+            ' lo sostituisco
+            EgtSetInfo(nDuploId, BTL_PRT_PROJ, NewProjIdList(nOldProjIndex))
+            nDuploId = EgtGetNext(nDuploId)
+         End While
+         ' carico Machgroup che non verrebbero altrimenti importati
+         Map.refProjectVM.MachGroupPanelVM = New MyMachGroupPanelVM(MyMachGroupPanelM.CreateMyMachGroupPanel(Map.refMachinePanelVM.MachineList.ToList()))
+         If Map.refProjectVM.MachGroupPanelVM.MachGroupVMList.Count > 0 Then
+            ' inizializzo nuovo progetto PROD
+            Dim nProdId As Integer = 0
+            Dim sProdDir As String = ""
+            Map.refProdManagerVM.InitNewProject(NewProjIdList(0), nProdId, sProdDir)
+            ' copio file progetto
+            Dim sProjPath As String = String.Empty
+            Dim sProdPath As String = sProdDir & "\" & nProdId.ToString("0000") & ".nge"
+            If EgtGetCurrFilePath(sProjPath) AndAlso Not String.IsNullOrEmpty(sProjPath) Then
+               Try
+                  File.Copy(sProjPath, sProdPath)
+                  'Map.refSceneHostVM.MainController.OpenProject(sProdPath)
+                  bOk = True
+               Catch ex As Exception
+                  EgtOutLog("Impossibile copiare il file")
+                  bOk = False
+               End Try
+            End If
+            If bOk Then
+               ' aggiungo altri proj a prod
+               For Each nProjId In NewProjIdList
+                  DbControllers.m_ProdController.AddProj(nProdId, nProjId)
+               Next
+            Else
+               ' elimino da DB
+               DbControllers.m_ProdController.DeleteProd(nProdId)
+            End If
+            ' salvo il progetto PROD
+            Map.refSceneHostVM.SaveProject()
+            Dim MyMachGroupList As New List(Of MyMachGroupM)
+            If Not IsNothing(Map.refProjectVM.MachGroupPanelVM) Then
+               For Each MachGroup In Map.refProjectVM.MachGroupPanelVM.m_MyMachGroupPanelM.MachGroupMList
+                  MyMachGroupList.Add(MachGroup)
+               Next
+            End If
+            ' aggiorno pezzi su Db
+            DbControllers.m_ProdController.UpdateMachGroup(nProdId, MyMachGroupList)
+            ' resetto lock
+            DbControllers.m_ProdController.LockByProdId(nProdId, False)
+         End If
+         DbControllers.m_ProdController.ResetController()
+      End If
+      ' imposto progetto corrente
+      If NewProjIdList.Count > 0 Then SetCurrProj(NewProjIdList(0))
+      ' costruisco BTLStructure del proj
+      Map.refProjectVM.BTLStructureVM = New BTLStructureVM(BTLStructureM.CreateBTLStructure(NewProjIdList(0)))
+      ' mostro tutti i pezzi
+      Map.refShowBeamPanelVM.ShowAll()
+      EgtZoom(ZM.ALL, True)
+      ' aggiorno titolo
+      Map.refMainWindowVM.UpdateTitle()
+   End Sub
+
+#End Region ' ImportProject
 
 #Region "GoToProd"
 
@@ -460,47 +753,67 @@ Public Class ProjManagerVM
       Else
          'creo nuova ottimizzazione da progetto corrente
          NewProdFromProj()
-         '' chiedo se aggiungere ad ottimizzazione già presente o creare nuova
-         'Select Case MessageBox.Show("Aggiungere ad ottimizzazione già esistente?", "", MessageBoxButton.YesNoCancel, MessageBoxImage.Information)
-         '   Case MessageBoxResult.No
-         '      'creo nuova ottimizzazione da progetto corrente
-         '      NewProdFromProj()
-         '   Case MessageBoxResult.Yes
-         '      ' chiedo in quale ottimizzazione aggiungere il progetto corrente
-         '      Dim OpenProjectFileDialogVM As New OpenProjectFileDialogVM
-         '      Dim ChooseProdFileDialog As New OpenProjectFileDialogV(Application.Current.MainWindow, OpenProjectFileDialogVM)
-         '      Dim DialogResult As Boolean? = ChooseProdFileDialog.EgtShowDialog(ProjectType.PROD)
-         '      If IsNothing(DialogResult) OrElse Not DialogResult Then Return
-         '      ' se prod selezionato
-         '      If Not IsNothing(OpenProjectFileDialogVM.SelProject.nProdId) AndAlso OpenProjectFileDialogVM.SelProject.nProdId > 0 Then
-         '         Dim nCurrCtx As Integer = EgtGetCurrentContext()
-         '         Dim nTempCtx As Integer = EgtInitContext()
-         '         Dim bOk As Boolean = nTempCtx <> 0
-         '         If bOk Then
-         '            ' inizializzo gestore lavorazioni
-         '            bOk = EgtInitMachMgr(Map.refMainWindowVM.MainWindowM.sMachinesRoot, Map.refMainWindowVM.MainWindowM.sToolMakersDir)
-         '            ' apro il prod
-         '            bOk = bOk AndAlso EgtOpenFile(OpenProjectFileDialogVM.SelProject.sProdPath)
-         '            ' inserisco proj nel prod selezionato
-         '            bOk = bOk AndAlso EgtInsertFile(Map.refProjManagerVM.CurrProj.sProjPath)
-         '            ' sposto i pezzi per non averli sovrapposti
-
-
-         '            bOk = bOk AndAlso EgtSaveFile(OpenProjectFileDialogVM.SelProject.sProdPath, NGE.CMPTEXT)
-         '            ' torno sul contesto corrente
-         '            EgtSetCurrentContext(nCurrCtx)
-         '            EgtDeleteContext(nTempCtx)
-         '         End If
-         '         If bOk Then
-         '            ' riporto aggiunta proj a prod su Db
-         '            DbControllers.m_ProdController.AddProj(OpenProjectFileDialogVM.SelProject.nProdId, Map.refProjManagerVM.CurrProj.nProjId)
-         '            ' imposto currprod
-         '            Map.refProdManagerVM.SetCurrProd(OpenProjectFileDialogVM.SelProject.nProdId)
-         '         End If
-         '      End If
-         '   Case MessageBoxResult.Cancel
-         '      Return
-         'End Select
+         ''' chiedo se aggiungere ad ottimizzazione già presente o creare nuova
+         ''Select Case MessageBox.Show("Aggiungere ad ottimizzazione già esistente?", "", MessageBoxButton.YesNoCancel, MessageBoxImage.Information)
+         ''   Case MessageBoxResult.No
+         ''      'creo nuova ottimizzazione da progetto corrente
+         ''      NewProdFromProj()
+         ''   Case MessageBoxResult.Yes
+         ''      ' chiedo in quale ottimizzazione aggiungere il progetto corrente
+         ''      Dim OpenProjectFileDialogVM As New OpenProjectFileDialogVM
+         ''      Dim ChooseProdFileDialog As New OpenProjectFileDialogV(Application.Current.MainWindow, OpenProjectFileDialogVM)
+         ''      Dim DialogResult As Boolean? = ChooseProdFileDialog.EgtShowDialog(ProjectType.PROD)
+         ''      If IsNothing(DialogResult) OrElse Not DialogResult Then Return
+         ''      ' se prod selezionato
+         ''      If Not IsNothing(OpenProjectFileDialogVM.SelProject.nProdId) AndAlso OpenProjectFileDialogVM.SelProject.nProdId > 0 Then
+         ''         Dim nCurrCtx As Integer = EgtGetCurrentContext()
+         ''         Dim nTempCtx As Integer = EgtInitContext()
+         ''         Dim bOk As Boolean = nTempCtx <> 0
+         ''         If bOk Then
+         ''            ' inizializzo gestore lavorazioni
+         ''            bOk = EgtInitMachMgr(Map.refMainWindowVM.MainWindowM.sMachinesRoot, Map.refMainWindowVM.MainWindowM.sToolMakersDir)
+         ''            ' apro il prod
+         ''            bOk = bOk AndAlso EgtOpenFile(OpenProjectFileDialogVM.SelProject.sProdPath)
+         ''            '''' calcolo BBox globale
+         ''            '''Dim b3Parts As BBox3d
+         ''            '''Dim nProdPartId As Integer = EgtGetFirstPart()
+         ''            '''While nProdPartId <> GDB_ID.NULL
+         ''            '''   Dim b3Part As New BBox3d
+         ''            '''   EgtGetBBoxGlob(nProdPartId, 1, b3Part)
+         ''            '''   b3Parts.Add(b3Part)
+         ''            '''   nProdPartId = EgtGetNextPart(nProdPartId)
+         ''            '''End While
+         ''            ' inserisco proj nel prod selezionato
+         ''            bOk = bOk AndAlso EgtInsertFile(Map.refProjManagerVM.CurrProj.sProjPath)
+         ''            ' DA METTERE IN MERGE BTL, NON QUI!!!
+         ''            '''' deseleziono tutto
+         ''            '''EgtDeselectAll()
+         ''            '''' ciclo sui pezzi
+         ''            '''Dim nPartId As Integer = EgtGetFirstPart()
+         ''            '''While nPartId <> GDB_ID.NULL
+         ''            '''   ' se arrivano dal nuovo progetto
+         ''            '''   Dim nCurrProjId As Integer
+         ''            '''   EgtGetInfo(nPartId, PROJ, nCurrProjId)
+         ''            '''   If nCurrProjId = Map.refProjManagerVM.CurrProj.nProjId Then
+         ''            '''      ' sposto i pezzi per non averli sovrapposti
+         ''            '''      EgtMove(nCurrProjId, New Vector3d(0, b3Parts.DimY() + 500, 0))
+         ''            '''   End If
+         ''            '''End While
+         ''            bOk = bOk AndAlso EgtSaveFile(OpenProjectFileDialogVM.SelProject.sProdPath, NGE.CMPTEXT)
+         ''            ' torno sul contesto corrente
+         ''            EgtSetCurrentContext(nCurrCtx)
+         ''            EgtDeleteContext(nTempCtx)
+         ''         End If
+         ''         If bOk Then
+         ''            ' riporto aggiunta proj a prod su Db
+         ''            DbControllers.m_ProdController.AddProj(OpenProjectFileDialogVM.SelProject.nProdId, Map.refProjManagerVM.CurrProj.nProjId)
+         ''            ' imposto currprod
+         ''            Map.refProdManagerVM.SetCurrProd(OpenProjectFileDialogVM.SelProject.nProdId)
+         ''         End If
+         ''      End If
+         ''   Case MessageBoxResult.Cancel
+         ''      Return
+         ''End Select
       End If
       ' vado in pagina prod
       Map.refMainMenuVM.SetSelPage(Pages.MACHINING, False)
diff --git a/EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/DxfOut.png b/EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/DxfOut.png
deleted file mode 100644
index 85420e4e..00000000
Binary files a/EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/DxfOut.png and /dev/null differ
diff --git a/EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/Export.png b/EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/Export.png
deleted file mode 100644
index 472f5dd9..00000000
Binary files a/EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/Export.png and /dev/null differ
diff --git a/EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/ExportProject.png b/EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/ExportProject.png
new file mode 100644
index 00000000..06e14450
Binary files /dev/null and b/EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/ExportProject.png differ
diff --git a/EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/Import.png b/EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/Import.orig.png
similarity index 100%
rename from EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/Import.png
rename to EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/Import.orig.png
diff --git a/EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/ImportBTL.png b/EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/ImportBTL.png
new file mode 100644
index 00000000..08877a11
Binary files /dev/null and b/EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/ImportBTL.png differ
diff --git a/EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/ImportBTL1.png b/EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/ImportBTL1.png
new file mode 100644
index 00000000..ff4e8856
Binary files /dev/null and b/EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/ImportBTL1.png differ
diff --git a/EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/ImportProject.png b/EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/ImportProject.png
new file mode 100644
index 00000000..5b9318cd
Binary files /dev/null and b/EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/ImportProject.png differ
diff --git a/EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/ImportProject1.png b/EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/ImportProject1.png
new file mode 100644
index 00000000..b257d28e
Binary files /dev/null and b/EgtBEAMWALL.ViewerOptimizer/Resources/ProjectManager/ImportProject1.png differ