diff --git a/ccm-sci-bundle/bundles/devel/cfg/project.xml b/ccm-sci-bundle/bundles/devel/cfg/project.xml
index 70864c41d..993271851 100644
--- a/ccm-sci-bundle/bundles/devel/cfg/project.xml
+++ b/ccm-sci-bundle/bundles/devel/cfg/project.xml
@@ -8,8 +8,8 @@
               ccmVersion="6.1" 
                     name="ScientificCMS" 
               prettyName="Scientific CMS" 
-                 version="2.2.0" 
-                 release="devel-SNAPSHOT-r2548" 
+                 version="2.3.0" 
+                 release="devel-SNAPSHOT-r2620" 
                   webxml="web-sci.xml" 
                   webapp="ROOT" 
       xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
@@ -134,12 +134,17 @@
         <ccm:application name="ccm-cms-types-organization"/>
         <ccm:application name="ccm-cms-types-pressrelease"/>
         <ccm:application name="ccm-cms-types-service"/>
+	<ccm:application name="ccm-cms-types-simpleorganization"/>
         <ccm:application name="ccm-cms-types-siteproxy"/>
         <ccm:application name="ccm-cms-types-xmlfeed"/>
 
+	<ccm:application name="ccm-cms-assets-orgaunittext"/>
+
 <!--  Applications   -->
 <!--
 -->
+	<ccm:application name="ccm-atoz"/>
+	<ccm:application name="ccm-atoz-siteproxy"/>
         <ccm:application name="ccm-auth-http"/>
         <ccm:application name="ccm-bookmarks"/>
         <ccm:application name="ccm-faq"/>  
@@ -150,6 +155,7 @@
 <!--   LDN extension  -->
 <!--
 -->
+	<ccm:application name="ccm-ldn-atoz"/>
         <ccm:application name="ccm-ldn-exporter"/>
         <ccm:application name="ccm-ldn-freeform"/>
         <ccm:application name="ccm-ldn-importer"/>
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/types.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/types.xsl
index 5d848184b..643983ccf 100755
--- a/ccm-sci-bundle/web/themes/mandalay/includes/types.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/types.xsl
@@ -67,6 +67,7 @@
   <!-- <xsl:import href="types/Project.xsl"/> -->
   <!-- <xsl:import href="types/ResearchNetwork.xsl"/> -->
   <!-- <xsl:import href="types/Service.xsl"/> -->
