Merged V1.4 to HEAD

svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3987 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4133 .
   Removed LicenseComponent reference from projects\repository\source\java\org\alfresco\repo\descriptor\DescriptorServiceImpl.java


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4135 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

config/alfresco/templates/content_template_examples.xml

@@ -140,4 +140,18 @@
     </view:properties>
     <view:associations></view:associations>
   </cm:content>
+  <cm:content xmlns:alf="http://www.alfresco.org" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns="" view:childName="cm:show_audit.ftl">
+    <view:aspects>
+      <cm:titled></cm:titled>
+      <app:inlineeditable></app:inlineeditable>
+    </view:aspects>
+    <view:properties>
+      <app:editInline>true</app:editInline>
+      <cm:description>Displays the audit trail for an object.</cm:description>
+      <cm:content>contentUrl=classpath:alfresco/templates/content/examples/show_audit.ftl|mimetype=text/plain|size=6134|encoding=UTF-8</cm:content>
+      <cm:title>show_audit.ftl</cm:title>
+      <cm:name>show_audit.ftl</cm:name>
+    </view:properties>
+    <view:associations></view:associations>
+  </cm:content>
 </view:view>