diff --git a/environment/local.ccm.properties b/environment/local.ccm.properties
index cd595c492..bfc6c647c 100644
--- a/environment/local.ccm.properties
+++ b/environment/local.ccm.properties
@@ -5,31 +5,27 @@
 ## -------------------------------------------------
 ## Usually you will define your own specific bundle!
 ## -------------------------------------------------
-#ccm.bundle.folder=${ccm.project.dir}/ccm-ldn-aplaws/bundles/custom
-#ccm.bundle.folder=${ccm.project.dir}/ccm-ldn-aplaws/bundles/demo
-#ccm.bundle.folder=${ccm.project.dir}/ccm-ldn-aplaws/bundles/devel
-#ccm.bundle.folder=${ccm.project.dir}/ccm-ldn-aplaws/bundles/extended
-#ccm.bundle.folder=${ccm.project.dir}/ccm-ldn-aplaws/bundles/standard
-#
 #ccm.bundle.folder=${ccm.project.dir}/ccm-bundle/bundles/devel
 #ccm.bundle.folder=${ccm.project.dir}/ccm-bundle/bundles/standard
 #ccm.bundle.folder=${ccm.project.dir}/ccm-bundle/bundles/local/ccm
 #ccm.bundle.folder=${ccm.project.dir}/ccm-bundle/bundles/local/igb
 #ccm.bundle.folder=${ccm.project.dir}/ccm-bundle/bundles/local/nsh
 #
-#ccm.bundle.folder=${ccm.project.dir}/ccm-gen-aplaws/bundles/devel
-#ccm.bundle.folder=${ccm.project.dir}/ccm-gen-aplaws/bundles/develpb
-#ccm.bundle.folder=${ccm.project.dir}/ccm-gen-aplaws/bundles/handbook
-#ccm.bundle.folder=${ccm.project.dir}/ccm-gen-aplaws/bundles/staatsschiff
-#ccm.bundle.folder=${ccm.project.dir}/ccm-gen-aplaws/bundles/wsf
-#ccm.bundle.folder=${ccm.project.dir}/ccm-gen-aplaws/bundles/zsr
-#
-#ccm.bundle.folder=${ccm.project.dir}/ccm-ifs-aplaws/bundles/devel
-
-ccm.bundle.folder=${ccm.project.dir}/ccm-sci-bundle/bundles/devel
+#ccm.bundle.folder=${ccm.project.dir}/ccm-sci-bundle/bundles/devel
+#ccm.bundle.folder=${ccm.project.dir}/ccm-sci-bundle/bundles/custom
 #ccm.bundle.folder=${ccm.project.dir}/ccm-sci-bundle/bundles/demo
+#ccm.bundle.folder=${ccm.project.dir}/ccm-sci-bundle/bundles/extended
+#ccm.bundle.folder=${ccm.project.dir}/ccm-sci-bundle/bundles/standard
 #ccm.bundle.folder=${ccm.project.dir}/ccm-sci-bundle/bundles/local/aap
 #ccm.bundle.folder=${ccm.project.dir}/ccm-sci-bundle/bundles/local/iaw
+#
+#ccm.bundle.folder=${ccm.project.dir}/ccm-ldn-aplaws/bundles/custom
+#ccm.bundle.folder=${ccm.project.dir}/ccm-ldn-aplaws/bundles/demo
+#ccm.bundle.folder=${ccm.project.dir}/ccm-ldn-aplaws/bundles/devel
+#ccm.bundle.folder=${ccm.project.dir}/ccm-ldn-aplaws/bundles/extended
+#ccm.bundle.folder=${ccm.project.dir}/ccm-ldn-aplaws/bundles/standard
+#
+ccm.bundle.folder=${ccm.project.dir}/ccm-lbc-aplaws/bundles/intranet
 
 
 ## ====================================================================
@@ -37,13 +33,38 @@ ccm.bundle.folder=${ccm.project.dir}/ccm-sci-bundle/bundles/devel
 ## ====================================================================
 
 
