Daily merge.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2882 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

config/alfresco/bootstrap-context.xml

@@ -109,6 +109,10 @@
                     <prop key="path">/${spaces.company_home.childname}/${spaces.dictionary.childname}/${spaces.templates.email.childname}</prop>
                     <prop key="location">alfresco/templates/email_templates.acp</prop>
                 </props>
+                <props>
+                    <prop key="path">/${spaces.company_home.childname}/${spaces.dictionary.childname}/${spaces.scripts.childname}</prop>
+                    <prop key="location">alfresco/bootstrap/example_javascripts.acp</prop>
+                </props>
             </list>
         </property>
     </bean>

config/alfresco/mimetype/mimetype-map.xml

@@ -124,6 +124,9 @@
          <mimetype mimetype="application/mac-binhex40" display="">
             <extension>hqx</extension>
          </mimetype>
+         <mimetype mimetype="text/calendar" display="iCalendar File">
+            <extension>ics</extension>
+         </mimetype>
          <mimetype mimetype="image/ief" display="IEF Image">
             <extension>ief</extension>
          </mimetype>

config/alfresco/model-specific-services-context.xml

@@ -20,6 +20,7 @@
             <value>/${spaces.company_home.childname}/${spaces.dictionary.childname}/${spaces.templates.childname}</value>
             <value>/${spaces.company_home.childname}/${spaces.dictionary.childname}/${spaces.templates.content.childname}</value>
             <value>/${spaces.company_home.childname}/${spaces.dictionary.childname}/${spaces.templates.email.childname}</value>
+            <value>/${spaces.company_home.childname}/${spaces.dictionary.childname}/${spaces.scripts.childname}</value>
          </list>
       </property>
    </bean>