+  <xsl:import href="types/SimpleAddress.xsl"/>
   <xsl:import href="types/SiteProxy.xsl"/>
   <xsl:import href="types/Survey.xsl"/>
   
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/types/SimpleAddress.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/types/SimpleAddress.xsl
new file mode 100644
index 000000000..6fcd1d071
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/types/SimpleAddress.xsl
@@ -0,0 +1,462 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE stylesheet [<!ENTITY nbsp '&#160;'>]>
+
+<!-- 
+    Copyright: 2014 Jens Pelzetter
+  
+    This file is part of Mandalay.
+
+    Mandalay is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    Mandalay is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Mandalay.  If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+                xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
+                xmlns:cms="http://www.arsdigita.com/cms/1.0"
+                xmlns:nav="http://ccm.redhat.com/navigation"
+                xmlns:mandalay="http://mandalay.quasiweb.de"
+                exclude-result-prefixes="xsl bebop cms"
+                version="1.0">
+
+  <!-- DE Leadtext -->
+  <!-- EN lead text view -->
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.SimpleAddress']" mode="lead">
+      
+      <!-- SimpleAddress has no lead text, but we need this empty template to avoid artifacts
+      in the HTML output -->
+      
+    <!--<xsl:variable name="setLeadText">
+      <xsl:call-template name="mandalay:getSetting">
+        <xsl:with-param name="module"  select="'SimpleAddress'"/>
+        <xsl:with-param name="setting" select="'setLeadText'"/>
+        <xsl:with-param name="default" select="'true'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+        <xsl:if test="./lead and $setLeadText = 'true'">
+          <div class="lead">
+            <xsl:value-of disable-output-escaping="yes" select="./lead"/>
+          </div>
+        </xsl:if>-->
+    
+   
+    
+    </xsl:template>
+
+    <!-- DE Bild -->
+    <!-- EN image -->
+    <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.SimpleAddress']" mode="image">
+
+        <!-- DE Hole alle benötigten Einstellungen-->
+        <!-- EN Getting all needed setting-->
+        <xsl:variable name="setImage">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module"  select="'SimpleAddress'"/>
+                <xsl:with-param name="setting" select="'setImage'"/>
+                <xsl:with-param name="default" select="'true'"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="setImageMaxHeight">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module"  select="'SimpleAddress'"/>
+                <xsl:with-param name="setting" select="'setImageMaxHeight'"/>
+                <xsl:with-param name="default" select="''"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="setImageMaxWidth">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module"  select="'SimpleAddress'"/>
+                <xsl:with-param name="setting" select="'setImageMaxWidth'"/>
+                <xsl:with-param name="default" select="''"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="setImageCaption">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module"  select="'SimpleAddress'"/>
+                <xsl:with-param name="setting" select="'setImageCaption'"/>
+                <xsl:with-param name="default" select="'true'"/>
+            </xsl:call-template>
+        </xsl:variable>
+
+        <xsl:if test="$setImage = 'true'">
+            <xsl:call-template name="mandalay:imageAttachment">
+                <xsl:with-param name="showCaption" select="$setImageCaption"/>
+                <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
+                <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
+            </xsl:call-template>
+        </xsl:if>
+    </xsl:template>
+
+    <!-- DE Vollansicht -->
+    <!-- EN Detailed view -->
+    <xsl:template name="CT_SimpleAddress_graphics" match="cms:item[objectType='com.arsdigita.cms.contenttypes.SimpleAddress']" mode="detailed_view">
+
+        <!-- DE Hole alle benötigten Einstellungen-->
+        <!-- EN Getting all needed setting-->
+        <xsl:variable name="setAddress">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module" select="'SimpleAddress'"/>
+                <xsl:with-param name="setting" select="'setAddress'"/>
+                <xsl:with-param name="default" select="'true'"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="setPostalCode">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module" select="'SimpleAddress'"/>
+                <xsl:with-param name="setting" select="'setPostalCode'"/>
+                <xsl:with-param name="default" select="'false'"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="setPhone">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module" select="'SimpleAddress'"/>
+                <xsl:with-param name="setting" select="'setPhone'"/>
+                <xsl:with-param name="default" select="'true'"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="setMobile">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module" select="'SimpleAddress'"/>
+                <xsl:with-param name="setting" select="'setMobile'"/>
+                <xsl:with-param name="default" select="'true'"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="setFax">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module" select="'SimpleAddress'"/>
+                <xsl:with-param name="setting" select="'setFax'"/>
+                <xsl:with-param name="default" select="'true'"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="setEmail">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module" select="'SimpleAddress'"/>
+                <xsl:with-param name="setting" select="'setEmail'"/>
+                <xsl:with-param name="default" select="'true'"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="setNotes">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module" select="'SimpleAddress'"/>
+                <xsl:with-param name="setting" select="'setNotes'"/>
+                <xsl:with-param name="default" select="'true'"/>
+            </xsl:call-template>
+        </xsl:variable>
+
+        <div id="mainBody">
+        
+            <xsl:if test="$setAddress = 'true'">
+                <pre class="simpleAddress_address" >
+                    <xsl:value-of disable-output-escaping="yes" select="./address"/>
+                </pre>
+            </xsl:if>
+            
+            <dl>
+                <xsl:if test="$setPostalCode = 'true'">
+                    <dt>
+                        <xsl:call-template name="mandalay:getStaticText">
+                            <xsl:with-param name="module" select="'SimpleAddress'"/>
+                            <xsl:with-param name="id" select="'postalCode'"/>
+                        </xsl:call-template>
+                    </dt>
+                    <dd>
+                        <xsl:value-of select="./postalCode"/>
+                    </dd>
+                </xsl:if>
+                <xsl:if test="$setPhone = 'true'">
+                    <dt>
+                        <xsl:call-template name="mandalay:getStaticText">
+                            <xsl:with-param name="module" select="'SimpleAddress'"/>
+                            <xsl:with-param name="id" select="'phone'"/>
+                        </xsl:call-template>
+                    </dt>
+                    <dd>
+                        <xsl:value-of select="./phone"/>
+                    </dd>
+                </xsl:if>
+                <xsl:if test="$setMobile = 'true'">
+                    <dt>
+                        <xsl:call-template name="mandalay:getStaticText">
+                            <xsl:with-param name="module" select="'SimpleAddress'"/>
+                            <xsl:with-param name="id" select="'mobile'"/>
+                        </xsl:call-template>
+                    </dt>
+                    <dd>
+                        <xsl:value-of select="./mobile"/>
+                    </dd>
+                </xsl:if>
+                <xsl:if test="$setFax = 'true'">
+                    <dt>
+                        <xsl:call-template name="mandalay:getStaticText">
+                            <xsl:with-param name="module" select="'SimpleAddress'"/>
+                            <xsl:with-param name="id" select="'fax'"/>
+                        </xsl:call-template>
+                    </dt>
+                    <dd>
+                        <xsl:value-of select="./fax"/>
+                    </dd>
+                </xsl:if>
+                <xsl:if test="$setEmail = 'true'">
+                    <dt>
+                        <xsl:call-template name="mandalay:getStaticText">
+                            <xsl:with-param name="module" select="'SimpleAddress'"/>
+                            <xsl:with-param name="id" select="'email'"/>
+                        </xsl:call-template>
+                    </dt>
+                    <dd>
+                        <xsl:value-of select="./email"/>
+                    </dd>
+                </xsl:if>
+            </dl>
+            
+            <xsl:if test="$setNotes = 'true'">
+                <div class="simpleAddressNotes">
+                    <xsl:value-of disable-output-escaping="yes" select="./notes"/>
+                </div>
+            </xsl:if>
+          
+            <div class="endFloat"/>
+        </div>
+    
+        <div class="endFloat"/>
+    </xsl:template>
+
+    <!-- DE Listenansicht -->
+    <!-- EN List view -->
+    <xsl:template  name="CT_SimpleAddress_List" match="nav:item[nav:attribute[@name='objectType'] = 'com.arsdigita.cms.contenttypes.SimpleAddress']" mode="list_view">
+
+        <!-- DE Hole alle benötigten Einstellungen-->
+        <!-- EN Getting all needed setting-->
+        <!--<xsl:variable name="setLeadText">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module"  select="'SimpleAddress'"/>
+                <xsl:with-param name="setting" select="'listView/setLeadText'"/>
+                <xsl:with-param name="default" select="'true'"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="setLeadTextLength">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module"  select="'SimpleAddress'"/>
+                <xsl:with-param name="setting" select="'listView/setLeadTextLength'"/>
+                <xsl:with-param name="default" select="'0'"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="setMoreButton">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module"  select="'SimpleAddress'"/>
+                <xsl:with-param name="setting" select="'listView/setMoreButton'"/>
+                <xsl:with-param name="default" select="'false'"/>
+            </xsl:call-template>
+        </xsl:variable>-->
+
+        <a class="CIname">
+            <xsl:attribute name="href">
+                <xsl:value-of select="nav:path"/>
+            </xsl:attribute>
+            <xsl:attribute name="title">
+                <xsl:call-template name="mandalay:shying">
+                    <xsl:with-param name="title">
+                        <xsl:value-of select="nav:attribute[@name='title']"/>
+                    </xsl:with-param>
+                    <xsl:with-param name="mode">dynamic</xsl:with-param>
+                </xsl:call-template>
+            </xsl:attribute>
+            <xsl:call-template name="mandalay:shying">
+                <xsl:with-param name="title">
+                    <xsl:value-of disable-output-escaping="yes" select="nav:attribute[@name='title']"/>
+                </xsl:with-param>
+                <xsl:with-param name="mode">dynamic</xsl:with-param>
+            </xsl:call-template>
+        </a>
+        <!--<xsl:if test="nav:attribute[@name='lead'] and $setLeadText = 'true'">
+            <br />
+            <span class="intro">
+                <xsl:choose>
+                    <xsl:when test="$setLeadTextLength = '0'">
+                        <xsl:value-of disable-output-escaping="yes" select="nav:attribute[@name='lead']" />
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:value-of disable-output-escaping="yes" select="substring(nav:attribute[@name='lead'], 1, $setLeadTextLength)" />
+                        <xsl:if test="string-length(nav:attribute[@name='lead']) > $setLeadTextLength">
+                            <xsl:text>...</xsl:text>
+                            <xsl:if test="$setMoreButton = 'true'">
+                                <span class="moreButton">
+                                    <a>
+                                        <xsl:attribute name="href">
+                                            <xsl:value-of select="nav:path"/>
+                                        </xsl:attribute>
+                                        <xsl:attribute name="title">
+                                            <xsl:call-template name="mandalay:getStaticText">
+                                                <xsl:with-param name="module" select="'SimpleAddress'"/>
+                                                <xsl:with-param name="id" select="'moreButtonTitle'"/>
+                                            </xsl:call-template>
+                                        </xsl:attribute>
+                                        <xsl:call-template name="mandalay:getStaticText">
+                                            <xsl:with-param name="module" select="'SimpleAddress'"/>
+                                            <xsl:with-param name="id" select="'moreButton'"/>
+                                        </xsl:call-template>
+                                    </a> 
+                                </span>
+                            </xsl:if>
+                        </xsl:if>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </span>
+        </xsl:if>-->
+    </xsl:template>
+
+    <xsl:template name="CT_SimpleAddress_Link" match="*/cms:item/links[targetItem/objectType = 'com.arsdigita.cms.contenttypes.SimpleAddress']" mode="link_view">
+
+        <!-- DE Hole alle benötigten Einstellungen-->
+        <!-- EN Getting all needed setting-->
+        <xsl:variable name="setImageAndText">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module"  select="'SimpleAddress'"/>
+                <xsl:with-param name="setting" select="'linkView/setImageAndText'"/>
+                <xsl:with-param name="default" select="'true'"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="setImage">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module"  select="'SimpleAddress'"/>
+                <xsl:with-param name="setting" select="'linkView/setImage'"/>
+                <xsl:with-param name="default" select="'true'"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="setImageMaxHeight">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module"  select="'SimpleAddress'"/>
+                <xsl:with-param name="setting" select="'linkView/setImageMaxHeight'"/>
+                <xsl:with-param name="default" select="''"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="setImageMaxWidth">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module"  select="'SimpleAddress'"/>
+                <xsl:with-param name="setting" select="'linkView/setImageMaxWidth'"/>
+                <xsl:with-param name="default" select="''"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="setImageCaption">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module"  select="'SimpleAddress'"/>
+                <xsl:with-param name="setting" select="'linkView/setImageCaption'"/>
+                <xsl:with-param name="default" select="'true'"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="setDescription">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module"  select="'SimpleAddress'"/>
+                <xsl:with-param name="setting" select="'linkView/setDescription'"/>
+                <xsl:with-param name="default" select="'true'"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="setDescriptionLength">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module"  select="'SimpleAddress'"/>
+                <xsl:with-param name="setting" select="'linkView/setDescriptionLength'"/>
+                <xsl:with-param name="default" select="'0'"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="setMoreButton">
+            <xsl:call-template name="mandalay:getSetting">
+                <xsl:with-param name="module"  select="'SimpleAddress'"/>
+                <xsl:with-param name="setting" select="'linkView/setMoreButton'"/>
+                <xsl:with-param name="default" select="'false'"/>
+            </xsl:call-template>
+        </xsl:variable>
+
+        <!-- DE Wenn es Bilder gibt, dann soll das erste hier als Link angezeigt werden -->
+        <!-- EN -->
+        <xsl:if test="./targetItem/imageAttachments and $setImage = 'true'">
+            <a class="CIname">
+                <xsl:attribute name="href">
+                    <xsl:text>/redirect/?oid=</xsl:text>
+                    <xsl:value-of select="./targetItem/@oid"/>
+                </xsl:attribute>
+                <xsl:attribute name="title">
+                    <xsl:call-template name="mandalay:shying">
+                        <xsl:with-param name="title">
+                            <xsl:value-of select="./linkTitle"/>
+                        </xsl:with-param>
+                        <xsl:with-param name="mode">dynamic</xsl:with-param>
+                    </xsl:call-template>
+                </xsl:attribute>
+                <xsl:for-each select="./targetItem">
+                    <xsl:call-template name="mandalay:imageAttachment">
+                        <xsl:with-param name="showCaption" select="$setImageCaption" />
+                        <xsl:with-param name="maxHeight" select="$setImageMaxHeight" />
+                        <xsl:with-param name="maxWidth" select="$setImageMaxWidth" />
+                    </xsl:call-template>
+                </xsl:for-each>
+            </a>
+        </xsl:if>
+        <xsl:if test="$setImageAndText = 'true' or not(./targetItem/imageAttachments) or $setImage = 'false'">
+            <a class="CIname">
+                <xsl:attribute name="href">
+                    <xsl:text>/redirect/?oid=</xsl:text>
+                    <xsl:value-of select="./targetItem/@oid"/>
+                </xsl:attribute>
+                <xsl:attribute name="title">
+                    <xsl:call-template name="mandalay:shying">
+                        <xsl:with-param name="title">
+                            <xsl:value-of select="./linkTitle"/>
+                        </xsl:with-param>
+                        <xsl:with-param name="mode">dynamic</xsl:with-param>
+                    </xsl:call-template>
+                </xsl:attribute>
+                <xsl:call-template name="mandalay:shying">
+                    <xsl:with-param name="title">
+                        <xsl:value-of disable-output-escaping="yes" select="./linkTitle"/>
+                    </xsl:with-param>
+                    <xsl:with-param name="mode">dynamic</xsl:with-param>
+                </xsl:call-template>
+            </a>
+            <xsl:if test="./linkDescription and $setDescription">
+                <br />
+                <xsl:choose>
+                    <xsl:when test="$setDescriptionLength = '0'">
+                        <xsl:value-of disable-output-escaping="yes" select="./linkDescription" />
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:value-of disable-output-escaping="yes" select="substring(./linkDescription, 1, $setDescriptionLength)" />
+                        <xsl:if test="string-length(./linkDescription) > $setDescriptionLength">
+                            <xsl:text>...</xsl:text>
+                            <xsl:if test="$setMoreButton = 'true'">
+                                <span class="moreButton">
+                                    <a>
+                                        <xsl:attribute name="href">
+                                            <xsl:text>/redirect/?oid=</xsl:text>
+                                            <xsl:value-of select="./targetItem/@oid"/>
+                                        </xsl:attribute>
+                                        <xsl:attribute name="title">
+                                            <xsl:call-template name="mandalay:getStaticText">
+                                                <xsl:with-param name="module" select="'SimpleAddress'"/>
+                                                <xsl:with-param name="id" select="'moreButtonTitle'"/>
+                                            </xsl:call-template>
+                                        </xsl:attribute>
+                                        <xsl:call-template name="mandalay:getStaticText">
+                                            <xsl:with-param name="module" select="'SimpleAddress'"/>
+                                            <xsl:with-param name="id" select="'moreButton'"/>
+                                        </xsl:call-template>
+                                    </a> 
+                                </span>
+                            </xsl:if>
+                        </xsl:if>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </xsl:if>
+        </xsl:if>
+    </xsl:template>
+
+</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/mandalay/lang/de/SimpleAddress.xml b/ccm-sci-bundle/web/themes/mandalay/lang/de/SimpleAddress.xml
new file mode 100644
index 000000000..b576d18dc
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/mandalay/lang/de/SimpleAddress.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- 
+    Copyright: 2014 Jens Pelzetter
+  
+    This file is part of Mandalay.
+
+    Mandalay is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    Mandalay is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Mandalay.  If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<translations>
+  <line id="lang">Deutsch</line>
+  <line id="version">0.1</line>
+
+  <line id="address">Adresse</line>
+  <line id="postalCode">Postleitzahl</line>
+  <line id="countryName">Land</line>
+  <line id="phone">Telefon</line>
+  <line id="mobile">Mobiltelefon:</line>
+  <line id="fax">Fax</line>
+  <line id="email">E-Mail</line>
+  <line id="notes">Bemerkungen</line>
+  
+  <line id="moreButton">mehr »</line>
+  <line id="moreButtonTitle">weiter lesen</line>
+  
+</translations>
diff --git a/ccm-sci-bundle/web/themes/mandalay/lang/en/SimpleAddress.xml b/ccm-sci-bundle/web/themes/mandalay/lang/en/SimpleAddress.xml
new file mode 100644
index 000000000..e9dd1af5f
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/mandalay/lang/en/SimpleAddress.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- 
+    Copyright: 2014 Jens Pelzetter
+  
+    This file is part of Mandalay.
+
+    Mandalay is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    Mandalay is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Mandalay.  If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<translations>
+  <line id="lang">English</line>
+  <line id="version">0.1</line>
+
+  <line id="address">Address</line>
+  <line id="postalCode">Postal code</line>
+  <line id="countryName">Country</line>
+  <line id="phone">Phone</line>
+  <line id="mobile">Mobile</line>
+  <line id="fax">Fax</line>
+  <line id="email">Email</line>
+  <line id="notes">Notes</line>
+  
+  <line id="moreButton">more »</line>
+  <line id="moreButtonTitle">read more</line>
+  
+</translations>
diff --git a/ccm-sci-bundle/web/themes/mandalay/settings/SimpleAddress.xml b/ccm-sci-bundle/web/themes/mandalay/settings/SimpleAddress.xml
new file mode 100644
index 000000000..5a3ffb630
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/mandalay/settings/SimpleAddress.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- 
+    Copyright: 2014 Jens Pelzetter
+  
+    This file is part of Mandalay.
+
+    Mandalay is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    Mandalay is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Mandalay.  If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<settings>
+
+    <setting id="setImage">true</setting>
+    <setting id="setImageMaxHeight">300</setting>
+    <setting id="setImageMaxWidth">300</setting>
+    <setting id="setImageCaption">true</setting>
+    
+    <setting id="setAddress">true</setting>
+    <setting id="setPostalCode">false</setting>
+    <setting id="setPhone">true</setting>
+    <setting id="setMobile">true</setting>
+    <setting id="setFax">true</setting>
+    <setting id="setEmail">true</setting>
+    <setting id="setNotes">true</setting>
+    
+    <setting id="linkView/setImageAndText">true</setting>
+    <setting id="linkView/setImage">true</setting>
+    <setting id="linkView/setImageMaxWidth">100</setting>
+    <setting id="linkView/setImageMaxHeight">75</setting>
+    <setting id="linkView/setImageCaption">true</setting>
+    <setting id="linkView/setDescription">true</setting>
+    <setting id="linkView/setDescriptionLength">0</setting>
+    <setting id="linkView/setMoreButton">true</setting>
+        
+</settings>
\ No newline at end of file