+# Alle Versionen / Bundles: 
+# (hb r1554 ccm-simplesurvey  loaded as legacy free application.
+#ccm.upgrade.package=ccm-simplesurvey
+#ccm.upgrade.from.version=6.6.0
+#ccm.upgrade.to.version=6.6.1
+
+# Alle Versionen / Bundles: 
+# (hb r1553 Packages CMS Workspace&Service loaded as legacy free application.
+#ccm.upgrade.package=ccm-cms
+#ccm.upgrade.from.version=6.6.6
+#ccm.upgrade.to.version=6.6.7
+
+# Alle Versionen / Bundles: 
+#ccm.upgrade.package=ccm-ldn-atoz
+#ccm.upgrade.from.version=6.6.0
+#ccm.upgrade.to.version=6.6.1
+
+# Alle Versionen / Bundles: 
+# (hb r1531 Package ldn-search now loaded as legacy free application.
+#ccm.upgrade.package=ccm-ldn-search
+#ccm.upgrade.from.version=6.6.0
+#ccm.upgrade.to.version=6.6.1
+
+
 # ---------------------------------------------------------------------
-# Update von rel. 1.1.6 auf 1.1.x (trunk)  
+# Update von rel. 1.1.6 auf 1.2.0   
 # Müssen NACH dem (regulären) Update 1.1.4 -> 1.1.6 durchgeführt werden
 # Reihenfolge: hier von UNTEN nach OBEN!
 # ---------------------------------------------------------------------
 
 # Alle Versionen / Bundles: 
+# ACHTUNG: evt. ist iaw auf 1.2.0 OHNE letzte Ergänzungen (Login, Admin)
 #ccm.upgrade.package=ccm-core
 #ccm.upgrade.from.version=6.6.3
 #ccm.upgrade.to.version=6.6.4
@@ -55,9 +76,9 @@ ccm.bundle.folder=${ccm.project.dir}/ccm-sci-bundle/bundles/devel
 
 # Alle Versionen / Bundles: 
 # (hb r149? Package ccm-forum loaded as legacy free application.
-ccm.upgrade.package=ccm-forum
-ccm.upgrade.from.version=6.6.1
-ccm.upgrade.to.version=6.6.2
+#ccm.upgrade.package=ccm-forum
+#ccm.upgrade.from.version=6.6.1
+#ccm.upgrade.to.version=6.6.2
 
 # Alle Versionen / Bundles: 
 # (hb r1496 Package ccm-cms ContentSection loaded as legacy free application.
diff --git a/tools-ng/netbeans/project.xml b/tools-ng/netbeans/project.xml
index c617133e8..356639a15 100644
--- a/tools-ng/netbeans/project.xml
+++ b/tools-ng/netbeans/project.xml
@@ -262,6 +262,18 @@
                     <location>ccm-cms-types-xmlfeed/src</location>
                     <encoding>UTF-8</encoding>
                 </source-folder>
+                <source-folder>
+                    <label>ccm-atoz (Source)</label>
+                    <type>java</type>
+                    <location>ccm-atoz/src</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
+                <source-folder>
+                    <label>ccm-atoz-siteproxy (Source)</label>
+                    <type>java</type>
+                    <location>ccm-atoz-siteproxy/src</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
                 <source-folder>
                     <label>ccm-auth-http (Source)</label>
                     <type>java</type>
@@ -352,6 +364,12 @@
                     <location>ccm-portlet-bookmarks/src</location>
                     <encoding>UTF-8</encoding>
                 </source-folder>
+                <source-folder>
+                    <label>ccm-portlet-collection (Source)</label>
+                    <type>java</type>
+                    <location>ccm-portlet-collection/src</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
                 <source-folder>
                     <label>ccm-portlet-latestnews (Source)</label>
                     <type>java</type>
@@ -418,6 +436,12 @@
                     <location>ccm-ldn-atoz/src</location>
                     <encoding>UTF-8</encoding>
                 </source-folder>
+                <source-folder>
+                    <label>ccm-ldn-atoz-siteproxy (Source)</label>
+                    <type>java</type>
+                    <location>ccm-ldn-atoz-siteproxy/src</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
                 <source-folder>
                     <label>ccm-ldn-dublin (Source)</label>
                     <type>java</type>
@@ -478,18 +502,56 @@
                     <location>ccm-ldn-util/src</location>
                     <encoding>UTF-8</encoding>
                 </source-folder>
+
                 <source-folder>
