diff --git a/.hgignore b/.hgignore
index 6ce5d96131..3000a52849 100644
--- a/.hgignore
+++ b/.hgignore
@@ -55,3 +55,4 @@ syntax: regexp
syntax: regexp
^lib/plugins$
^plugins/.*\.class$
+^adempiere-local\.properties$
diff --git a/adempiere-local-template.properties b/adempiere-local-template.properties
new file mode 100755
index 0000000000..20a68fd0de
--- /dev/null
+++ b/adempiere-local-template.properties
@@ -0,0 +1,44 @@
+#Adempiere
+#Tue Jul 20 00:56:36 MYT 2010
+SingleInstancePerWindow=xyzN
+WarningD=Einstellungen_nicht_aendern,_da_diese_undokumentierte_Nebenwirkungen_haben.
+OpenWindowMaximized=xyzN
+LoadTabMetaDataBackground=xyzN
+Warehouse=xyzHQ Warehouse
+UILookFeel=xyzAdempiere
+StorePassword=xyzY
+DataSource=xyzjava\:adempiereDB
+Role=xyzGardenWorld Admin
+CacheWindow=xyzY
+ApplicationPassword=xyzGardenAdmin
+Warning=Do_not_change_any_of_the_data_as_they_will_have_undocumented_side_effects.
+TempDir=xyz/tmp
+ShowAdvanced=xyzY
+TraceLevel=xyzWARNING
+LogMigrationScript=xyzN
+AdempiereSys=xyzN
+CDate=xyz2009-05-27 17\:21\:58.182
+ShowTrl=xyzN
+TraceFile=xyzN
+Printer=xyz
+AutoLogin=xyzN
+Organization=xyzHQ
+Client=xyzGardenWorld
+PrintPreview=xyzN
+ApplicationUserID=xyzGardenAdmin
+Language=xyzEnglish
+Charset=xyzUTF-8
+ValidateConnectionOnStartup=xyzN
+AutoNew=xyzN
+
+#databaseType=PostgreSQL or Oracle
+#databaseHost=hostname or ipaddress for your database server
+#databasePort=port for your database server, default for oracle is 1521 and default for postgresql is 5432
+#databaseName=database name for postgresql or service id/instance id for oracle.
+#databaseLogin=database user name
+#databasePassword=database user password
+Connection=xyzCConnection[name\=machineName{machineName-databaseName-databaseUser},AppsHost\=myAppsHost,Profile\=L,type\=databaseType,DBhost\=databaseHost,DBport\=databasePort,DBname\=databaseName,BQ\=false,FW\=false,FWhost\=,FWport\=0,UID\=databaseLogin,PWD\=databasePassword]
+
+UITheme=xyzAdempiere Theme
+AutoCommit=xyzY
+ShowAcct=xyzY
diff --git a/equinox-target/launchconfig/adempiere_equinox_web.launch b/equinox-target/launchconfig/adempiere_equinox_web.launch
index e92277c7d2..1970740af6 100644
--- a/equinox-target/launchconfig/adempiere_equinox_web.launch
+++ b/equinox-target/launchconfig/adempiere_equinox_web.launch
@@ -10,17 +10,17 @@
-
+
-
+
-
+
diff --git a/plugins/pipo/bin/org/adempiere/pipo2/packin-handler.properties b/plugins/pipo/bin/org/adempiere/pipo2/packin-handler.properties
new file mode 100644
index 0000000000..e72444caae
--- /dev/null
+++ b/plugins/pipo/bin/org/adempiere/pipo2/packin-handler.properties
@@ -0,0 +1,42 @@
+ad.menu=org.adempiere.pipo2.handler.MenuElementHandler
+ad.window=org.adempiere.pipo2.handler.WindowElementHandler
+ad.window.access=org.adempiere.pipo2.handler.WindowAccessElementHandler
+ad.preference=org.adempiere.pipo2.handler.PreferenceElementHandler
+ad.window.tab=org.adempiere.pipo2.handler.TabElementHandler
+ad.tab.field=org.adempiere.pipo2.handler.FieldElementHandler
+ad.process=org.adempiere.pipo2.handler.ProcessElementHandler
+ad.process.parameter=org.adempiere.pipo2.handler.ProcessParaElementHandler
+ad.process-access=org.adempiere.pipo2.handler.ProcessAccessElementHandler
+ad.message=org.adempiere.pipo2.handler.MessageElementHandler
+ad.dynamic-validation=org.adempiere.pipo2.handler.DynValRuleElementHandler
+ad.workflow=org.adempiere.pipo2.handler.WorkflowElementHandler
+ad.workflow.node=org.adempiere.pipo2.handler.WorkflowNodeElementHandler
+ad.workflow.node.next=org.adempiere.pipo2.handler.WorkflowNodeNextElementHandler
+ad.workflow.node.next-condition=org.adempiere.pipo2.handler.WorkflowNodeNextConditionElementHandler
+ad.workflow-access=org.adempiere.pipo2.handler.WorkflowAccessElementHandler
+ad.table=org.adempiere.pipo2.handler.TableElementHandler
+ad.table.column=org.adempiere.pipo2.handler.ColumnElementHandler
+ad.role=org.adempiere.pipo2.handler.RoleElementHandler
+ad.user-role=org.adempiere.pipo2.handler.UserRoleElementHandler
+ad.organization-role=org.adempiere.pipo2.handler.OrgRoleElementHandler
+ad.form=org.adempiere.pipo2.handler.FormElementHandler
+ad.form-access=org.adempiere.pipo2.handler.FormAccessElementHandler
+ad.task=org.adempiere.pipo2.handler.TaskElementHandler
+ad.task-access=org.adempiere.pipo2.handler.TaskAccessElementHandler
+ad.import-format=org.adempiere.pipo2.handler.ImpFormatElementHandler
+ad.import-format.row=org.adempiere.pipo2.handler.ImpFormatRowElementHandler
+ad.code-snippet=org.adempiere.pipo2.handler.CodeSnipitElementHandler
+ad.dist-file=org.adempiere.pipo2.handler.DistFileElementHandler
+ad.report-view=org.adempiere.pipo2.handler.ReportViewElementHandler
+ad.report-view.column=org.adempiere.pipo2.handler.ReportViewColElementHandler
+ad.printformat=org.adempiere.pipo2.handler.PrintFormatElementHandler
+ad.printformat.item=org.adempiere.pipo2.handler.PrintFormatItemElementHandler
+ad.print-paper=org.adempiere.pipo2.handler.PrintPaperElementHandler
+ad.SQLStatement=org.adempiere.pipo2.handler.SQLStatementElementHandler
+ad.reference=org.adempiere.pipo2.handler.ReferenceElementHandler
+ad.reference.list=org.adempiere.pipo2.handler.ReferenceListElementHandler
+ad.reference.table=org.adempiere.pipo2.handler.ReferenceTableElementHandler
+ad.fieldgroup=org.adempiere.pipo2.handler.FieldGroupElementHandler
+ad.element=org.adempiere.pipo2.handler.AdElementHandler
+ad.trl=org.adempiere.pipo2.handler.CommonTranslationHandler
+ad.po.generic=org.adempiere.pipo2.handler.GenericPOElementHandler
\ No newline at end of file
diff --git a/plugins/pipo/bin/org/adempiere/pipo2/packout-handler.properties b/plugins/pipo/bin/org/adempiere/pipo2/packout-handler.properties
new file mode 100644
index 0000000000..dc8f7ffe41
--- /dev/null
+++ b/plugins/pipo/bin/org/adempiere/pipo2/packout-handler.properties
@@ -0,0 +1,23 @@
+#Properties files
+
+ad,menu=org.adempiere.pipo2.handler.MenuElementHandler
+ad.process=org.adempiere.pipo2.handler.ProcessElementHandler
+ad.report-view=org.adempiere.pipo2.handler.ReportViewElementHandler
+ad.po.generic=org.adempiere.pipo2.handler.GenericPOElementHandler
+ad.table=org.adempiere.pipo2.handler.TableElementHandler
+ad.form=org.adempiere.pipo2.handler.FormElementHandler
+ad.window=org.adempiere.pipo2.handler.WindowElementHandler
+ad.role=org.adempiere.pipo2.handler.RoleElementHandler
+ad.SQLStatement=org.adempiere.pipo2.handler.SQLStatementElementHandler
+ad.import-format=org.adempiere.pipo2.handler.ImpFormatElementHandler
+ad.reference=org.adempiere.pipo2.handler.ReferenceElementHandler
+ad.code-snippet=org.adempiere.pipo2.handler.CodeSnippetElementHandler
+ad.workflow=org.adempiere.pipo2.handler.WorkflowElementHandler
+ad.dynamic-validation=org.adempiere.pipo2.handler.DynValRuleElementHandler
+ad.message=org.adempiere.pipo2.handler.MessageElementHandler
+ad.printformat=org.adempiere.pipo2.handler.PrintFormatElementHandler
+ad.printformat.item=org.adempiere.pipo2.handler.PrintFormatItemElementHandler
+ad.print-paper=org.adempiere.pipo2.handler.PrintPaperElementHandler
+ad.task=org.adempiere.pipo2.handler.TaskElementHandler
+ad.fieldgroup=org.adempiere.pipo2.handler.FieldGroupElementHandler
+ad.element=org.adempiere.pipo2.handler.AdElementHandler