-                    <label>ccm-gen-aplaws (Source)</label>
+                    <label>ccm-lbc-aplaws (Source)</label>
                     <type>java</type>
-                    <location>ccm-gen-aplaws/src</location>
+                    <location>ccm-lbc-aplaws/src</location>
                     <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
-                    <label>ccm-gen-aplaws (Web)</label>
+                    <label>ccm-lbc-consultation (Source)</label>
                     <type>java</type>
-                    <location>ccm-gen-aplaws/web</location>
+                    <location>ccm-lbc-consultation/src</location>
                     <encoding>UTF-8</encoding>
                 </source-folder>
+                <source-folder>
+                    <label>ccm-lbc-contentcheck (Source)</label>
+                    <type>java</type>
+                    <location>ccm-lbc-contentcheck/src</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
+                <source-folder>
+                    <label>ccm-lbc-decisiontree (Source)</label>
+                    <type>java</type>
+                    <location>ccm-lbc-decisiontree/src</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
+                <source-folder>
+                    <label>ccm-lbc-eforms (Source)</label>
+                    <type>java</type>
+                    <location>ccm-lbc-eforms/src</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
+                <source-folder>
+                    <label>ccm-lbc-foi (Source)</label>
+                    <type>java</type>
+                    <location>ccm-lbc-foi/src</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
+                <source-folder>
+                    <label>ccm-lbc-retention (Source)</label>
+                    <type>java</type>
+                    <location>ccm-lbc-retention/src</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
+                <source-folder>
+                    <label>ccm-lbc-wordxml (Source)</label>
+                    <type>java</type>
+                    <location>ccm-lbc-wordxml/src</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
+
                 <source-folder>
                     <label>ccm-sci-bundle (Source)</label>
                     <type>java</type>
@@ -741,6 +803,14 @@
                         <label>ccm-cms-types-xmlfeed (Source)</label>
                         <location>ccm-cms-types-xmlfeed/src</location>
                     </source-folder>
+                    <source-folder style="packages">
+                        <label>ccm-atoz (Source)</label>
+                        <location>ccm-atoz/src</location>
+                    </source-folder>
+                    <source-folder style="packages">
+                        <label>ccm-atoz-siteproxy (Source)</label>
+                        <location>ccm-atoz-siteproxy/src</location>
+                    </source-folder>
                     <source-folder style="packages">
                         <label>ccm-auth-http (Source)</label>
                         <location>ccm-auth-http/src</location>
@@ -801,6 +871,10 @@
                         <label>ccm-portlet-bookmarks (Source)</label>
                         <location>ccm-portlet-bookmarks/src</location>
                     </source-folder>
+                    <source-folder style="packages">
+                        <label>ccm-portlet-collection (Source)</label>
+                        <location>ccm-portlet-collection/src</location>
+                    </source-folder>
                     <source-folder style="packages">
                         <label>ccm-portlet-latestnews (Source)</label>
                         <location>ccm-portlet-latestnews/src</location>
@@ -885,6 +959,40 @@
                         <label>ccm-ldn-util (Source)</label>
                         <location>ccm-ldn-util/src</location>
                     </source-folder>
+
+                    <source-folder style="packages">
+                        <label>ccm-lbc-aplaws (Source)</label>
+                        <location>ccm-lbc-aplaws/src</location>
+                    </source-folder>
+                    <source-folder style="packages">
+                        <label>ccm-lbc-consultation (Source)</label>
+                        <location>ccm-lbc-consultation/src</location>
+                    </source-folder>
+                    <source-folder style="packages">
+                        <label>ccm-lbc-contentcheck (Source)</label>
+                        <location>ccm-lbc-contentcheck/src</location>
+                    </source-folder>
+                    <source-folder style="packages">
+                        <label>ccm-lbc-decisiontree (Source)</label>
+                        <location>ccm-lbc-decisiontree/src</location>
+                    </source-folder>
+                    <source-folder style="packages">
+                        <label>ccm-lbc-eforms (Source)</label>
+                        <location>ccm-lbc-eforms/src</location>
+                    </source-folder>
+                    <source-folder style="packages">
+                        <label>ccm-lbc-foi (Source)</label>
+                        <location>ccm-lbc-foi/src</location>
+                    </source-folder>
+                    <source-folder style="packages">
+                        <label>ccm-lbc-retention (Source)</label>
+                        <location>ccm-lbc-retention/src</location>
+                    </source-folder>
+                    <source-folder style="packages">
+                        <label>ccm-lbc-wordxml (Source)</label>
+                        <location>ccm-lbc-wordxml/src</location>
+                    </source-folder>
+
                     <source-folder style="packages">
                         <label>ccm-sci-bundle (Source)</label>
                         <location>ccm-sci-bundle/src</location>
@@ -902,20 +1010,20 @@
                         <location>ccm-sci-publications/src</location>
                     </source-folder>
                     <source-folder style="packages">
-                        <label>ccm-sci-type-departement (Source)</label>
-                        <location>ccm-sci-type-departement/src</location>
+                        <label>ccm-sci-types-department (Source)</label>
+                        <location>ccm-sci-types-department/src</location>
                     </source-folder>
                     <source-folder style="packages">
-                        <label>ccm-sci-type-institute (Source)</label>
-                        <location>ccm-sci-type-institute/src</location>
+                        <label>ccm-sci-types-institute (Source)</label>
+                        <location>ccm-sci-types-institute/src</location>
                     </source-folder>
                     <source-folder style="packages">
-                        <label>ccm-sci-type-member (Source)</label>
-                        <location>ccm-sci-type-member/src</location>
+                        <label>ccm-sci-types-member (Source)</label>
+                        <location>ccm-sci-types-member/src</location>
                     </source-folder>
                     <source-folder style="packages">
-                        <label>ccm-sci-type-project (Source)</label>
-                        <location>ccm-sci-type-project/src</location>
+                        <label>ccm-sci-types-project (Source)</label>
+                        <location>ccm-sci-types-project/src</location>
                     </source-folder>
                     <source-file>
                         <location>build.xml</location>
@@ -975,6 +1083,8 @@
                 <package-root>ccm-cms-types-siteproxy/src</package-root>
                 <package-root>ccm-cms-types-survey/src</package-root>
                 <package-root>ccm-cms-types-xmlfeed/src</package-root>
+                <package-root>ccm-atoz/src</package-root>
+                <package-root>ccm-atoz-siteproxy/src</package-root>
                 <package-root>ccm-auth-http/src</package-root>
                 <package-root>ccm-bookmarks/src</package-root>
                 <package-root>ccm-bundle/src</package-root>
@@ -990,6 +1100,7 @@
                 <package-root>ccm-portalworkspace/src</package-root>
                 <package-root>ccm-portalworkspace-homepage/src</package-root>
                 <package-root>ccm-portlet-bookmarks/src</package-root>
+                <package-root>ccm-portlet-collection/src</package-root>
                 <package-root>ccm-portlet-latestnews/src</package-root>
                 <package-root>ccm-portlet-motd/src</package-root>
                 <package-root>ccm-rssfeed/src</package-root>
@@ -1011,15 +1122,24 @@
                 <package-root>ccm-ldn-types-esdservice/src</package-root>
                 <package-root>ccm-ldn-userpreferences/src</package-root>
                 <package-root>ccm-ldn-util/src</package-root>
+                <package-root>ccm-lbc-aplaws/src</package-root>
+                <package-root>ccm-lbc-consultation/src</package-root>
+                <package-root>ccm-lbc-contentcheck/src</package-root>
+                <package-root>ccm-lbc-decisiontree/src</package-root>
+                <package-root>ccm-lbc-eforms/src</package-root>
+                <package-root>ccm-lbc-foi/src</package-root>
+                <package-root>ccm-lbc-retention/src</package-root>
+                <package-root>ccm-lbc-wordxml/src</package-root>
                 <package-root>ccm-sci-bundle/src</package-root>
                 <package-root>ccm-sci-personalprojects/src</package-root>
                 <package-root>ccm-sci-personalpublications/src</package-root>
                 <package-root>ccm-sci-publications/src</package-root>
-                <package-root>ccm-sci-type-department/src</package-root>
-                <package-root>ccm-sci-type-institute/src</package-root>
-                <package-root>ccm-sci-type-member/src</package-root>
-                <package-root>ccm-sci-type-project/src</package-root>
-                <classpath mode="compile">ccm-core/lib/log4j.jar:ccm-core/lib/mail.jar:ccm-core/lib/commons-beanutils.jar:ccm-core/lib/commons-cli-1.0.jar:ccm-core/lib/commons-collections-3.0.jar:ccm-core/lib/commons-codec-1.3.jar:ccm-core/lib/commons-fileupload-1.1.1.jar:ccm-core/lib/commons-lang-2.1.jar:ccm-core/lib/commons-primitives-1.0.jar:ccm-core/lib/xercesImpl.jar:ccm-core/lib/jakarta-oro-2.0.8.jar:ccm-core/lib/Tidy.jar:ccm-core/lib/jdom.jar:ccm-core/lib/jdxslt.jar:ccm-core/lib/lucene-core-2.4.0.jar:ccm-core/lib/saxon.jar:ccm-core/lib/poi-2.5-final-20040302.jar:ccm-core/lib/pdfbox-1.4.0.jar:ccm-core/lib/tm-extractors-0.4.jar:ccm-core/lib/bcprov-jdk16-144.jar:ccm-cms/lib/jai_codec.jar:ccm-cms/lib/jai_core.jar:ccm-cms/lib/mlibwrapper_jai.jar:ccm-ldn-search/lib/axis.jar:ccm-ldn-search/lib/jaxrpc.jar:ccm-ldn-search/lib/jobo.jar:ccm-ldn-terms/lib/commons-digester.jar:ccm-ldn-terms/lib/jena.jar:ccm-ldn-terms/lib/snowball.jar:ccm-ldn-terms/lib/weka-3.5.5.jar:ccm-ldn-terms/lib/xstream-1.3.1.jar:ccm-formbuilder-pdf/lib/fop.jar:tools-ng/devel/lib/ccm-servlet-2.3.jar:tools-ng/devel/lib/ojdbc14.jar:tools-ng/devel/lib/postgresql-jdbc.jar</classpath>
+                <package-root>ccm-sci-types-department/src</package-root>
+                <package-root>ccm-sci-types-institute/src</package-root>
+                <package-root>ccm-sci-types-member/src</package-root>
+                <package-root>ccm-sci-types-project/src</package-root>
+
+                <classpath mode="compile">ccm-core/lib/log4j.jar:ccm-core/lib/mail.jar:ccm-core/lib/commons-beanutils.jar:ccm-core/lib/commons-cli-1.0.jar:ccm-core/lib/commons-collections-3.0.jar:ccm-core/lib/commons-codec-1.3.jar:ccm-core/lib/commons-fileupload-1.1.1.jar:ccm-core/lib/commons-io-1.3.1.jar:ccm-core/lib/commons-lang-2.1.jar:ccm-core/lib/commons-primitives-1.0.jar:ccm-core/lib/xercesImpl.jar:ccm-core/lib/jakarta-oro-2.0.8.jar:ccm-core/lib/Tidy.jar:ccm-core/lib/imgscalr-lib-4.2.jar:ccm-core/lib/jdom.jar:ccm-core/lib/jdxslt.jar:ccm-core/lib/lucene-core-2.4.0.jar:ccm-core/lib/saxon.jar:ccm-core/lib/poi-2.5-final-20040302.jar:ccm-core/lib/pdfbox-1.4.0.jar:ccm-core/lib/tm-extractors-0.4.jar:ccm-core/lib/bcprov-jdk16-144.jar:ccm-cms/lib/jai_codec.jar:ccm-cms/lib/jai_core.jar:ccm-cms/lib/mlibwrapper_jai.jar:ccm-ldn-search/lib/axis.jar:ccm-ldn-search/lib/jaxrpc.jar:ccm-ldn-search/lib/jobo.jar:ccm-ldn-terms/lib/commons-digester.jar:ccm-ldn-terms/lib/jena.jar:ccm-ldn-terms/lib/snowball.jar:ccm-ldn-terms/lib/weka-3.5.5.jar:ccm-ldn-terms/lib/xstream-1.3.1.jar:ccm-formbuilder-pdf/lib/fop.jar:tools-ng/devel/lib/ccm-servlet-2.3.jar:tools-ng/devel/lib/ojdbc14.jar:tools-ng/devel/lib/postgresql-jdbc.jar</classpath>
                 <source-level>1.5</source-level>
             </compilation-unit>
         </java-data>