You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2016/04/25 20:21:41 UTC

[1/8] isis-site git commit: ISIS-1335: improving docs for setting up file/live templates for IntelliJ, some small fixes. Also updated the cheat sheet PDF/docx

Repository: isis-site
Updated Branches:
  refs/heads/asf-site 774a4eb09 -> ec1efb3ce


http://git-wip-us.apache.org/repos/asf/isis-site/blob/ec1efb3c/content/resources/templates/isis-templates.xml
----------------------------------------------------------------------
diff --git a/content/resources/templates/isis-templates.xml b/content/resources/templates/isis-templates.xml
deleted file mode 100644
index f8ea500..0000000
--- a/content/resources/templates/isis-templates.xml
+++ /dev/null
@@ -1,465 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-  
-         http://www.apache.org/licenses/LICENSE-2.0
-         
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<templates><template autoinsert="true" context="java-members" deleted="false" description="Action" enabled="true" name="isa">// {{ ${actionName} (action)&#13;
-${:import(org.apache.isis.applib.annotation.MemberOrder)}@MemberOrder(sequence="1")&#13;
-public ${ReturnType} ${actionName}(final ${ParameterType} ${parameterType}) {&#13;
-	return ${cursor}null; // TODO: business logic here&#13;
-}&#13;
-// }}&#13;
-&#13;
-</template><template autoinsert="true" context="java-members" deleted="false" description="Action argument N choices" enabled="true" name="isacho">${:import(java.util.Collections,java.util.List)}public List&lt;${ParameterType}&gt; choices${ParameterNumThenCapitalizedActionName}() {&#13;
-	return ${cursor}Collections.emptyList(); // TODO: return list of choices for argument N&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Action argument defaults" enabled="true" name="isadef">public ${ParameterType} default${ParameterNumThenCapitalizedActionName}() {&#13;
-	return ${cursor}null; // TODO: return default for argument N&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Action disabling" enabled="true" name="isadis">public String disable${ActionName}() {&#13;
-	return ${cursor}null; // TODO: return reason why action disabled, null if enabled&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Action hiding" enabled="true" name="isahid">public boolean hide${ActionName}() {&#13;
-	return ${cursor}false; // TODO: return true if action is hidden, false if visible&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Action validation" enabled="true" name="isaval">public String validate${ActionName}(final ${ParameterType} ${parameterType}) {&#13;
-	return ${cursor}null; // TODO: return reason why action arguments are invalid, null if ok&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Collection (1:m bidir parent)" enabled="true" name="isc-1m">public void addTo${ChildCollectionName}(final ${ChildElementType} ${childElementName}) {&#13;
-	// check for no-op&#13;
-	if (${childElementName} == null || &#13;
-		get${ChildCollectionName}().contains(${childElementName})) {&#13;
-		return;&#13;
-	}&#13;
-	// dissociate arg from its current parent (if any).&#13;
-	${childElementName}.clear${ParentPropertyNameInChild}();&#13;
-	// associate arg&#13;
-	${childElementName}.set${ParentPropertyNameInChild}(this);&#13;
-	get${ChildCollectionName}().add(${childElementName});&#13;
-	// additional business logic&#13;
-	onAddTo${ChildCollectionName}(${childElementName});&#13;
-}&#13;
-public void removeFrom${ChildCollectionName}(final ${ChildElementType} ${childElementName}) {&#13;
-	// check for no-op&#13;
-	if (${childElementName} == null || &#13;
-		!get${ChildCollectionName}().contains(${childElementName})) {&#13;
-		return;&#13;
-	}&#13;
-	// dissociate arg&#13;
-	${childElementName}.set${ParentPropertyNameInChild}(null);&#13;
-	get${ChildCollectionName}().remove(${childElementName});&#13;
-	// additional business logic&#13;
-	onRemoveFrom${ChildCollectionName}(${childElementName});&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Collection (m:m bidir child)" enabled="true" name="isc-mmc">public void addTo${ParentCollectionName}(final ${ParentElementType} ${parentElementName}) {&#13;
-	// check for no-op&#13;
-	if (${parentElementName} == null || &#13;
-		get${ParentCollectionName}().contains(${parentElementName})) {&#13;
-		return;&#13;
-	}&#13;
-	// delegate to parent to add&#13;
-	${parentElementName}.addTo${ChildCollectionNameInParent}(this);&#13;
-	// additional business logic&#13;
-	onAddTo${ParentCollectionName}(${parentElementName});&#13;
-}&#13;
-public void removeFrom${ParentCollectionName}(final ${ParentElementType} ${parentElementName}) {&#13;
-	// check for no-op&#13;
-	if (${parentElementName} == null || &#13;
-		!get${ParentCollectionName}().contains(${parentElementName})) {&#13;
-		return;&#13;
-	}&#13;
-	// delegate to parent to remove&#13;
-	${parentElementName}.removeFrom${ChildCollectionNameInParent}(this);&#13;
-	// additional business logic&#13;
-	onRemoveFrom${ParentCollectionName}(${parentElementName});&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Collection (m:m bidir parent)" enabled="true" name="isc-mmp">public void addTo${ChildCollectionName}(final ${ChildElementType} ${childElementName}) {&#13;
-	// check for no-op&#13;
-	if (${childElementName} == null || &#13;
-		get${ChildCollectionName}().contains(${childElementName})) {&#13;
-		return;&#13;
-	}&#13;
-	// dissociate arg from its current parent (if any).&#13;
-	${childElementName}.removeFrom${ParentCollectionNameInChild}(this);&#13;
-	// associate arg&#13;
-	${childElementName}.get${ParentCollectionNameInChild}().add(this);&#13;
-	get${ChildCollectionName}().add(${childElementName});&#13;
-	// additional business logic&#13;
-	onAddTo${ChildCollectionName}(${childElementName});&#13;
-}&#13;
-public void removeFrom${ChildCollectionName}(final ${ChildElementType} ${childElementName}) {&#13;
-	// check for no-op&#13;
-	if (${childElementName} == null || &#13;
-		!get${ChildCollectionName}().contains(${childElementName})) {&#13;
-		return;&#13;
-	}&#13;
-	// dissociate arg&#13;
-	${childElementName}.get${ParentCollectionNameInChild}().remove(this);&#13;
-	get${ChildCollectionName}().remove(${childElementName});&#13;
-	// additional business logic&#13;
-	onRemoveFrom${ChildCollectionName}(${childElementName});&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Collection disabling" enabled="true" name="iscdis">public String disable${CollectionName}() {&#13;
-	return ${cursor}null; // TODO: return reason why collection read-only, null if editable&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Collection hiding" enabled="true" name="ischid">public boolean hide${CollectionName}() {&#13;
-	return ${cursor}false; // TODO: return true if hidden, false otherwise&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Collection (list)" enabled="true" name="iscl">// {{ ${CollectionName} (Collection)&#13;
-${:import(java.util.List,java.util.ArrayList,org.apache.isis.applib.annotation.MemberOrder)}private List&lt;${ElementType}&gt; ${collectionName} = new ArrayList&lt;${ElementType}&gt;();&#13;
-@MemberOrder(sequence="1")&#13;
-public List&lt;${ElementType}&gt; get${CollectionName}() {&#13;
-	return ${collectionName};&#13;
-}&#13;
-public void set${CollectionName}(final List&lt;${ElementType}&gt; ${collectionName}) {&#13;
-	this.${collectionName} = ${collectionName};&#13;
-}&#13;
-// }}&#13;
-&#13;
-</template><template autoinsert="true" context="java-members" deleted="false" description="Collection modify" enabled="true" name="iscmod">public void addTo${CollectionName}(final ${ElementType} ${elementName}) {&#13;
-	// check for no-op&#13;
-	if (${elementName} == null || &#13;
-		get${CollectionName}().contains(${elementName})) {&#13;
-		return;&#13;
-	}&#13;
-	// associate new&#13;
-	get${CollectionName}().add(${elementName});&#13;
-    // additional business logic&#13;
-    onAddTo${CollectionName}(${elementName});&#13;
-}&#13;
-public void removeFrom${CollectionName}(final ${ElementType} ${elementName}) {&#13;
-	// check for no-op&#13;
-	if (${elementName} == null || &#13;
-		!get${CollectionName}().contains(${elementName})) {&#13;
-		return;&#13;
-	}&#13;
-	// dissociate existing&#13;
-	get${CollectionName}().remove(${elementName});&#13;
-    // additional business logic&#13;
-    onRemoveFrom${CollectionName}(${elementName});&#13;
-}&#13;
-protected void onAddTo${CollectionName}(final ${ElementType} ${elementName}) {&#13;
-}&#13;
-protected void onRemoveFrom${CollectionName}(final ${ElementType} ${elementName}) {&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Collection (set)" enabled="true" name="iscs">// {{ ${CollectionName} (Collection)&#13;
-${:import(java.util.Set,java.util.LinkedHashSet,org.apache.isis.applib.annotation.MemberOrder)}private Set&lt;${ElementType}&gt; ${collectionName} = new LinkedHashSet&lt;${ElementType}&gt;();&#13;
-@MemberOrder(sequence="1")&#13;
-public Set&lt;${ElementType}&gt; get${CollectionName}() {&#13;
-	return ${collectionName};&#13;
-}&#13;
-public void set${CollectionName}(final Set&lt;${ElementType}&gt; ${collectionName}) {&#13;
-	this.${collectionName} = ${collectionName};&#13;
-}&#13;
-// }}&#13;
-&#13;
-</template><template autoinsert="true" context="java-members" deleted="false" description="Collection validation" enabled="true" name="iscval">public String validateAddTo${CollectionName}(final ${ElementType} ${elementName}) {&#13;
-	return ${cursor}null; // TODO: return reason why argument cannot be added, null if ok to add&#13;
-}&#13;
-public String validateRemoveFrom${CollectionName}(final ${ElementType} ${elementName}) {&#13;
-	return null; // TODO: return reason why argument cannot be removed, null if ok to remove&#13;
-}&#13;
-&#13;
-</template><template autoinsert="true" context="java-members" deleted="false" description="Dependencies region" enabled="true" name="isd">// {{ injected dependencies&#13;
-${cursor}&#13;
-// }}&#13;
-&#13;
-</template><template autoinsert="true" context="java-members" deleted="false" description="Dependencies - injected service" enabled="true" name="isds">// {{ injected: ${ServiceType}&#13;
-private ${ServiceType} ${serviceType};&#13;
-public void set${ServiceType}(final ${ServiceType} ${serviceType}) {&#13;
-	this.${serviceType} = ${serviceType};&#13;
-}&#13;
-// }}&#13;
-&#13;
-</template><template autoinsert="true" context="java-members" deleted="false" description="Factory - new instance (persistent)" enabled="true" name="isfp">// {{ Create new (already persisted) ${Type}&#13;
-public ${Type} new${Type}() {&#13;
-	${Type} ${type} = newTransientInstance(${Type}.class);&#13;
-	${cursor}// TODO: set up any properties&#13;
-&#13;
-	persist(${type});&#13;
-	return ${type};&#13;
-}&#13;
-// }}</template><template autoinsert="true" context="java-members" deleted="false" description="Factory - new instance (transient)" enabled="true" name="isft">// {{ Create new (still transient) ${Type}&#13;
-public ${Type} new${InstanceOfType}() {&#13;
-	${Type} ${type} = newTransientInstance(${Type}.class);&#13;
-	${cursor}// TODO: set up any properties&#13;
-&#13;
-	return ${type};&#13;
-}&#13;
-// }}</template><template autoinsert="true" context="java-members" deleted="false" description="Identification region" enabled="true" name="isid">// {{ Identification&#13;
-${cursor}&#13;
-// }}&#13;
-&#13;
-</template><template autoinsert="true" context="java-members" deleted="false" description="Identification - icon" enabled="true" name="isidicon">public String iconName() {&#13;
-	return ${cursor}null; // TODO: return name of image file (without suffix)&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Identification - title" enabled="true" name="isidtitle">public String title() {&#13;
-    ${:import(org.apache.isis.applib.util.TitleBuffer)}final TitleBuffer buf = new TitleBuffer();&#13;
-    ${cursor}// TODO: append to TitleBuffer, typically value properties&#13;
-	return buf.toString();&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="JDO Collection (1:n bidir, foreign key)" enabled="true" name="isjdc-1n-b-fk">// {{ ${CollectionName} (Collection)
-${:import(java.util.SortedSet,java.util.TreeSet,org.apache.isis.applib.annotation.MemberOrder,javax.jdo.annotations.Persistent)}@Persistent(mappedBy="${elementNameInChild}", dependentElement="${trueOrFalse}")
-private SortedSet&lt;${ElementType}&gt; ${collectionName} = new TreeSet&lt;${ElementType}&gt;();
-@MemberOrder(sequence="1")
-public SortedSet&lt;${ElementType}&gt; get${CollectionName}() {
-return ${collectionName};
-}
-public void set${CollectionName}(final SortedSet&lt;${ElementType}&gt; ${collectionName}) {
-this.${collectionName} = ${collectionName};
-}
-// }}</template><template autoinsert="true" context="java-members" deleted="false" description="JDO Collection (1:n bidir, join table)" enabled="true" name="isjdc-1n-b-jt">// {{ ${CollectionName} (Collection)
-${:import(java.util.SortedSet,java.util.TreeSet,org.apache.isis.applib.annotation.MemberOrder,javax.jdo.annotations.Persitent,javax.jdo.annotations.Join)}@Persistent(mappedBy="${elementNameInChild}", dependentElement="${trueOrFalse}")
-@Join
-private SortedSet&lt;${ElementType}&gt; ${collectionName} = new TreeSet&lt;${ElementType}&gt;();
-@MemberOrder(sequence="1")
-public SortedSet&lt;${ElementType}&gt; get${CollectionName}() {
-return ${collectionName};
-}
-public void set${CollectionName}(final SortedSet&lt;${ElementType}&gt; ${collectionName}) {
-this.${collectionName} = ${collectionName};
-}
-// }}</template><template autoinsert="true" context="java-members" deleted="false" description="JDO Collection (1:n unidir, foreign key)" enabled="true" name="isjdc-1n-u-fk">// {{ ${CollectionName} (Collection)
-${:import(java.util.SortedSet,java.util.TreeSet,org.apache.isis.applib.annotation.MemberOrder,javax.jdo.annotations.Element)}
-@Element(column="${ColumnName}", dependent="${trueOrFalse}")
-private SortedSet&lt;${ElementType}&gt; ${collectionName} = new TreeSet&lt;${ElementType}&gt;();
-@MemberOrder(sequence="1")
-public SortedSet&lt;${ElementType}&gt; get${CollectionName}() {
-return ${collectionName};
-}
-public void set${CollectionName}(final SortedSet&lt;${ElementType}&gt; ${collectionName}) {
-this.${collectionName} = ${collectionName};
-}
-// }}</template><template autoinsert="true" context="java-members" deleted="false" description="JDO Collection (1:n unidir, join table)" enabled="true" name="isjdc-1n-u-jt">// {{ ${CollectionName} (Collection)
-${:import(java.util.SortedSet,java.util.TreeSet,org.apache.isis.applib.annotation.MemberOrder,javax.jdo.annotations.Join,javax.jdo.annotations.Element)}@Join
-@Element(dependent="${trueOrFalse}")
-private SortedSet&lt;${ElementType}&gt; ${collectionName} = new TreeSet&lt;${ElementType}&gt;();
-@MemberOrder(sequence="1")
-public SortedSet&lt;${ElementType}&gt; get${CollectionName}() {
-return ${collectionName};
-}
-public void set${CollectionName}(final SortedSet&lt;${ElementType}&gt; ${collectionName}) {
-this.${collectionName} = ${collectionName};
-}
-// }}</template><template autoinsert="true" context="java-members" deleted="false" description="JDO Collection (m:n bidir - child)" enabled="true" name="isjdc-mn-ub-c">// {{ ${CollectionName} (Collection)
-${:import(java.util.SortedSet,java.util.TreeSet,org.apache.isis.applib.annotation.MemberOrder,javax.jdo.annotations.Persistent)}@Persistent(mappedBy="${ChildCollectionNameInParent}")
-private SortedSet&lt;${ElementType}&gt; ${collectionName} = new TreeSet&lt;${ElementType}&gt;();
-public SortedSet&lt;${ElementType}&gt; get${CollectionName}() {
-return ${collectionName};
-}
-public void set${CollectionName}(final SortedSet&lt;${ElementType}&gt; ${collectionName}) {
-this.${collectionName} = ${collectionName};
-}
-// }}</template><template autoinsert="true" context="java-members" deleted="false" description="JDO Collection (m:n unidir &amp; bidir - parent)" enabled="true" name="isjdc-mn-ub-p">// {{ ${CollectionName} (Collection)
-${:import(java.util.SortedSet,java.util.TreeSet,org.apache.isis.applib.annotation.MemberOrder,javax.jdo.annotations.Persistent,javax.jdo.annotations.Join,javax.jdo.annotations.Element)}@Persistent(table="${TableName}")
-@Join(column="${ThisEntityFieldName}")
-@Element(column="${RelatedEntityFieldName}")
-private SortedSet&lt;${ElementType}&gt; ${collectionName} = new TreeSet&lt;${ElementType}&gt;();@MemberOrder(sequence="1")
-
-public SortedSet&lt;${ElementType}&gt; get${CollectionName}() {
-	return ${collectionName};
-}
-public void set${CollectionName}(final SortedSet&lt;${ElementType}&gt; ${collectionName}) {
-	this.${collectionName} = ${collectionName};
-}
-// }}</template><template autoinsert="true" context="java-members" deleted="false" description="JDO Property (simple - 1:1 unidir &amp; bidir - parent)" enabled="true" name="isjdp">// {{ ${PropertyName} (property)&#13;
-private ${PropertyType} ${propertyName};&#13;
-${:import(org.apache.isis.applib.annotation.MemberOrder,javax.jdo.annotations.Column)}@MemberOrder(sequence="1")&#13;
-@Column(allowsNull="${trueOrFalse}")&#13;
-public ${PropertyType} get${PropertyName}() {&#13;
-	return ${propertyName};&#13;
-}&#13;
-public void set${PropertyName}(final ${PropertyType} ${propertyName}) {&#13;
-	this.${propertyName} = ${propertyName};&#13;
-}&#13;
-// }}&#13;
-&#13;
-</template><template autoinsert="true" context="java-members" deleted="false" description="JDO Property (1:1 child)" enabled="true" name="isjdp-11c">// {{ ${PropertyName} (property)
-private ${PropertyType} ${propertyName};
-${:import(org.apache.isis.applib.annotation.MemberOrder,javax.jdo.annotations.Column,javax.jdo.annotations.Persistent)}@MemberOrder(sequence="1")
-@Column(allowsNull="${trueOrFalse}")
-@Persistent(mappedBy="${fieldOnChild}")
-public ${PropertyType} get${PropertyName}() {
-	return ${propertyName};
-}
-public void set${PropertyName}(final ${PropertyType} ${propertyName}) {
-	this.${propertyName} = ${propertyName};
-}
-// }}</template><template autoinsert="true" context="java-members" deleted="false" description="Lifecycle region" enabled="true" name="isl">// {{ Lifecycle methods&#13;
-${cursor}&#13;
-// }}&#13;
-&#13;
-</template><template autoinsert="true" context="java-members" deleted="false" description="Lifecycle - create" enabled="true" name="islc">public void created() {&#13;
-    ${cursor}// TODO: post-create&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Lifecycle - load" enabled="true" name="isll">public void loading() {&#13;
-    ${cursor}// TODO: pre-load&#13;
-}&#13;
-public void loaded() {&#13;
-    // TODO: post-load&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Lifecycle - persist" enabled="true" name="islp">public void persisting() {&#13;
-    ${cursor}// TODO: pre-persist&#13;
-}&#13;
-public void persisted() {&#13;
-    // TODO: post-persist&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Lifecycle - remove" enabled="true" name="islr">public void removing() {&#13;
-    ${cursor}// TODO: pre-remove&#13;
-}&#13;
-public void removed() {&#13;
-    // TODO: post-remove&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Lifecycle - update" enabled="true" name="islu">public void updating() {&#13;
-    ${cursor}// TODO: pre-update&#13;
-}&#13;
-public void updated() {&#13;
-    // TODO: post-update&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Property" enabled="true" name="isp">// {{ ${PropertyName} (property)&#13;
-private ${PropertyType} ${propertyName};&#13;
-${:import(org.apache.isis.applib.annotation.MemberOrder)}@MemberOrder(sequence="1")&#13;
-public ${PropertyType} get${PropertyName}() {&#13;
-	return ${propertyName};&#13;
-}&#13;
-public void set${PropertyName}(final ${PropertyType} ${propertyName}) {&#13;
-	this.${propertyName} = ${propertyName};&#13;
-}&#13;
-// }}&#13;
-&#13;
-</template><template autoinsert="true" context="java-members" deleted="false" description="Property (1:1 bidir child)" enabled="true" name="isp-11c">public void modify${ParentPropertyName}(final ${ParentPropertyType} ${parentPropertyName}) {&#13;
-    ${ParentPropertyType} current${ParentPropertyName} = get${ParentPropertyName}();&#13;
-	// check for no-op&#13;
-	if (${parentPropertyName} == null || &#13;
-		${parentPropertyName}.equals(current${ParentPropertyName})) {&#13;
-		return;&#13;
-	}&#13;
-	// delegate to parent to associate&#13;
-	${parentPropertyName}.modify${ChildPropertyNameInParent}(this);&#13;
-	// additional business logic&#13;
-	onModify${ParentPropertyName}(current${ParentPropertyName}, ${parentPropertyName});&#13;
-}&#13;
-public void clear${PropertyName}() {&#13;
-    ${ParentPropertyType} current${ParentPropertyName} = get${ParentPropertyName}();&#13;
-	// check for no-op&#13;
-	if (current${ParentPropertyName} == null) {&#13;
-		return;&#13;
-	}&#13;
-	// delegate to parent to dissociate&#13;
-	current${ParentPropertyName}.clear${ChildPropertyNameInParent}();&#13;
-	// additional business logic&#13;
-	onClear${ParentPropertyName}(current${ParentPropertyName});&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Property (1:1 bidir parent)" enabled="true" name="isp-11p">public void modify${ChildPropertyName}(final ${ChildPropertyType} ${childPropertyName}) {&#13;
-    ${ChildPropertyType} current${ChildPropertyName} = get${ChildPropertyName}();&#13;
-	// check for no-op&#13;
-	if (${childPropertyName} == null || &#13;
-		${childPropertyName}.equals(current${ChildPropertyName})) {&#13;
-		return;&#13;
-	}&#13;
-	// dissociate existing&#13;
-	clear${ChildPropertyName}();&#13;
-	// associate new&#13;
-	${childPropertyName}.set${ParentPropertyNameInChild}(this);&#13;
-	set${ChildPropertyName}(${childPropertyName});&#13;
-	// additional business logic&#13;
-	onModify${ChildPropertyName}(current${ChildPropertyName}, ${childPropertyName});&#13;
-}&#13;
-public void clear${ChildPropertyName}() {&#13;
-    ${ChildPropertyType} current${ChildPropertyName} = get${ChildPropertyName}();&#13;
-	// check for no-op&#13;
-	if (current${ChildPropertyName} == null) {&#13;
-		return;&#13;
-	}&#13;
-	// dissociate existing&#13;
-	current${ChildPropertyName}.set${ParentPropertyNameInChild}(null);&#13;
-	set${ChildPropertyName}(null);&#13;
-	// additional business logic&#13;
-	onClear${ChildPropertyName}(current${ChildPropertyName});&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Property (m:1 bidir child)" enabled="true" name="isp-m1">public void modify${ParentPropertyName}(final ${ParentPropertyType} ${parentPropertyName}) {&#13;
-    ${ParentPropertyType} current${ParentPropertyName} = get${ParentPropertyName}();&#13;
-	// check for no-op&#13;
-	if (${parentPropertyName} == null || &#13;
-		${parentPropertyName}.equals(current${ParentPropertyName})) {&#13;
-		return;&#13;
-	}&#13;
-	// delegate to parent to associate&#13;
-	${parentPropertyName}.addTo${ChildCollectionNameInParent}(this);&#13;
-	// additional business logic&#13;
-	onModify${ParentPropertyName}(current${ParentPropertyName}, ${parentPropertyName});&#13;
-}&#13;
-public void clear${ParentPropertyName}() {&#13;
-    ${ParentPropertyType} current${ParentPropertyName} = get${ParentPropertyName}();&#13;
-	// check for no-op&#13;
-	if (current${ParentPropertyName} == null) {&#13;
-		return;&#13;
-	}&#13;
-	// delegate to parent to dissociate&#13;
-	current${ParentPropertyName}.removeFrom${ChildCollectionNameInParent}(this);&#13;
-	// additional business logic&#13;
-	onClear${ParentPropertyName}(current${ParentPropertyName});&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Property choices" enabled="true" name="ispcho">${:import(java.util.List)}public List&lt;${PropertyType}&gt; choices${PropertyName}() {&#13;
-	return ${cursor}null; // TODO: return list of choices for property&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Property defaults" enabled="true" name="ispdef">public ${PropertyType} default${PropertyName}() {&#13;
-	return ${cursor}null; // TODO: return default for property when first created&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Property disabling" enabled="true" name="ispdis">public String disable${PropertyName}() {&#13;
-	return ${cursor}null; // TODO: return reason why property is disabled, null if editable&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Property hiding" enabled="true" name="isphid">public boolean hide${PropertyName}() {&#13;
-	return ${cursor}false; // TODO: return true if hidden, false if visible&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Property modify" enabled="true" name="ispmod">public void modify${PropertyName}(final ${PropertyType} ${propertyName}) {&#13;
-    ${PropertyType} current${PropertyName} = get${PropertyName}();&#13;
-	// check for no-op&#13;
-	if (${propertyName} == null || &#13;
-		${propertyName}.equals(current${PropertyName})) {&#13;
-		return;&#13;
-	}&#13;
-	// associate new&#13;
-	set${PropertyName}(${propertyName});&#13;
-	// additional business logic&#13;
-	onModify${PropertyName}(current${PropertyName}, ${propertyName});&#13;
-}&#13;
-public void clear${PropertyName}() {&#13;
-    ${PropertyType} current${PropertyName} = get${PropertyName}();&#13;
-	// check for no-op&#13;
-	if (current${PropertyName} == null) {&#13;
-		return;&#13;
-	}&#13;
-	// dissociate existing&#13;
-	set${PropertyName}(null);&#13;
-	// additional business logic&#13;
-	onClear${PropertyName}(current${PropertyName});&#13;
-}&#13;
-protected void onModify${PropertyName}(final ${PropertyType} old${PropertyName}, final ${PropertyType} new${PropertyName}) {&#13;
-}&#13;
-protected void onClear${PropertyName}(final ${PropertyType} old${PropertyName}) {&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Property validation" enabled="true" name="ispval">public String validate${PropertyName}(final ${PropertyType} ${propertyName}) {&#13;
-	if (${propertyName} == null) return null;&#13;
-	return ${cursor}null; // TODO: return reason why proposed value is invalid, null if valid&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Isis Section" enabled="true" name="iss">// {{ ${SectionName}
-${cursor}
-// }}</template><template autoinsert="true" context="java-members" deleted="false" description="Search for all" enabled="true" name="issa">// {{ all ${TypePlural}&#13;
-${:import(org.apache.isis.applib.annotation.Exploration,java.util.List)}@Exploration&#13;
-public List&lt;${Type}&gt; all${TypePlural}() {&#13;
-	return allInstances(${Type}.class);&#13;
-}&#13;
-// }}&#13;
-&#13;
-&#13;
-</template><template autoinsert="true" context="java-members" deleted="false" description="Search for all matching" enabled="true" name="issafil">// {{ all ${TypePlural} that ${filterDescription}&#13;
-${:import(org.apache.isis.applib.annotation.Exploration,org.apache.isis.applib.Filter,java.util.List)}@Exploration&#13;
-public List&lt;${Type}&gt; all${TypePlural}Matching(final Filter&lt;${Type}&gt; filter) {&#13;
-	return allMatches(${Type}.class, filter);&#13;
-}&#13;
-// }}&#13;
-&#13;
-&#13;
-</template><template autoinsert="true" context="java-members" deleted="false" description="Search for first matching" enabled="true" name="issffil">// {{ first ${Type} that ${filterDescription}&#13;
-${:import(org.apache.isis.applib.annotation.Exploration,org.apache.isis.applib.Filter,java.util.List)}@Exploration&#13;
-public ${Type} first${Type}Matching(final Filter&lt;${Type}&gt; filter) {&#13;
-	return firstMatch(${Type}.class, filter);&#13;
-}&#13;
-// }}&#13;
-</template><template autoinsert="true" context="java-members" deleted="false" description="Search for unique matching" enabled="true" name="issufil">// {{ unique ${Type} that ${filterDescription}&#13;
-${:import(org.apache.isis.applib.annotation.Exploration,org.apache.isis.applib.Filter,java.util.List)}@Exploration&#13;
-public ${Type} unique${Type}Matching(final Filter&lt;${Type}&gt; filter) {&#13;
-	return uniqueMatch(${Type}.class, filter);&#13;
-}&#13;
-// }}&#13;
-</template><template autoinsert="true" context="java-members" deleted="false" description="Object-level validation" enabled="true" name="isval">public String validate() {&#13;
-    ${cursor}// TODO: return reason why object is in invalid state (and so cannot be saved/updated), or null if ok&#13;
-}</template></templates>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/isis-site/blob/ec1efb3c/content/resources/templates/jmock2-templates-idea.xml
----------------------------------------------------------------------
diff --git a/content/resources/templates/jmock2-templates-idea.xml b/content/resources/templates/jmock2-templates-idea.xml
deleted file mode 100644
index c57cd75..0000000
--- a/content/resources/templates/jmock2-templates-idea.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<templateSet group="jmock2-templates">
-  <template name="jmautomock" value="@org.jmock.auto.Mock&#10;private $MockClass$ mock$MockClass$;" description="" toReformat="true" toShortenFQNames="true">
-    <variable name="MockClass" expression="className()" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="HTML" value="false" />
-      <option name="XML" value="false" />
-      <option name="JAVA_CODE" value="true" />
-      <option name="JAVA_COMMENT" value="false" />
-      <option name="JAVA_STRING" value="false" />
-      <option name="COMPLETION" value="false" />
-      <option name="JAVA_SCRIPT" value="false" />
-      <option name="OTHER" value="false" />
-    </context>
-  </template>
-  <template name="jmcontext" value="private org.jmock.Mockery context = new org.jmock.integration.junit4.JUnit4Mockery();" description="" toReformat="true" toShortenFQNames="true">
-    <context>
-      <option name="HTML" value="false" />
-      <option name="XML" value="false" />
-      <option name="JAVA_CODE" value="true" />
-      <option name="JAVA_COMMENT" value="false" />
-      <option name="JAVA_STRING" value="false" />
-      <option name="COMPLETION" value="false" />
-      <option name="JAVA_SCRIPT" value="false" />
-      <option name="OTHER" value="false" />
-    </context>
-  </template>
-  <template name="jmexpectations" value="context.checking(new org.jmock.Expectations() {{&#10;    $END$&#10;}});" description="" toReformat="true" toShortenFQNames="true">
-    <context>
-      <option name="HTML" value="false" />
-      <option name="XML" value="false" />
-      <option name="JAVA_CODE" value="true" />
-      <option name="JAVA_COMMENT" value="false" />
-      <option name="JAVA_STRING" value="false" />
-      <option name="COMPLETION" value="false" />
-      <option name="JAVA_SCRIPT" value="false" />
-      <option name="OTHER" value="false" />
-    </context>
-  </template>
-  <template name="jmmock" value="$MockClass$ $mockObject$ = context.mock($MockClass$.class);" description="" toReformat="true" toShortenFQNames="true">
-    <variable name="MockClass" expression="className()" defaultValue="" alwaysStopAt="true" />
-    <variable name="mockObject" expression="suggestVariableName()" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="HTML" value="false" />
-      <option name="XML" value="false" />
-      <option name="JAVA_CODE" value="true" />
-      <option name="JAVA_COMMENT" value="false" />
-      <option name="JAVA_STRING" value="false" />
-      <option name="COMPLETION" value="false" />
-      <option name="JAVA_SCRIPT" value="false" />
-      <option name="OTHER" value="false" />
-    </context>
-  </template>
-  <template name="jmrule" value="@org.junit.Rule&#10;public org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2 context = org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.createFor(org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode.INTERFACES_AND_CLASSES$END$);" description="" toReformat="true" toShortenFQNames="true">
-    <context>
-      <option name="HTML" value="false" />
-      <option name="XML" value="false" />
-      <option name="JAVA_CODE" value="true" />
-      <option name="JAVA_COMMENT" value="false" />
-      <option name="JAVA_STRING" value="false" />
-      <option name="COMPLETION" value="false" />
-      <option name="JAVA_SCRIPT" value="false" />
-      <option name="OTHER" value="false" />
-    </context>
-  </template>
-  <template name="jmrunwith" value="@org.junit.runner.RunWith(org.jmock.integration.junit4.JMock.class)" description="" toReformat="true" toShortenFQNames="true">
-    <context>
-      <option name="HTML" value="false" />
-      <option name="XML" value="false" />
-      <option name="JAVA_CODE" value="true" />
-      <option name="JAVA_COMMENT" value="false" />
-      <option name="JAVA_STRING" value="false" />
-      <option name="COMPLETION" value="false" />
-      <option name="JAVA_SCRIPT" value="false" />
-      <option name="OTHER" value="false" />
-    </context>
-  </template>
-  <template name="jmvalue" value="will(returnValue($END$));" description="" toReformat="true" toShortenFQNames="true">
-    <context>
-      <option name="HTML" value="false" />
-      <option name="XML" value="false" />
-      <option name="JAVA_CODE" value="true" />
-      <option name="JAVA_COMMENT" value="false" />
-      <option name="JAVA_STRING" value="false" />
-      <option name="COMPLETION" value="false" />
-      <option name="JAVA_SCRIPT" value="false" />
-      <option name="OTHER" value="false" />
-    </context>
-  </template>
-</templateSet>
-

http://git-wip-us.apache.org/repos/asf/isis-site/blob/ec1efb3c/content/resources/templates/jmock2-templates.xml
----------------------------------------------------------------------
diff --git a/content/resources/templates/jmock2-templates.xml b/content/resources/templates/jmock2-templates.xml
deleted file mode 100644
index 9f0f4a5..0000000
--- a/content/resources/templates/jmock2-templates.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><templates><template autoinsert="true" context="java" deleted="false" description="JMock2 AutoMock Definition" enabled="true" name="jmautomock">${:import(org.jmock.auto.Mock)}@Mock&#13;
-private ${MockClass} mock${MockClass};&#13;
-</template><template autoinsert="true" context="java" deleted="false" description="JMock2 Context field" enabled="true" name="jmcontext">${:import(org.jmock.Mockery,org.jmock.integration.junit4.JUnit4Mockery)}private Mockery context = new JUnit4Mockery();&#13;
-</template><template autoinsert="true" context="java" deleted="false" description="JMock2 Expectations" enabled="true" name="jmexpectations">${:import(org.jmock.Expectations)}context.checking(new Expectations() {{&#13;
-    ${cursor}&#13;
-}});</template><template autoinsert="true" context="java" deleted="false" description="JMock2 Mock Definition" enabled="true" name="jmmock">${MockClass} ${mockObject} = context.mock(${MockClass}.class);</template><template autoinsert="true" context="java" deleted="false" description="JMock2 Rule (Isis variant)" enabled="true" name="jmrule">${:import(org.junit.Rule,org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2,org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode)}@Rule&#13;
-public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(Mode.INTERFACES_AND_CLASSES${cursor});&#13;
-&#13;
-</template><template autoinsert="true" context="java" deleted="false" description="JMock2 RunWith" enabled="true" name="jmrunwith">${:import(org.junit.runner.RunWith,org.jmock.integration.junit4.JMock)}@RunWith(JMock.class)</template><template autoinsert="true" context="java" deleted="false" description="JMock2 Expectation Return Value" enabled="true" name="jmvalue">will(returnValue(${cursor}));</template></templates>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/isis-site/blob/ec1efb3c/content/resources/templates/junit4-templates-idea.xml
----------------------------------------------------------------------
diff --git a/content/resources/templates/junit4-templates-idea.xml b/content/resources/templates/junit4-templates-idea.xml
deleted file mode 100644
index 839de50..0000000
--- a/content/resources/templates/junit4-templates-idea.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<templateSet group="junit4-templates">
-  <template name="juafter" value="@org.junit.After&#10;public void tearDown() throws Exception {&#10;    $END$&#10;}" description="" toReformat="true" toShortenFQNames="true">
-    <context>
-      <option name="HTML" value="false" />
-      <option name="XML" value="false" />
-      <option name="JAVA_CODE" value="true" />
-      <option name="JAVA_COMMENT" value="false" />
-      <option name="JAVA_STRING" value="false" />
-      <option name="COMPLETION" value="false" />
-      <option name="JAVA_SCRIPT" value="false" />
-      <option name="OTHER" value="false" />
-    </context>
-  </template>
-  <template name="juassertThat" value="org.junit.Assert.assertThat($object$, $matcher$);" description="" toReformat="true" toShortenFQNames="true">
-    <variable name="object" expression="&quot;object&quot;" defaultValue="" alwaysStopAt="true" />
-    <variable name="matcher" expression="&quot;matcher&quot;" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="HTML" value="false" />
-      <option name="XML" value="false" />
-      <option name="JAVA_CODE" value="true" />
-      <option name="JAVA_COMMENT" value="false" />
-      <option name="JAVA_STRING" value="false" />
-      <option name="COMPLETION" value="false" />
-      <option name="JAVA_SCRIPT" value="false" />
-      <option name="OTHER" value="false" />
-    </context>
-  </template>
-  <template name="jubefore" value="@org.junit.Before&#10;public void setUp() throws Exception {&#10;    $END$&#10;}" description="" toReformat="true" toShortenFQNames="true">
-    <context>
-      <option name="HTML" value="false" />
-      <option name="XML" value="false" />
-      <option name="JAVA_CODE" value="true" />
-      <option name="JAVA_COMMENT" value="false" />
-      <option name="JAVA_STRING" value="false" />
-      <option name="COMPLETION" value="false" />
-      <option name="JAVA_SCRIPT" value="false" />
-      <option name="OTHER" value="false" />
-    </context>
-  </template>
-  <template name="jutest" value="@org.junit.Test&#10;public void $xxx$() throws Exception {&#10;    $END$&#10;}" description="" toReformat="true" toShortenFQNames="true">
-    <variable name="xxx" expression="&quot;xxx&quot;" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="HTML" value="false" />
-      <option name="XML" value="false" />
-      <option name="JAVA_CODE" value="true" />
-      <option name="JAVA_COMMENT" value="false" />
-      <option name="JAVA_STRING" value="false" />
-      <option name="COMPLETION" value="false" />
-      <option name="JAVA_SCRIPT" value="false" />
-      <option name="OTHER" value="false" />
-    </context>
-  </template>
-</templateSet>
-

http://git-wip-us.apache.org/repos/asf/isis-site/blob/ec1efb3c/content/resources/templates/junit4-templates.xml
----------------------------------------------------------------------
diff --git a/content/resources/templates/junit4-templates.xml b/content/resources/templates/junit4-templates.xml
deleted file mode 100644
index 6af90cb..0000000
--- a/content/resources/templates/junit4-templates.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><templates><template autoinsert="true" context="java" deleted="false" description="JUnit4 After Method" enabled="true" name="juafter">${:import(org.junit.After)}@After&#13;
-public void tearDown() throws Exception {&#13;
-	${cursor}&#13;
-}&#13;
-</template><template autoinsert="true" context="java" deleted="false" description="JUnit4 AssertThat" enabled="true" name="juassertThat">${:importStatic(org.junit.Assert.assertThat,'org.hamcrest.CoreMatchers.*')}assertThat(${object}, ${matcher});</template><template autoinsert="true" context="java" deleted="false" description="JUnit4 Before Method" enabled="true" name="jubefore">${:import(org.junit.Before)}@Before&#13;
-public void setUp() throws Exception {&#13;
-	${cursor}&#13;
-}&#13;
-</template><template autoinsert="true" context="java" deleted="false" description="JUnit4 Test Method" enabled="true" name="jutest">${:import(org.junit.Test)}@Test&#13;
-public void ${xxx}() throws Exception {&#13;
-	${cursor}&#13;
-}&#13;
-</template></templates>
\ No newline at end of file

[5/8] isis-site git commit: ISIS-1335: improving docs for setting up file/live templates for IntelliJ, some small fixes. Also updated the cheat sheet PDF/docx

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/ec1efb3c/content/guides/ugfun.pdf
----------------------------------------------------------------------
diff --git a/content/guides/ugfun.pdf b/content/guides/ugfun.pdf
index b27fea1..74dfd9d 100644
--- a/content/guides/ugfun.pdf
+++ b/content/guides/ugfun.pdf
@@ -4,16 +4,16 @@
 << /Title (Fundamentals)
 /Creator (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0)
 /Producer (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0)
-/CreationDate (D:20160404100819+01'00')
-/ModDate (D:20160404100819+01'00')
+/CreationDate (D:20160425191413+01'00')
+/ModDate (D:20160425191413+01'00')
 >>
 endobj
 2 0 obj
 << /Type /Catalog
 /Pages 3 0 R
 /Names 16 0 R
-/Outlines 1082 0 R
-/PageLabels 1127 0 R
+/Outlines 1084 0 R
+/PageLabels 1129 0 R
 /PageMode /UseOutlines
 /OpenAction [7 0 R /FitH 842.89]
 /ViewerPreferences << /DisplayDocTitle true
@@ -23,7 +23,7 @@ endobj
 3 0 obj
 << /Type /Pages
 /Count 113
-/Kids [7 0 R 10 0 R 12 0 R 14 0 R 40 0 R 49 0 R 52 0 R 55 0 R 58 0 R 76 0 R 86 0 R 90 0 R 99 0 R 110 0 R 115 0 R 124 0 R 129 0 R 140 0 R 148 0 R 162 0 R 178 0 R 185 0 R 190 0 R 196 0 R 201 0 R 207 0 R 220 0 R 242 0 R 268 0 R 280 0 R 288 0 R 291 0 R 303 0 R 306 0 R 318 0 R 326 0 R 334 0 R 341 0 R 347 0 R 353 0 R 360 0 R 366 0 R 373 0 R 378 0 R 384 0 R 400 0 R 404 0 R 407 0 R 415 0 R 423 0 R 430 0 R 433 0 R 442 0 R 450 0 R 455 0 R 460 0 R 471 0 R 475 0 R 481 0 R 489 0 R 505 0 R 531 0 R 539 0 R 554 0 R 559 0 R 564 0 R 574 0 R 579 0 R 582 0 R 584 0 R 591 0 R 601 0 R 608 0 R 625 0 R 639 0 R 644 0 R 659 0 R 694 0 R 725 0 R 753 0 R 760 0 R 774 0 R 777 0 R 790 0 R 797 0 R 802 0 R 807 0 R 823 0 R 836 0 R 840 0 R 845 0 R 849 0 R 852 0 R 859 0 R 862 0 R 866 0 R 874 0 R 889 0 R 892 0 R 895 0 R 906 0 R 911 0 R 915 0 R 920 0 R 931 0 R 936 0 R 946 0 R 948 0 R 959 0 R 962 0 R 972 0 R 978 0 R 980 0 R]
+/Kids [7 0 R 10 0 R 12 0 R 14 0 R 40 0 R 49 0 R 52 0 R 55 0 R 58 0 R 76 0 R 86 0 R 90 0 R 99 0 R 110 0 R 115 0 R 124 0 R 129 0 R 140 0 R 148 0 R 162 0 R 178 0 R 185 0 R 190 0 R 196 0 R 201 0 R 207 0 R 220 0 R 242 0 R 268 0 R 280 0 R 288 0 R 291 0 R 303 0 R 306 0 R 318 0 R 326 0 R 334 0 R 341 0 R 347 0 R 353 0 R 360 0 R 366 0 R 373 0 R 378 0 R 384 0 R 402 0 R 406 0 R 409 0 R 417 0 R 425 0 R 432 0 R 435 0 R 444 0 R 452 0 R 457 0 R 462 0 R 473 0 R 477 0 R 483 0 R 491 0 R 507 0 R 533 0 R 541 0 R 556 0 R 561 0 R 566 0 R 576 0 R 581 0 R 584 0 R 586 0 R 593 0 R 603 0 R 610 0 R 627 0 R 641 0 R 646 0 R 661 0 R 696 0 R 727 0 R 755 0 R 762 0 R 776 0 R 779 0 R 792 0 R 799 0 R 804 0 R 809 0 R 825 0 R 838 0 R 842 0 R 847 0 R 851 0 R 854 0 R 861 0 R 864 0 R 868 0 R 876 0 R 891 0 R 894 0 R 897 0 R 908 0 R 913 0 R 917 0 R 922 0 R 933 0 R 938 0 R 948 0 R 950 0 R 961 0 R 964 0 R 974 0 R 980 0 R 982 0 R]
 >>
 endobj
 4 0 obj
@@ -80,11 +80,11 @@ endobj
 << /Type /Font
 /BaseFont /AAAADA+NotoSerif
 /Subtype /TrueType
-/FontDescriptor 1129 0 R
+/FontDescriptor 1131 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 1131 0 R
-/ToUnicode 1130 0 R
+/Widths 1133 0 R
+/ToUnicode 1132 0 R
 >>
 endobj
 9 0 obj
@@ -1639,7 +1639,7 @@ endobj
 /F1.0 8 0 R
 >>
 >>
-/Annots [997 0 R 998 0 R 999 0 R 1000 0 R 1001 0 R 1002 0 R 1003 0 R 1004 0 R 1005 0 R 1006 0 R 1007 0 R 1008 0 R 1009 0 R 1010 0 R 1011 0 R 1012 0 R 1013 0 R 1014 0 R 1015 0 R 1016 0 R 1017 0 R 1018 0 R 1019 0 R 1020 0 R 1021 0 R 1022 0 R 1023 0 R 1024 0 R 1025 0 R 1026 0 R 1027 0 R 1028 0 R 1029 0 R 1030 0 R 1031 0 R 1032 0 R 1033 0 R 1034 0 R 1035 0 R 1036 0 R 1037 0 R 1038 0 R 1039 0 R 1040 0 R 1041 0 R 1042 0 R 1043 0 R 1044 0 R 1045 0 R 1046 0 R 1047 0 R 1048 0 R 1049 0 R 1050 0 R 1051 0 R 1052 0 R 1053 0 R 1054 0 R 1055 0 R 1056 0 R 1057 0 R 1058 0 R 1059 0 R 1060 0 R 1061 0 R 1062 0 R 1063 0 R 1064 0 R 1065 0 R 1066 0 R 1067 0 R 1068 0 R 1069 0 R 1070 0 R 1071 0 R 1072 0 R]
+/Annots [999 0 R 1000 0 R 1001 0 R 1002 0 R 1003 0 R 1004 0 R 1005 0 R 1006 0 R 1007 0 R 1008 0 R 1009 0 R 1010 0 R 1011 0 R 1012 0 R 1013 0 R 1014 0 R 1015 0 R 1016 0 R 1017 0 R 1018 0 R 1019 0 R 1020 0 R 1021 0 R 1022 0 R 1023 0 R 1024 0 R 1025 0 R 1026 0 R 1027 0 R 1028 0 R 1029 0 R 1030 0 R 1031 0 R 1032 0 R 1033 0 R 1034 0 R 1035 0 R 1036 0 R 1037 0 R 1038 0 R 1039 0 R 1040 0 R 1041 0 R 1042 0 R 1043 0 R 1044 0 R 1045 0 R 1046 0 R 1047 0 R 1048 0 R 1049 0 R 1050 0 R 1051 0 R 1052 0 R 1053 0 R 1054 0 R 1055 0 R 1056 0 R 1057 0 R 1058 0 R 1059 0 R 1060 0 R 1061 0 R 1062 0 R 1063 0 R 1064 0 R 1065 0 R 1066 0 R 1067 0 R 1068 0 R 1069 0 R 1070 0 R 1071 0 R 1072 0 R 1073 0 R 1074 0 R]
 >>
 endobj
 11 0 obj
@@ -1822,7 +1822,7 @@ endobj
 /Font << /F1.0 8 0 R
 >>
 >>
-/Annots [1073 0 R 1074 0 R 1075 0 R 1076 0 R 1077 0 R 1078 0 R 1079 0 R 1080 0 R]
+/Annots [1075 0 R 1076 0 R 1077 0 R 1078 0 R 1079 0 R 1080 0 R 1081 0 R 1082 0 R]
 >>
 endobj
 13 0 obj
@@ -2526,7 +2526,7 @@ endobj
 /Font << /F2.0 18 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
 /Annots [19 0 R 20 0 R 21 0 R 22 0 R 23 0 R 24 0 R 26 0 R 27 0 R 28 0 R 29 0 R 30 0 R 31 0 R 32 0 R 33 0 R 34 0 R 35 0 R 36 0 R 37 0 R 38 0 R]
@@ -2541,18 +2541,18 @@ endobj
 >>
 endobj
 17 0 obj
-<< /Kids [118 0 R 255 0 R 119 0 R 458 0 R 522 0 R 642 0 R 194 0 R 515 0 R 667 0 R 897 0 R 298 0 R 744 0 R 496 0 R 913 0 R 428 0 R 661 0 R]
+<< /Kids [118 0 R 255 0 R 119 0 R 460 0 R 524 0 R 644 0 R 194 0 R 517 0 R 669 0 R 899 0 R 298 0 R 746 0 R 498 0 R 915 0 R 430 0 R 663 0 R]
 >>
 endobj
 18 0 obj
 << /Type /Font
 /BaseFont /AAAADB+NotoSerif-Bold
 /Subtype /TrueType
-/FontDescriptor 1133 0 R
+/FontDescriptor 1135 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 1135 0 R
-/ToUnicode 1134 0 R
+/Widths 1137 0 R
+/ToUnicode 1136 0 R
 >>
 endobj
 19 0 obj
@@ -3429,7 +3429,7 @@ endobj
 /F3.1 42 0 R
 /F4.0 46 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
 /Annots [45 0 R]
@@ -3442,11 +3442,11 @@ endobj
 << /Type /Font
 /BaseFont /AAAADC+FontAwesome
 /Subtype /TrueType
-/FontDescriptor 1137 0 R
+/FontDescriptor 1139 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 1139 0 R
-/ToUnicode 1138 0 R
+/Widths 1141 0 R
+/ToUnicode 1140 0 R
 >>
 endobj
 43 0 obj
@@ -3470,11 +3470,11 @@ endobj
 << /Type /Font
 /BaseFont /AAAADD+NotoSerif-BoldItalic
 /Subtype /TrueType
-/FontDescriptor 1141 0 R
+/FontDescriptor 1143 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 1143 0 R
-/ToUnicode 1142 0 R
+/Widths 1145 0 R
+/ToUnicode 1144 0 R
 >>
 endobj
 47 0 obj
@@ -4197,7 +4197,7 @@ endobj
 /F4.0 46 0 R
 /F2.0 18 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
 >>
@@ -4206,11 +4206,11 @@ endobj
 << /Type /Font
 /BaseFont /AAAADE+NotoSerif-Italic
 /Subtype /TrueType
-/FontDescriptor 1145 0 R
+/FontDescriptor 1147 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 1147 0 R
-/ToUnicode 1146 0 R
+/Widths 1149 0 R
+/ToUnicode 1148 0 R
 >>
 endobj
 51 0 obj
@@ -5001,7 +5001,7 @@ endobj
 /F2.0 18 0 R
 /F5.0 50 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
 >>
@@ -5845,7 +5845,7 @@ endobj
 /F4.0 46 0 R
 /F5.0 50 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
 >>
@@ -6850,7 +6850,7 @@ endobj
 /F5.0 50 0 R
 /F6.0 71 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
 /Annots [59 0 R 60 0 R 61 0 R 62 0 R 63 0 R 64 0 R 65 0 R 66 0 R 67 0 R 68 0 R 72 0 R 73 0 R 74 0 R]
@@ -6973,22 +6973,22 @@ endobj
 << /Type /Font
 /BaseFont /AAAADF+NotoSerif
 /Subtype /TrueType
-/FontDescriptor 1149 0 R
+/FontDescriptor 1151 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 1151 0 R
-/ToUnicode 1150 0 R
+/Widths 1153 0 R
+/ToUnicode 1152 0 R
 >>
 endobj
 71 0 obj
 << /Type /Font
 /BaseFont /AAAADG+mplus1mn-regular
 /Subtype /TrueType
-/FontDescriptor 1153 0 R
+/FontDescriptor 1155 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 1155 0 R
-/ToUnicode 1154 0 R
+/Widths 1157 0 R
+/ToUnicode 1156 0 R
 >>
 endobj
 72 0 obj
@@ -7615,7 +7615,7 @@ endobj
 /F2.0 18 0 R
 /F4.0 46 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
 /Annots [77 0 R 78 0 R 80 0 R 82 0 R 83 0 R]
@@ -8539,7 +8539,7 @@ endobj
 /Contents 85 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /XObject << /I1 84 0 R
-/Stamp1 1081 0 R
+/Stamp1 1083 0 R
 >>
 /Font << /F5.0 50 0 R
 /F1.0 8 0 R
@@ -9385,7 +9385,7 @@ endobj
 /F5.0 50 0 R
 /F6.0 71 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
 /Annots [93 0 R 94 0 R 95 0 R 96 0 R 97 0 R]
@@ -10274,7 +10274,7 @@ endobj
 /F2.0 18 0 R
 /F5.0 50 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
 /Annots [100 0 R 101 0 R 102 0 R 103 0 R 104 0 R 105 0 R]
@@ -10990,7 +10990,7 @@ endobj
 /F2.0 18 0 R
 /F5.0 50 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
 /Annots [112 0 R]
@@ -11726,7 +11726,7 @@ endobj
 /F2.0 18 0 R
 /F5.0 50 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
 /Annots [121 0 R 122 0 R]
@@ -11745,7 +11745,7 @@ endobj
 endobj
 119 0 obj
 << /Limits [(_ugfun_core-concepts_principles) (_ugfun_getting-started_datanucleus-enhancer)]
-/Names [(_ugfun_core-concepts_principles) 117 0 R (_ugfun_core-concepts_principles_apache-isis-vs) 130 0 R (_ugfun_core-concepts_principles_apache-isis-vs_cqrs) 146 0 R (_ugfun_core-concepts_principles_apache-isis-vs_event-sourcing) 159 0 R (_ugfun_core-concepts_principles_apache-isis-vs_metawidget) 170 0 R (_ugfun_core-concepts_principles_apache-isis-vs_mvc-server-side-frameworks) 131 0 R (_ugfun_core-concepts_principles_isis-itself) 125 0 R (_ugfun_core-concepts_principles_your-apps) 120 0 R (_ugfun_faqs) 937 0 R (_ugfun_faqs_enabling-logging) 939 0 R (_ugfun_faqs_enhance-only) 952 0 R (_ugfun_faqs_how-run-fixtures-on-app-startup) 988 0 R (_ugfun_faqs_how-to-handle-void-and-null-results) 973 0 R (_ugfun_faqs_how-to-implement-a-spellchecker) 981 0 R (_ugfun_faqs_i18n-label-in-wicket-viewer) 963 0 R (_ugfun_faqs_per-user-themes) 953 0 R (_ugfun_faqs_restful-image-property) 949 0 R (_ugfun_faqs_subtype-entity-not-fully-populated) 943 0 R (_ugfun_getting-started) 292 0 R (_ugfun_getti
 ng-started_datanucleus-enhancer) 393 0 R]
+/Names [(_ugfun_core-concepts_principles) 117 0 R (_ugfun_core-concepts_principles_apache-isis-vs) 130 0 R (_ugfun_core-concepts_principles_apache-isis-vs_cqrs) 146 0 R (_ugfun_core-concepts_principles_apache-isis-vs_event-sourcing) 159 0 R (_ugfun_core-concepts_principles_apache-isis-vs_metawidget) 170 0 R (_ugfun_core-concepts_principles_apache-isis-vs_mvc-server-side-frameworks) 131 0 R (_ugfun_core-concepts_principles_isis-itself) 125 0 R (_ugfun_core-concepts_principles_your-apps) 120 0 R (_ugfun_faqs) 939 0 R (_ugfun_faqs_enabling-logging) 941 0 R (_ugfun_faqs_enhance-only) 954 0 R (_ugfun_faqs_how-run-fixtures-on-app-startup) 990 0 R (_ugfun_faqs_how-to-handle-void-and-null-results) 975 0 R (_ugfun_faqs_how-to-implement-a-spellchecker) 983 0 R (_ugfun_faqs_i18n-label-in-wicket-viewer) 965 0 R (_ugfun_faqs_per-user-themes) 955 0 R (_ugfun_faqs_restful-image-property) 951 0 R (_ugfun_faqs_subtype-entity-not-fully-populated) 945 0 R (_ugfun_getting-started) 292 0 R (_ugfun_getti
 ng-started_datanucleus-enhancer) 395 0 R]
 >>
 endobj
 120 0 obj
@@ -12440,7 +12440,7 @@ endobj
 /F3.1 42 0 R
 /F2.0 18 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
 >>
@@ -13381,7 +13381,7 @@ endobj
 /F2.0 18 0 R
 /F5.0 50 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
 /Annots [132 0 R 133 0 R 134 0 R 135 0 R 136 0 R 137 0 R 138 0 R]
@@ -14310,7 +14310,7 @@ endobj
 /F5.0 50 0 R
 /F6.0 71 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
 /Annots [141 0 R 142 0 R 143 0 R 144 0 R 145 0 R]
@@ -15486,7 +15486,7 @@ endobj
 /F2.0 18 0 R
 /F5.0 50 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
 /Annots [149 0 R 150 0 R 151 0 R 152 0 R 153 0 R 155 0 R 156 0 R 157 0 R 158 0 R 160 0 R]
@@ -15551,11 +15551,11 @@ endobj
 << /Type /Font
 /BaseFont /AAAADH+mplus-1p-regular
 /Subtype /TrueType
-/FontDescriptor 1157 0 R
+/FontDescriptor 1159 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 1159 0 R
-/ToUnicode 1158 0 R
+/Widths 1161 0 R
+/ToUnicode 1160 0 R
 >>
 endobj
 155 0 obj
@@ -16613,7 +16613,7 @@ endobj
 /F6.0 71 0 R
 /F2.0 18 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
 /Annots [163 0 R 164 0 R 165 0 R 166 0 R 167 0 R 168 0 R 169 0 R 171 0 R 172 0 R 173 0 R 176 0 R]
@@ -17819,7 +17819,7 @@ endobj
 /F2.0 18 0 R
 /F5.0 50 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
 /Annots [179 0 R 181 0 R 182 0 R 183 0 R]
@@ -18537,7 +18537,7 @@ endobj
 /F6.0 71 0 R
 >>
 /XObject << /I2 187 0 R
-/Stamp1 1081 0 R
+/Stamp1 1083 0 R
 >>
 >>
 /Annots [186 0 R 188 0 R]
@@ -19737,7 +19737,7 @@ endobj
 /F2.0 18 0 R
 /F7.0 154 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
 /Annots [191 0 R]
@@ -19762,7 +19762,7 @@ endobj
 endobj
 194 0 obj
 << /Limits [(auto-complete-for-action-param) (constructor-injection)]
-/Names [(auto-complete-for-action-param) 735 0 R (auto-complete-for-property) 716 0 R (auto-complete-repository-based) 747 0 R (best-of-both-worlds) 932 0 R (building-the-app) 308 0 R (choices-for-action-parameter) 727 0 R (choices-for-property) 712 0 R (class-object) 508 0 R (code-bigdecimal-code-s-precision) 439 0 R (code-bigdecimal-code-s-precision-2) 467 0 R (code-membergrouplayout-code) 779 0 R (code-memberorder-code) 767 0 R (code-meta-inf-persistence-xml-code) 408 0 R (code-string-code-s-length) 434 0 R (code-string-code-s-length-2) 466 0 R (collections) 198 0 R (collections-2) 514 0 R (collections-3) 847 0 R (constructor-injection) 476 0 R]
+/Names [(auto-complete-for-action-param) 737 0 R (auto-complete-for-property) 718 0 R (auto-complete-repository-based) 749 0 R (best-of-both-worlds) 934 0 R (building-the-app) 308 0 R (choices-for-action-parameter) 729 0 R (choices-for-property) 714 0 R (class-object) 510 0 R (code-bigdecimal-code-s-precision) 441 0 R (code-bigdecimal-code-s-precision-2) 469 0 R (code-membergrouplayout-code) 781 0 R (code-memberorder-code) 769 0 R (code-meta-inf-persistence-xml-code) 410 0 R (code-string-code-s-length) 436 0 R (code-string-code-s-length-2) 468 0 R (collections) 198 0 R (collections-2) 516 0 R (collections-3) 849 0 R (constructor-injection) 478 0 R]
 >>
 endobj
 195 0 obj
@@ -22040,7 +22040,7 @@ endobj
 /F2.0 18 0 R
 /F3.1 42 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
 >>
@@ -22049,11 +22049,11 @@ endobj
 << /Type /Font
 /BaseFont /AAAADI+mplus1mn-bold
 /Subtype /TrueType
-/FontDescriptor 1161 0 R
+/FontDescriptor 1163 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 1163 0 R
-/ToUnicode 1162 0 R
+/Widths 1165 0 R
+/ToUnicode 1164 0 R
 >>
 endobj
 198 0 obj
@@ -22877,7 +22877,7 @@ endobj
 /F2.0 18 0 R
 /F7.0 154 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
 /Annots [203 0 R]
@@ -23610,7 +23610,7 @@ endobj
 /F1.0 8 0 R
 /F3.1 42 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
 /Annots [208 0 R 209 0 R 211 0 R 212 0 R 214 0 R 216 0 R 218 0 R]
@@ -24593,7 +24593,7 @@ endobj
 /F2.0 18 0 R
 /F3.1 42 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
 /Annots [221 0 R 222 0 R 223 0 R 224 0 R 225 0 R 226 0 R 229 0 R 230 0 R 231 0 R 232 0 R 233 0 R 234 0 R 235 0 R 236 0 R 237 0 R 238 0 R 239 0 R 240 0 R]
@@ -25845,7 +25845,7 @@ endobj
 /F2.0 18 0 R
 /F3.1 42 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
 /Annots [243 0 R 244 0 R 245 0 R 246 0 R 247 0 R 248 0 R 249 0 R 250 0 R 251 0 R 252 0 R 253 0 R 256 0 R 257 0 R 258 0 R 259 0 R 260 0 R 261 0 R 262 0 R 263 0 R 264 0 R 265 0 R 266 0 R]
@@ -26804,7 +26804,7 @@ endobj
 /Font << /F1.0 8 0 R
 /F2.0 18 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
 /Annots [269 0 R 272 0 R 273 0 R 274 0 R 275 0 R 276 0 R 277 0 R]
@@ -27571,7 +27571,7 @@ endobj
 /F1.0 8 0 R
 /F6.0 71 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
 /Annots [282 0 R 284 0 R 285 0 R]
@@ -27710,7 +27710,7 @@ endobj
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
 /Annots [289 0 R]
@@ -28525,7 +28525,7 @@ endobj
 /F3.1 42 0 R
 /F6.0 71 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
 /Annots [293 0 R 294 0 R 295 0 R 296 0 R 299 0 R 300 0 R]
@@ -28574,7 +28574,7 @@ endobj
 endobj
 298 0 obj
 << /Limits [(for-action-parameters) (hide-a-property)]
-/Names [(for-action-parameters) 726 0 R (for-both-properties-and-action-parameters) 743 0 R (for-properties) 711 0 R (from-within-the-ide) 315 0 R (full-stack-but-extensible) 126 0 R (generating-the-app) 304 0 R (grids-vs-components) 825 0 R (handling-mandatory-properties-in-subtypes) 431 0 R (hide-a-collection) 654 0 R (hide-a-contributed-property-collection-or-action) 656 0 R (hide-a-property) 653 0 R]
+/Names [(for-action-parameters) 728 0 R (for-both-properties-and-action-parameters) 745 0 R (for-properties) 713 0 R (from-within-the-ide) 315 0 R (full-stack-but-extensible) 126 0 R (generating-the-app) 304 0 R (grids-vs-components) 827 0 R (handling-mandatory-properties-in-subtypes) 433 0 R (hide-a-collection) 656 0 R (hide-a-contributed-property-collection-or-action) 658 0 R (hide-a-property) 655 0 R]
 >>
 endobj
 299 0 obj
@@ -29948,7 +29948,7 @@ endobj
 /F6.0 71 0 R
 /F2.0 18 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
 >>
@@ -30811,7 +30811,7 @@ endobj
 /F6.0 71 0 R
 /F2.0 18 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
 /Annots [307 0 R 310 0 R 311 0 R 314 0 R 316 0 R]
@@ -31170,7 +31170,7 @@ endobj
 /F2.0 18 0 R
 >>
 /XObject << /I3 320 0 R
-/Stamp1 1081 0 R
+/Stamp1 1083 0 R
 >>
 >>
 /Annots [319 0 R 321 0 R 323 0 R]
@@ -31741,7 +31741,7 @@ endobj
 /Contents 325 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /XObject << /I4 324 0 R
-/Stamp1 1081 0 R
+/Stamp1 1083 0 R
 >>
 /Font << /F1.0 8 0 R
 /F6.0 71 0 R
@@ -32144,7 +32144,7 @@ endobj
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /XObject << /I5 332 0 R
 /I6 337 0 R
-/Stamp1 1081 0 R
+/Stamp1 1083 0 R
 >>
 /Font << /F1.0 8 0 R
 /F6.0 71 0 R
@@ -32494,7 +32494,7 @@ endobj
 >>
 /XObject << /I7 342 0 R
 /I8 344 0 R
-/Stamp1 1081 0 R
+/Stamp1 1083 0 R
 >>
 >>
 /Annots [343 0 R 345 0 R]
@@ -32847,7 +32847,7 @@ endobj
 >>
 /XObject << /I9 348 0 R
 /I10 350 0 R
-/Stamp1 1081 0 R
+/Stamp1 1083 0 R
 >>
 >>
 /Annots [349 0 R 351 0 R]
@@ -33214,7 +33214,7 @@ endobj
 >>
 /XObject << /I11 354 0 R
 /I12 356 0 R
-/Stamp1 1081 0 R
+/Stamp1 1083 0 R
 >>
 >>
 /Annots [355 0 R 357 0 R]
@@ -33792,7 +33792,7 @@ endobj
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /XObject << /I13 358 0 R
 /I14 362 0 R
-/Stamp1 1081 0 R
+/Stamp1 1083 0 R
 >>
 /Font << /F1.0 8 0 R
 >>
@@ -34225,7 +34225,7 @@ endobj
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /XObject << /I15 364 0 R
 /I16 368 0 R
-/Stamp1 1081 0 R
+/Stamp1 1083 0 R
 >>
 /Font << /F1.0 8 0 R
 >>
@@ -34737,7 +34737,7 @@ endobj
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /XObject << /I17 371 0 R
 /I18 375 0 R
-/Stamp1 1081 0 R
+/Stamp1 1083 0 R
 >>
 /Font << /F1.0 8 0 R
 /F3.1 42 0 R
@@ -35179,7 +35179,7 @@ endobj
 >>
 /XObject << /I19 379 0 R
 /I20 381 0 R
-/Stamp1 1081 0 R
+/Stamp1 1083 0 R
 >>
 >>
 /Annots [380 0 R 382 0 R]
@@ -35799,7 +35799,7 @@ endobj
 >>
 endobj
 383 0 obj
-<< /Length 20492
+<< /Length 20892
 >>
 stream
 q
@@ -35871,12 +35871,12 @@ ET
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
-0.898 Tw
+1.016 Tw
 
 BT
 48.24 706.106 Td
 /F1.0 10.5 Tf
-<496620796f75207573652045636c69707365206f7220496e74656c6c694a20494445412c20646f20616c736f20696e7374616c6c2074686520> Tj
+<496620796f752075736520496e74656c6c694a2049444541206f722045636c697073652c20646f20616c736f20696e7374616c6c2074686520> Tj
 ET
 
 
@@ -35886,12 +35886,12 @@ ET
 0.259 0.545 0.792 scn
 0.259 0.545 0.792 SCN
 
-0.898 Tw
+1.016 Tw
 
 BT
-318.4822222222222 706.106 Td
+319.7832058823529 706.106 Td
 /F1.0 10.5 Tf
-<4944452074656d706c61746573> Tj
+<6c6976652074656d706c617465732028666f7220496e74656c6c694a29> Tj
 ET
 
 
@@ -35901,25 +35901,51 @@ ET
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
-0.898 Tw
+1.016 Tw
 
 BT
-388.9948333333333 706.106 Td
+453.8393529411764 706.106 Td
 /F1.0 10.5 Tf
-<3b2074686573652077696c6c2068656c7020796f7520666f6c6c6f7720746865> Tj
+<202f20> Tj
 ET
 
 
 0.000 Tw
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+1.016 Tw
+
+BT
+464.33411764705875 706.106 Td
+/F1.0 10.5 Tf
+<656469746f722074656d706c61746573> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+48.24 690.326 Td
+/F1.0 10.5 Tf
+<28666f722045636c6970736529> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24 690.326 Td
+108.2055 690.326 Td
 /F1.0 10.5 Tf
-<4170616368652049736973206e616d696e6720636f6e76656e74696f6e732e> Tj
+<3b2074686573652077696c6c2068656c7020796f7520666f6c6c6f7720746865204170616368652049736973206e616d696e6720636f6e76656e74696f6e732e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -37076,10 +37102,10 @@ endobj
 /F3.1 42 0 R
 /F1.1 70 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
-/Annots [386 0 R 387 0 R 389 0 R 390 0 R 391 0 R 392 0 R 394 0 R 395 0 R 396 0 R 397 0 R 398 0 R]
+/Annots [386 0 R 387 0 R 388 0 R 389 0 R 391 0 R 392 0 R 393 0 R 394 0 R 396 0 R 397 0 R 398 0 R 399 0 R 400 0 R]
 >>
 endobj
 385 0 obj
@@ -37100,20 +37126,42 @@ endobj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
-/URI (dg.pdf#_dg_ide-templates)
+/URI (dg.pdf#_dg_ide_intellij_live-templates)
 >>
 /Subtype /Link
-/Rect [318.4822222222222 703.04 388.9948333333333 717.32]
+/Rect [319.7832058823529 703.04 453.8393529411764 717.32]
 /Type /Annot
 >>
 endobj
 388 0 obj
-[384 0 R /XYZ 0 674.5100000000001 null]
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (dg.pdf#_dg_ide_eclipse_editor-templates)
+>>
+/Subtype /Link
+/Rect [464.33411764705875 703.04 547.0399999999998 717.32]
+/Type /Annot
+>>
 endobj
 389 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
+/URI (dg.pdf#_dg_ide_eclipse_editor-templates)
+>>
+/Subtype /Link
+/Rect [48.24 687.26 108.2055 701.5400000000001]
+/Type /Annot
+>>
+endobj
+390 0 obj
+[384 0 R /XYZ 0 674.5100000000001 null]
+endobj
+391 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
 /URI (ugtst.pdf#_ugtst_integ-test-support)
 >>
 /Subtype /Link
@@ -37121,7 +37169,7 @@ endobj
 /Type /Annot
 >>
 endobj
-390 0 obj
+392 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -37132,7 +37180,7 @@ endobj
 /Type /Annot
 >>
 endobj
-391 0 obj
+393 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -37143,7 +37191,7 @@ endobj
 /Type /Annot
 >>
 endobj
-392 0 obj
+394 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -37154,10 +37202,10 @@ endobj
 /Type /Annot
 >>
 endobj
-393 0 obj
+395 0 obj
 [384 0 R /XYZ 0 291.97000000000025 null]
 endobj
-394 0 obj
+396 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -37168,7 +37216,7 @@ endobj
 /Type /Annot
 >>
 endobj
-395 0 obj
+397 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -37179,7 +37227,7 @@ endobj
 /Type /Annot
 >>
 endobj
-396 0 obj
+398 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -37190,7 +37238,7 @@ endobj
 /Type /Annot
 >>
 endobj
-397 0 obj
+399 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -37201,7 +37249,7 @@ endobj
 /Type /Annot
 >>
 endobj
-398 0 obj
+400 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -37212,7 +37260,7 @@ endobj
 /Type /Annot
 >>
 endobj
-399 0 obj
+401 0 obj
 << /Length 2371
 >>
 stream
@@ -37369,23 +37417,23 @@ Q
 
 endstream
 endobj
-400 0 obj
+402 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 399 0 R
+/Contents 401 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F6.0 71 0 R
 /F3.1 42 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
-/Annots [401 0 R 402 0 R]
+/Annots [403 0 R 404 0 R]
 >>
 endobj
-401 0 obj
+403 0 obj
 << /Border [0 0 0]
 /Dest (_ugfun_getting-started_simpleapp-archetype)
 /Subtype /Link
@@ -37393,7 +37441,7 @@ endobj
 /Type /Annot
 >>
 endobj
-402 0 obj
+404 0 obj
 << /Border [0 0 0]
 /Dest (_ugfun_getting-started_simpleapp-archetype)
 /Subtype /Link
@@ -37401,7 +37449,7 @@ endobj
 /Type /Annot
 >>
 endobj
-403 0 obj
+405 0 obj
 << /Length 23336
 >>
 stream
@@ -38937,23 +38985,23 @@ Q
 
 endstream
 endobj
-404 0 obj
+406 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 403 0 R
+/Contents 405 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F8.0 197 0 R
 /F6.0 71 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
-/Annots [405 0 R]
+/Annots [407 0 R]
 >>
 endobj
-405 0 obj
+407 0 obj
 << /Border [0 0 0]
 /Dest (_ugfun_getting-started_simpleapp-archetype)
 /Subtype /Link
@@ -38961,7 +39009,7 @@ endobj
 /Type /Annot
 >>
 endobj
-406 0 obj
+408 0 obj
 << /Length 11001
 >>
 stream
@@ -39645,40 +39693,40 @@ Q
 
 endstream
 endobj
-407 0 obj
+409 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 406 0 R
+/Contents 408 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F2.0 18 0 R
 /F6.0 71 0 R
 /F8.0 197 0 R
-/F6.1 409 0 R
+/F6.1 411 0 R
 /F3.1 42 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
-/Annots [410 0 R 411 0 R 412 0 R 413 0 R]
+/Annots [412 0 R 413 0 R 414 0 R 415 0 R]
 >>
 endobj
-408 0 obj
-[407 0 R /XYZ 0 778.86 null]
+410 0 obj
+[409 0 R /XYZ 0 778.86 null]
 endobj
-409 0 obj
+411 0 obj
 << /Type /Font
 /BaseFont /AAAADJ+mplus1mn-regular
 /Subtype /TrueType
-/FontDescriptor 1165 0 R
+/FontDescriptor 1167 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 1167 0 R
-/ToUnicode 1166 0 R
+/Widths 1169 0 R
+/ToUnicode 1168 0 R
 >>
 endobj
-410 0 obj
+412 0 obj
 << /Border [0 0 0]
 /Dest (_ugfun_getting-started_simpleapp-archetype)
 /Subtype /Link
@@ -39686,7 +39734,7 @@ endobj
 /Type /Annot
 >>
 endobj
-411 0 obj
+413 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -39697,7 +39745,7 @@ endobj
 /Type /Annot
 >>
 endobj
-412 0 obj
+414 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -39708,7 +39756,7 @@ endobj
 /Type /Annot
 >>
 endobj
-413 0 obj
+415 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -39719,7 +39767,7 @@ endobj
 /Type /Annot
 >>
 endobj
-414 0 obj
+416 0 obj
 << /Length 13119
 >>
 stream
@@ -40412,11 +40460,11 @@ Q
 
 endstream
 endobj
-415 0 obj
+417 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 414 0 R
+/Contents 416 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 18 0 R
 /F1.0 8 0 R
@@ -40425,19 +40473,19 @@ endobj
 /F6.0 71 0 R
 /F3.1 42 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
-/Annots [418 0 R 419 0 R 421 0 R]
+/Annots [420 0 R 421 0 R 423 0 R]
 >>
 endobj
-416 0 obj
-[415 0 R /XYZ 0 841.89 null]
+418 0 obj
+[417 0 R /XYZ 0 841.89 null]
 endobj
-417 0 obj
-[415 0 R /XYZ 0 721.6100000000001 null]
+419 0 obj
+[417 0 R /XYZ 0 721.6100000000001 null]
 endobj
-418 0 obj
+420 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -40448,7 +40496,7 @@ endobj
 /Type /Annot
 >>
 endobj
-419 0 obj
+421 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -40459,10 +40507,10 @@ endobj
 /Type /Annot
 >>
 endobj
-420 0 obj
-[415 0 R /XYZ 0 273.9300000000002 null]
+422 0 obj
+[417 0 R /XYZ 0 273.9300000000002 null]
 endobj
-421 0 obj
+423 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -40473,7 +40521,7 @@ endobj
 /Type /Annot
 >>
 endobj
-422 0 obj
+424 0 obj
 << /Length 29239
 >>
 stream
@@ -42371,11 +42419,11 @@ Q
 
 endstream
 endobj
-423 0 obj
+425 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 422 0 R
+/Contents 424 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 18 0 R
 /F3.1 42 0 R
@@ -42384,19 +42432,19 @@ endobj
 /F7.0 154 0 R
 /F8.0 197 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
-/Annots [426 0 R]
+/Annots [428 0 R]
 >>
 endobj
-424 0 obj
-[423 0 R /XYZ 0 841.89 null]
+426 0 obj
+[425 0 R /XYZ 0 841.89 null]
 endobj
-425 0 obj
-[423 0 R /XYZ 0 741.6300000000001 null]
+427 0 obj
+[425 0 R /XYZ 0 741.6300000000001 null]
 endobj
-426 0 obj
+428 0 obj
 << /Border [0 0 0]
 /Dest (_ugfun_how-tos_class-structure_properties-vs-parameters)
 /Subtype /Link
@@ -42404,15 +42452,15 @@ endobj
 /Type /Annot
 >>
 endobj
-427 0 obj
-[423 0 R /XYZ 0 616.6300000000002 null]
+429 0 obj
+[425 0 R /XYZ 0 616.6300000000002 null]
 endobj
-428 0 obj
+430 0 obj
 << /Limits [(properties) (ui-events)]
-/Names [(properties) 193 0 R (property) 511 0 R (prototyping) 592 0 R (realization-within-apache-isis) 92 0 R (registering-domain-services) 602 0 R (required-updates-to-the-dom-project-s-pom-xml) 882 0 R (required-updates-to-the-dom-project-s-pom-xml-2) 899 0 R (rows-full-width-cols-and-tabs) 841 0 R (running-the-app) 309 0 R (running-with-fixtures) 322 0 R (scoped-services) 594 0 R (screencast) 830 0 R (tertiary-menubar) 916 0 R (the-getid-method) 611 0 R (trigger-on-collection-change) 703 0 R (trigger-on-property-change) 696 0 R (ui-events) 215 0 R]
+/Names [(properties) 193 0 R (property) 513 0 R (prototyping) 594 0 R (realization-within-apache-isis) 92 0 R (registering-domain-services) 604 0 R (required-updates-to-the-dom-project-s-pom-xml) 884 0 R (required-updates-to-the-dom-project-s-pom-xml-2) 901 0 R (rows-full-width-cols-and-tabs) 843 0 R (running-the-app) 309 0 R (running-with-fixtures) 322 0 R (scoped-services) 596 0 R (screencast) 832 0 R (tertiary-menubar) 918 0 R (the-getid-method) 613 0 R (trigger-on-collection-change) 705 0 R (trigger-on-property-change) 698 0 R (ui-events) 215 0 R]
 >>
 endobj
-429 0 obj
+431 0 obj
 << /Length 25111
 >>
 stream
@@ -44032,11 +44080,11 @@ Q
 
 endstream
 endobj
-430 0 obj
+432 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 429 0 R
+/Contents 431 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 18 0 R
 /F1.0 8 0 R
@@ -44046,15 +44094,15 @@ endobj
 /F7.0 154 0 R
 /F1.1 70 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
 >>
 endobj
-431 0 obj
-[430 0 R /XYZ 0 841.89 null]
+433 0 obj
+[432 0 R /XYZ 0 841.89 null]
 endobj
-432 0 obj
+434 0 obj
 << /Length 30160
 >>
 stream
@@ -46109,11 +46157,11 @@ Q
 
 endstream
 endobj
-433 0 obj
+435 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 432 0 R
+/Contents 434 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F6.0 71 0 R
 /F8.0 197 0 R
@@ -46122,19 +46170,19 @@ endobj
 /F3.1 42 0 R
 /F5.0 50 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
-/Annots [436 0 R 437 0 R 438 0 R 440 0 R]
+/Annots [438 0 R 439 0 R 440 0 R 442 0 R]
 >>
 endobj
-434 0 obj
-[433 0 R /XYZ 0 626.19 null]
+436 0 obj
+[435 0 R /XYZ 0 626.19 null]
 endobj
-435 0 obj
-[433 0 R /XYZ 0 560.5300000000002 null]
+437 0 obj
+[435 0 R /XYZ 0 560.5300000000002 null]
 endobj
-436 0 obj
+438 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -46145,7 +46193,7 @@ endobj
 /Type /Annot
 >>
 endobj
-437 0 obj
+439 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -46156,7 +46204,7 @@ endobj
 /Type /Annot
 >>
 endobj
-438 0 obj
+440 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -46167,10 +46215,10 @@ endobj
 /Type /Annot
 >>
 endobj
-439 0 obj
-[433 0 R /XYZ 0 324.8500000000003 null]
+441 0 obj
+[435 0 R /XYZ 0 324.8500000000003 null]
 endobj
-440 0 obj
+442 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -46181,7 +46229,7 @@ endobj
 /Type /Annot
 >>
 endobj
-441 0 obj
+443 0 obj
 << /Length 20470
 >>
 stream
@@ -47580,24 +47628,24 @@ Q
 
 endstream
 endobj
-442 0 obj
+444 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 441 0 R
+/Contents 443 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F6.0 71 0 R
 /F8.0 197 0 R
 /F2.0 18 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
-/Annots [443 0 R 444 0 R 446 0 R 448 0 R]
+/Annots [445 0 R 446 0 R 448 0 R 450 0 R]
 >>
 endobj
-443 0 obj
+445 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -47608,7 +47656,7 @@ endobj
 /Type /Annot
 >>
 endobj
-444 0 obj
+446 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -47619,10 +47667,10 @@ endobj
 /Type /Annot
 >>
 endobj
-445 0 obj
-[442 0 R /XYZ 0 451.3000000000002 null]
+447 0 obj
+[444 0 R /XYZ 0 451.3000000000002 null]
 endobj
-446 0 obj
+448 0 obj
 << /Border [0 0 0]
 /Dest (_ugfun_how-tos_class-structure_properties_mapping-joda-dates)
 /Subtype /Link
@@ -47630,10 +47678,10 @@ endobj
 /Type /Annot
 >>
 endobj
-447 0 obj
-[442 0 R /XYZ 0 318.5200000000001 null]
+449 0 obj
+[444 0 R /XYZ 0 318.5200000000001 null]
 endobj
-448 0 obj
+450 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -47644,7 +47692,7 @@ endobj
 /Type /Annot
 >>
 endobj
-449 0 obj
+451 0 obj
 << /Length 49179
 >>
 stream
@@ -51215,11 +51263,11 @@ Q
 
 endstream
 endobj
-450 0 obj
+452 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 449 0 R
+/Contents 451 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F6.0 71 0 R
 /F8.0 197 0 R
@@ -51227,13 +51275,13 @@ endobj
 /F3.1 42 0 R
 /F2.0 18 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
-/Annots [451 0 R 452 0 R]
+/Annots [453 0 R 454 0 R]
 >>
 endobj
-451 0 obj
+453 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -51244,7 +51292,7 @@ endobj
 /Type /Annot
 >>
 endobj
-452 0 obj
+454 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -51255,10 +51303,10 @@ endobj
 /Type /Annot
 >>
 endobj
-453 0 obj
-[450 0 R /XYZ 0 97.00999999999993 null]
+455 0 obj
+[452 0 R /XYZ 0 97.00999999999993 null]
 endobj
-454 0 obj
+456 0 obj
 << /Length 36277
 >>
 stream
@@ -53887,11 +53935,11 @@ Q
 
 endstream
 endobj
-455 0 obj
+457 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 454 0 R
+/Contents 456 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F6.0 71 0 R
@@ -53899,23 +53947,23 @@ endobj
 /F3.1 42 0 R
 /F2.0 18 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
 >>
 endobj
-456 0 obj
-[455 0 R /XYZ 0 457.46 null]
+458 0 obj
+[457 0 R /XYZ 0 457.46 null]
 endobj
-457 0 obj
-[455 0 R /XYZ 0 159.98 null]
+459 0 obj
+[457 0 R /XYZ 0 159.98 null]
 endobj
-458 0 obj
+460 0 obj
 << /Limits [(_ugfun_getting-started_simpleapp-archetype) (_ugfun_how-tos_class-structure_properties)]
-/Names [(_ugfun_getting-started_simpleapp-archetype) 301 0 R (_ugfun_how-tos) 416 0 R (_ugfun_how-tos_bulk-actions) 749 0 R (_ugfun_how-tos_business-rules) 648 0 R (_ugfun_how-tos_class-structure) 417 0 R (_ugfun_how-tos_class-structure_action-parameters) 465 0 R (_ugfun_how-tos_class-structure_actions) 463 0 R (_ugfun_how-tos_class-structure_class-definition) 420 0 R (_ugfun_how-tos_class-structure_collections) 457 0 R (_ugfun_how-tos_class-structure_ignoring-methods) 478 0 R (_ugfun_how-tos_class-structure_inject-services) 469 0 R (_ugfun_how-tos_class-structure_properties) 424 0 R]
+/Names [(_ugfun_getting-started_simpleapp-archetype) 301 0 R (_ugfun_how-tos) 418 0 R (_ugfun_how-tos_bulk-actions) 751 0 R (_ugfun_how-tos_business-rules) 650 0 R (_ugfun_how-tos_class-structure) 419 0 R (_ugfun_how-tos_class-structure_action-parameters) 467 0 R (_ugfun_how-tos_class-structure_actions) 465 0 R (_ugfun_how-tos_class-structure_class-definition) 422 0 R (_ugfun_how-tos_class-structure_collections) 459 0 R (_ugfun_how-tos_class-structure_ignoring-methods) 480 0 R (_ugfun_how-tos_class-structure_inject-services) 471 0 R (_ugfun_how-tos_class-structure_properties) 426 0 R]
 >>
 endobj
-459 0 obj
+461 0 obj
 << /Length 12636
 >>
 stream
@@ -54676,24 +54724,24 @@ Q
 
 endstream
 endobj
-460 0 obj
+462 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 459 0 R
+/Contents 461 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F3.1 42 0 R
 /F1.0 8 0 R
 /F6.0 71 0 R
 /F2.0 18 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
-/Annots [461 0 R 462 0 R 464 0 R]
+/Annots [463 0 R 464 0 R 466 0 R]
 >>
 endobj
-461 0 obj
+463 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -54704,7 +54752,7 @@ endobj
 /Type /Annot
 >>
 endobj
-462 0 obj
+464 0 obj
 << /Border [0 0 0]
 /Dest (_ugfun_how-tos_simulating-collections-of-values)
 /Subtype /Link
@@ -54712,10 +54760,10 @@ endobj
 /Type /Annot
 >>
 endobj
-463 0 obj
-[460 0 R /XYZ 0 607.8700000000001 null]
+465 0 obj
+[462 0 R /XYZ 0 607.8700000000001 null]
 endobj
-464 0 obj
+466 0 obj
 << /Border [0 0 0]
 /Dest (_ugfun_how-tos_class-structure_ignoring-methods)
 /Subtype /Link
@@ -54723,22 +54771,22 @@ endobj
 /Type /Annot
 >>
 endobj
-465 0 obj
-[460 0 R /XYZ 0 427.91000000000025 null]
-endobj
-466 0 obj
-[460 0 R /XYZ 0 358.85000000000025 null]
-endobj
 467 0 obj
-[460 0 R /XYZ 0 293.19000000000017 null]
+[462 0 R /XYZ 0 427.91000000000025 null]
 endobj
 468 0 obj
-[460 0 R /XYZ 0 227.53000000000011 null]
+[462 0 R /XYZ 0 358.85000000000025 null]
 endobj
 469 0 obj
-[460 0 R /XYZ 0 161.8700000000001 null]
+[462 0 R /XYZ 0 293.19000000000017 null]
 endobj
 470 0 obj
+[462 0 R /XYZ 0 227.53000000000011 null]
+endobj
+471 0 obj
+[462 0 R /XYZ 0 161.8700000000001 null]
+endobj
+472 0 obj
 << /Length 26010
 >>
 stream
@@ -56442,11 +56490,11 @@ Q
 
 endstream
 endobj
-471 0 obj
+473 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 470 0 R
+/Contents 472 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F3.1 42 0 R
 /F1.0 8 0 R
@@ -56455,18 +56503,18 @@ endobj
 /F2.0 18 0 R
 /F8.0 197 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
 >>
 endobj
-472 0 obj
-[471 0 R /XYZ 0 694.99 null]
+474 0 obj
+[473 0 R /XYZ 0 694.99 null]
 endobj
-473 0 obj
-[471 0 R /XYZ 0 486.0700000000001 null]
+475 0 obj
+[473 0 R /XYZ 0 486.0700000000001 null]
 endobj
-474 0 obj
+476 0 obj
 << /Length 18711
 >>
 stream
@@ -57617,11 +57665,11 @@ Q
 
 endstream
 endobj
-475 0 obj
+477 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 474 0 R
+/Contents 476 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F2.0 18 0 R
@@ -57629,22 +57677,22 @@ endobj
 /F3.1 42 0 R
 /F6.0 71 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
-/Annots [479 0 R]
+/Annots [481 0 R]
 >>
 endobj
-476 0 obj
-[475 0 R /XYZ 0 778.86 null]
-endobj
-477 0 obj
-[475 0 R /XYZ 0 705.4200000000002 null]
-endobj
 478 0 obj
-[475 0 R /XYZ 0 238.72400000000036 null]
+[477 0 R /XYZ 0 778.86 null]
 endobj
 479 0 obj
+[477 0 R /XYZ 0 705.4200000000002 null]
+endobj
+480 0 obj
+[477 0 R /XYZ 0 238.72400000000036 null]
+endobj
+481 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -57655,7 +57703,7 @@ endobj
 /Type /Annot
 >>
 endobj
-480 0 obj
+482 0 obj
 << /Length 17814
 >>
 stream
@@ -58723,30 +58771,30 @@ Q
 
 endstream
 endobj
-481 0 obj
+483 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 480 0 R
+/Contents 482 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 18 0 R
 /F1.0 8 0 R
 /F6.0 71 0 R
 /F8.0 197 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
-/Annots [484 0 R 487 0 R]
+/Annots [486 0 R 489 0 R]
 >>
 endobj
-482 0 obj
-[481 0 R /XYZ 0 841.89 null]
+484 0 obj
+[483 0 R /XYZ 0 841.89 null]
 endobj
-483 0 obj
-[481 0 R /XYZ 0 711.27 null]
+485 0 obj
+[483 0 R /XYZ 0 711.27 null]
 endobj
-484 0 obj
+486 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -58757,13 +58805,13 @@ endobj
 /Type /Annot
 >>
 endobj
-485 0 obj
-[481 0 R /XYZ 0 499.97 null]
+487 0 obj
+[483 0 R /XYZ 0 499.97 null]
 endobj
-486 0 obj
-[481 0 R /XYZ 0 319.84999999999997 null]
+488 0 obj
+[483 0 R /XYZ 0 319.84999999999997 null]
 endobj
-487 0 obj
+489 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -58774,7 +58822,7 @@ endobj
 /Type /Annot
 >>
 endobj
-488 0 obj
+490 0 obj
 << /Length 25091
 >>
 stream
@@ -60481,11 +60529,11 @@ Q
 
 endstream
 endobj
-489 0 obj
+491 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 488 0 R
+/Contents 490 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F8.0 197 0 R
 /F6.0 71 0 R
@@ -60493,16 +60541,16 @@ endobj
 /F3.1 42 0 R
 /F2.0 18 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
-/Annots [491 0 R 493 0 R 494 0 R 497 0 R 498 0 R 499 0 R 500 0 R 501 0 R 502 0 R 503 0 R]
+/Annots [493 0 R 495 0 R 496 0 R 499 0 R 500 0 R 501 0 R 502 0 R 503 0 R 504 0 R 505 0 R]
 >>
 endobj
-490 0 obj
-[489 0 R /XYZ 0 379.81000000000006 null]
+492 0 obj
+[491 0 R /XYZ 0 379.81000000000006 null]
 endobj
-491 0 obj
+493 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -60513,10 +60561,10 @@ endobj
 /Type /Annot
 >>
 endobj
-492 0 obj
-[489 0 R /XYZ 0 316.19000000000005 null]
+494 0 obj
+[491 0 R /XYZ 0 316.19000000000005 null]
 endobj
-493 0 obj
+495 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -60527,7 +60575,7 @@ endobj
 /Type /Annot
 >>
 endobj
-494 0 obj
+496 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -60538,15 +60586,15 @@ endobj
 /Type /Annot
 >>
 endobj
-495 0 obj
-[489 0 R /XYZ 0 191.19 null]
+497 0 obj
+[491 0 R /XYZ 0 191.19 null]
 endobj
-496 0 obj
+498 0 obj
 << /Limits [(menu) (object-css-styling)]
-/Names [(menu) 580 0 R (method-injection) 473 0 R (migrating-from-earlier-versions) 863 0 R (model-driven-design) 53 0 R (model-must-be-understandable) 111 0 R (modifying-the-app) 385 0 R (more-advanced-features) 853 0 R (multiple-references-to-a-feature) 854 0 R (namespaces) 838 0 R (object-css-styling) 495 0 R]
+/Names [(menu) 582 0 R (method-injection) 475 0 R (migrating-from-earlier-versions) 865 0 R (model-driven-design) 53 0 R (model-must-be-understandable) 111 0 R (modifying-the-app) 385 0 R (more-advanced-features) 855 0 R (multiple-references-to-a-feature) 856 0 R (namespaces) 840 0 R (object-css-styling) 497 0 R]
 >>
 endobj
-497 0 obj
+499 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -60557,7 +60605,7 @@ endobj
 /Type /Annot
 >>
 endobj
-498 0 obj
+500 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -60568,7 +60616,7 @@ endobj
 /Type /Annot
 >>
 endobj
-499 0 obj
+501 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -60579,7 +60627,7 @@ endobj
 /Type /Annot
 >>
 endobj
-500 0 obj
+502 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -60590,7 +60638,7 @@ endobj
 /Type /Annot
 >>
 endobj
-501 0 obj
+503 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -60601,7 +60649,7 @@ endobj
 /Type /Annot
 >>
 endobj
-502 0 obj
+504 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -60612,7 +60660,7 @@ endobj
 /Type /Annot
 >>
 endobj
-503 0 obj
+505 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -60623,7 +60671,7 @@ endobj
 /Type /Annot
 >>
 endobj
-504 0 obj
+506 0 obj
 << /Length 14355
 >>
 stream
@@ -61505,11 +61553,11 @@ Q
 
 endstream
 endobj
-505 0 obj
+507 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 504 0 R
+/Contents 506 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 18 0 R
 /F3.1 42 0 R
@@ -61517,16 +61565,16 @@ endobj
 /F6.0 71 0 R
 /F7.0 154 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
-/Annots [507 0 R 509 0 R 510 0 R 512 0 R 513 0 R 516 0 R 517 0 R 519 0 R 520 0 R 523 0 R 524 0 R 525 0 R 526 0 R 528 0 R]
+/Annots [509 0 R 511 0 R 512 0 R 514 0 R 515 0 R 518 0 R 519 0 R 521 0 R 522 0 R 525 0 R 526 0 R 527 0 R 528 0 R 530 0 R]
 >>
 endobj
-506 0 obj
-[505 0 R /XYZ 0 841.89 null]
+508 0 obj
+[507 0 R /XYZ 0 841.89 null]
 endobj
-507 0 obj
+509 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -61537,10 +61585,10 @@ endobj
 /Type /Annot
 >>
 endobj
-508 0 obj
-[505 0 R /XYZ 0 705.8500000000001 null]
+510 0 obj
+[507 0 R /XYZ 0 705.8500000000001 null]
 endobj
-509 0 obj
+511 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -61551,7 +61599,7 @@ endobj
 /Type /Annot
 >>
 endobj
-510 0 obj
+512 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -61562,10 +61610,10 @@ endobj
 /Type /Annot
 >>
 endobj
-511 0 obj
-[505 0 R /XYZ 0 640.1900000000003 null]
+513 0 obj
+[507 0 R /XYZ 0 640.1900000000003 null]
 endobj
-512 0 obj
+514 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -61576,7 +61624,7 @@ endobj
 /Type /Annot
 >>
 endobj
-513 0 obj
+515 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -61587,15 +61635,15 @@ endobj
 /Type /Annot
 >>
 endobj
-514 0 obj
-[505 0 R /XYZ 0 574.5300000000004 null]
+516 0 obj
+[507 0 R /XYZ 0 574.5300000000004 null]
 endobj
-515 0 obj
+517 0 obj
 << /Limits [(contributed-action) (deploy-the-rest-api)]
-/Names [(contributed-action) 645 0 R (contributed-collection) 647 0 R (contributed-property) 646 0 R (contributions) 585 0 R (custom-css) 860 0 R (ddd-must-be-grounded) 108 0 R (ddd-takes-a-conscious-effort) 107 0 R (declarative) 671 0 R (declarative-style) 486 0 R (declarative-validation) 688 0 R (default-for-action-param) 739 0 R (default-for-property) 720 0 R (deleting-objects) 621 0 R (dependent-choices-for-action-params) 731 0 R (deploy-on-your-own-platform) 281 0 R (deploy-the-rest-api) 283 0 R]
+/Names [(contributed-action) 647 0 R (contributed-collection) 649 0 R (contributed-property) 648 0 R (contributions) 587 0 R (custom-css) 862 0 R (ddd-must-be-grounded) 108 0 R (ddd-takes-a-conscious-effort) 107 0 R (declarative) 673 0 R (declarative-style) 488 0 R (declarative-validation) 690 0 R (default-for-action-param) 741 0 R (default-for-property) 722 0 R (deleting-objects) 623 0 R (dependent-choices-for-action-params) 733 0 R (deploy-on-your-own-platform) 281 0 R (deploy-the-rest-api) 283 0 R]
 >>
 endobj
-516 0 obj
+518 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -61606,7 +61654,7 @@ endobj
 /Type /Annot
 >>
 endobj
-517 0 obj
+519 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -61617,10 +61665,10 @@ endobj
 /Type /Annot
 >>
 endobj
-518 0 obj
-[505 0 R /XYZ 0 508.8700000000006 null]
+520 0 obj
+[507 0 R /XYZ 0 508.8700000000006 null]
 endobj
-519 0 obj
+521 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -61631,7 +61679,7 @@ endobj
 /Type /Annot
 >>
 endobj
-520 0 obj
+522 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -61642,15 +61690,15 @@ endobj
 /Type /Annot
 >>
 endobj
-521 0 obj
-[505 0 R /XYZ 0 443.2100000000005 null]
+523 0 obj
+[507 0 R /XYZ 0 443.2100000000005 null]
 endobj
-522 0 obj
+524 0 obj
 << /Limits [(_ugfun_how-tos_class-structure_properties-vs-parameters) (_ugfun_how-tos_ui-hints_action-icons-and-css)]
-/Names [(_ugfun_how-tos_class-structure_properties-vs-parameters) 477 0 R (_ugfun_how-tos_class-structure_properties_mapping-joda-dates) 435 0 R (_ugfun_how-tos_contributed-members) 641 0 R (_ugfun_how-tos_crud) 613 0 R (_ugfun_how-tos_derived-members) 691 0 R (_ugfun_how-tos_domain-services) 568 0 R (_ugfun_how-tos_domain-services_organizing-services) 576 0 R (_ugfun_how-tos_drop-downs-and-defaults) 710 0 R (_ugfun_how-tos_entity-relationships) 623 0 R (_ugfun_how-tos_entity-relationships_managed-1-to-m-bidirectional-relationships) 627 0 R (_ugfun_how-tos_render-all-properties-in-tables) 757 0 R (_ugfun_how-tos_simulating-collections-of-values) 751 0 R (_ugfun_how-tos_ui-hints) 482 0 R (_ugfun_how-tos_ui-hints_action-icons-and-css) 532 0 R]
+/Names [(_ugfun_how-tos_class-structure_properties-vs-parameters) 479 0 R (_ugfun_how-tos_class-structure_properties_mapping-joda-dates) 437 0 R (_ugfun_how-tos_contributed-members) 643 0 R (_ugfun_how-tos_crud) 615 0 R (_ugfun_how-tos_derived-members) 693 0 R (_ugfun_how-tos_domain-services) 570 0 R (_ugfun_how-tos_domain-services_organizing-services) 578 0 R (_ugfun_how-tos_drop-downs-and-defaults) 712 0 R (_ugfun_how-tos_entity-relationships) 625 0 R (_ugfun_how-tos_entity-relationships_managed-1-to-m-bidirectional-relationships) 629 0 R (_ugfun_how-tos_render-all-properties-in-tables) 759 0 R (_ugfun_how-tos_simulating-collections-of-values) 753 0 R (_ugfun_how-tos_ui-hints) 484 0 R (_ugfun_how-tos_ui-hints_action-icons-and-css) 534 0 R]
 >>
 endobj
-523 0 obj
+525 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -61661,7 +61709,7 @@ endobj
 /Type /Annot
 >>
 endobj
-524 0 obj
+526 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -61672,7 +61720,7 @@ endobj
 /Type /Annot
 >>
 endobj
-525 0 obj
+527 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -61683,7 +61731,7 @@ endobj
 /Type /Annot
 >>
 endobj
-526 0 obj
+528 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -61694,10 +61742,10 @@ endobj
 /Type /Annot
 >>
 endobj
-527 0 obj
-[505 0 R /XYZ 0 294.4300000000004 null]
+529 0 obj
+[507 0 R /XYZ 0 294.4300000000004 null]
 endobj
-528 0 obj
+530 0 obj
 << /Border [0 0 0]
 /Dest (_ugfun_object-layout)
 /Subtype /Link
@@ -61705,10 +61753,10 @@ endobj
 /Type /Annot
 >>
 endobj
-529 0 obj
-[505 0 R /XYZ 0 233.37000000000037 null]
+531 0 obj
+[507 0 R /XYZ 0 233.37000000000037 null]
 endobj
-530 0 obj
+532 0 obj
 << /Length 24295
 >>
 stream
@@ -63350,11 +63398,11 @@ Q
 
 endstream
 endobj
-531 0 obj
+533 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 530 0 R
+/Contents 532 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F6.0 71 0 R
@@ -63362,16 +63410,16 @@ endobj
 /F3.1 42 0 R
 /F2.0 18 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
-/Annots [533 0 R 534 0 R 536 0 R 537 0 R]
+/Annots [535 0 R 536 0 R 538 0 R 539 0 R]
 >>
 endobj
-532 0 obj
-[531 0 R /XYZ 0 245.08000000000004 null]
+534 0 obj
+[533 0 R /XYZ 0 245.08000000000004 null]
 endobj
-533 0 obj
+535 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -63382,7 +63430,7 @@ endobj
 /Type /Annot
 >>
 endobj
-534 0 obj
+536 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -63393,10 +63441,10 @@ endobj
 /Type /Annot
 >>
 endobj
-535 0 obj
-[531 0 R /XYZ 0 124.68 null]
+537 0 obj
+[533 0 R /XYZ 0 124.68 null]
 endobj
-536 0 obj
+538 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -63407,7 +63455,7 @@ endobj
 /Type /Annot
 >>
 endobj
-537 0 obj
+539 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -63418,7 +63466,7 @@ endobj
 /Type /Annot
 >>
 endobj
-538 0 obj
+540 0 obj
 << /Length 20012
 >>
 stream
@@ -64642,11 +64690,11 @@ Q
 
 endstream
 endobj
-539 0 obj
+541 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 538 0 R
+/Contents 540 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F6.0 71 0 R
@@ -64654,13 +64702,13 @@ endobj
 /F8.0 197 0 R
 /F3.1 42 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
-/Annots [540 0 R 542 0 R 543 0 R 544 0 R 545 0 R 546 0 R 547 0 R 548 0 R 549 0 R 552 0 R]
+/Annots [542 0 R 544 0 R 545 0 R 546 0 R 547 0 R 548 0 R 549 0 R 550 0 R 551 0 R 554 0 R]
 >>
 endobj
-540 0 obj
+542 0 obj
 << /Border [0 0 0]
 /Dest (_ugfun_object-layout)
 /Subtype /Link
@@ -64668,10 +64716,10 @@ endobj
 /Type /Annot
 >>
 endobj
-541 0 obj
-[539 0 R /XYZ 0 778.86 null]
+543 0 obj
+[541 0 R /XYZ 0 778.86 null]
 endobj
-542 0 obj
+544 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -64682,7 +64730,7 @@ endobj
 /Type /Annot
 >>
 endobj
-543 0 obj
+545 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -64693,7 +64741,7 @@ endobj
 /Type /Annot
 >>
 endobj
-544 0 obj
+546 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -64704,7 +64752,7 @@ endobj
 /Type /Annot
 >>
 endobj
-545 0 obj
+547 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -64715,7 +64763,7 @@ endobj
 /Type /Annot
 >>
 endobj
-546 0 obj
+548 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -64726,7 +64774,7 @@ endobj
 /Type /Annot
 >>
 endobj
-547 0 obj
+549 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -64737,7 +64785,7 @@ endobj
 /Type /Annot
 >>
 endobj
-548 0 obj
+550 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -64748,7 +64796,7 @@ endobj
 /Type /Annot
 >>
 endobj
-549 0 obj
+551 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -64759,13 +64807,13 @@ endobj
 /Type /Annot
 >>
 endobj
-550 0 obj
-[539 0 R /XYZ 0 187.4000000000002 null]
+552 0 obj
+[541 0 R /XYZ 0 187.4000000000002 null]
 endobj
-551 0 obj
-[539 0 R /XYZ 0 110.56000000000017 null]
+553 0 obj
+[541 0 R /XYZ 0 110.56000000000017 null]
 endobj
-552 0 obj
+554 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -64776,7 +64824,7 @@ endobj
 /Type /Annot
 >>
 endobj
-553 0 obj
+555 0 obj
 << /Length 10436
 >>
 stream
@@ -65525,25 +65573,25 @@ Q
 
 endstream
 endobj
-554 0 obj
+556 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 553 0 R
+/Contents 555 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F6.0 71 0 R
 /F8.0 197 0 R
 /F1.0 8 0 R
 /F2.0 18 0 R
 >>
-/XObject << /I21 555 0 R
-/I22 557 0 R
-/Stamp1 1081 0 R
+/XObject << /I21 557 0 R
+/I22 559 0 R
+/Stamp1 1083 0 R
 >>
 >>
 >>
 endobj
-555 0 obj
+557 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 219
@@ -65609,10 +65657,10 @@ hm𶖛,
 �����y�֣�,�L�8�X�vxT֯��^k��r�Q\�7�^�K!�û�C�����[��zt`���*���;�8�m��{&C��xO�tS�PX��2J�d�[���.<�)�!.L�qaJ�@�SzB����j�
 endstream
 endobj
-556 0 obj
-[554 0 R /XYZ 0 420.46000000000004 null]
+558 0 obj
+[556 0 R /XYZ 0 420.46000000000004 null]
 endobj
-557 0 obj
+559 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 279
@@ -65663,7 +65711,7 @@ W
 Es�g�B!���eRgg[��B!�Q��,e��BQ ͢�'�����U���"�BH�#*^��{Q���r
 endstream
 endobj
-558 0 obj
+560 0 obj
 << /Length 15607
 >>
 stream
@@ -66734,27 +66782,27 @@ Q
 
 endstream
 endobj
-559 0 obj
+561 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 558 0 R
+/Contents 560 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F3.1 42 0 R
 /F1.0 8 0 R
 /F8.0 197 0 R
 /F6.0 71 0 R
-/F6.1 409 0 R
+/F6.1 411 0 R
 >>
-/XObject << /I23 561 0 R
-/I24 562 0 R
-/Stamp1 1081 0 R
+/XObject << /I23 563 0 R
+/I24 564 0 R
+/Stamp1 1083 0 R
 >>
 >>
-/Annots [560 0 R]
+/Annots [562 0 R]
 >>
 endobj
-560 0 obj
+562 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -66765,7 +66813,7 @@ endobj
 /Type /Annot
 >>
 endobj
-561 0 obj
+563 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 279
@@ -66816,7 +66864,7 @@ g	
 !�P��B~B�����8��?��@}}�b����;�U�؍q�\mt�"pE��8�e��H_߳X�Y�#���
~��(���~��(�R�~��(�R�~��(�R�~��(�R�~��(�R�~��(�R�~��(�R�~��(�R�~��(�R�~��(�R�~��(�R�~��(�R�~��(�R�~��(�R�~��(�R�~��(�R�D��|'(��(��r��&tvv�|?(��(���?a߾r:�EQ�@��ПPTT(�#�����(��(j�KD�z�"��a��z
 endstream
 endobj
-562 0 obj
+564 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 279
@@ -66876,7 +66924,7 @@ N[
 ��֘�EQEQ�P��mI.WG����(���Q(�I\J���(���V�Ik���)�h��z�(��(��~��A/�^���EQE)R?EQE)T��DQ
 endstream
 endobj
-563 0 obj
+565 0 obj
 << /Length 8266
 >>
 stream
@@ -67359,11 +67407,11 @@ Q
 
 endstream
 endobj
-564 0 obj
+566 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 563 0 R
+/Contents 565 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F6.0 71 0 R
@@ -67372,14 +67420,14 @@ endobj
 /F1.1 70 0 R
 /F5.0 50 0 R
 >>
-/XObject << /I25 571 0 R
-/Stamp1 1081 0 R
+/XObject << /I25 573 0 R
+/Stamp1 1083 0 R
 >>
 >>
-/Annots [565 0 R 566 0 R 567 0 R 569 0 R 570 0 R 572 0 R]
+/Annots [567 0 R 568 0 R 569 0 R 571 0 R 572 0 R 574 0 R]
 >>
 endobj
-565 0 obj
+567 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -67390,7 +67438,7 @@ endobj
 /Type /Annot
 >>
 endobj
-566 0 obj
+568 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -67401,7 +67449,7 @@ endobj
 /Type /Annot
 >>
 endobj
-567 0 obj
+569 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -67412,10 +67460,10 @@ endobj
 /Type /Annot
 >>
 endobj
-568 0 obj
-[564 0 R /XYZ 0 762.33 null]
+570 0 obj
+[566 0 R /XYZ 0 762.33 null]
 endobj
-569 0 obj
+571 0 obj
 << /Border [0 0 0]
 /Dest (_ugfun_core-concepts_philosophy_hexagonal-architecture)
 /Subtype /Link
@@ -67423,7 +67471,7 @@ endobj
 /Type /Annot
 >>
 endobj
-570 0 obj
+572 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -67434,7 +67482,7 @@ endobj
 /Type /Annot
 >>
 endobj
-571 0 obj
+573 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 660
@@ -67870,7 +67918,7 @@ o
 5Ȍa]T���T�	�0Hq~I�_t�eB�E�����A�ݠ5�A�`�Ш��K>	j��.P[g�uQ���0H����/��2�ݢP�J@� ʺ�ڠ#n�@���:��h��滭3�6���I����E7]f ���Q�����(Xt���Q]K���2Ȍz��mN.wV�������E7]f ���W�-B�ދ#�.]mШ��Z�<no�B2��J������	)�/)��n��@h7'�ĂAYE�ιc�n��sƢ��F�#0�.�%�~�M���bWg����W��?��犫����O��ݳo�>���S��~I�_t�eB�3��E��ںՃ{_[Z�sf�k�Bq�}��*r������)��Z��� ���4�E7]f �;ʇ���F�*^��]���>e�}Jˠ�T~Myŀ���a#*�i<�@�_R��t���nK(O�u}��Q��̓�
�+����ֱdǾg�AJ�� ���t�E7]f �{ʟ�y�Q��FW�Ŭ���e�0� ՂG`H]�K����.3�
	�[�I(vi�e���
 ��\*Ji�Y�<I��U���g�M��V� � �b�n��@h��!� ����.3�c� � (F������ � �Q��2��7� � �b�n��@h��!� ����.3�c� � (F������ � �Q��2��7� � �b�n��@h��!� ����.3�c� � (F������ � �Q��2��7� � �b�n��@h��!� ����.3�c� � (F������ � �Q���@ �@ �@ �@ �@ �@ �@ �@ �@ �@ �@ �@ �@ �@ �@ �@ �@ �\��l��
 endstream
 endobj
-572 0 obj
+574 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -67881,7 +67929,7 @@ endobj
 /Type /Annot
 >>
 endobj
-573 0 obj
+575 0 obj
 << /Length 9584
 >>
 stream
@@ -68436,24 +68484,24 @@ Q
 
 endstream
 endobj
-574 0 obj
+576 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 573 0 R
+/Contents 575 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F2.0 18 0 R
 /F6.0 71 0 R
 /F7.0 154 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
-/Annots [575 0 R]
+/Annots [577 0 R]
 >>
 endobj
-575 0 obj
+577 0 obj
 << /Border [0 0 0]
 /Dest (rgsvc.adoc)
 /Subtype /Link
@@ -68461,13 +68509,13 @@ endobj
 /Type /Annot
 >>
 endobj
-576 0 obj
-[574 0 R /XYZ 0 735.3000000000001 null]
+578 0 obj
+[576 0 R /XYZ 0 735.3000000000001 null]
 endobj
-577 0 obj
-[574 0 R /XYZ 0 430.88000000000034 null]
+579 0 obj
+[576 0 R /XYZ 0 430.88000000000034 null]
 endobj
-578 0 obj
+580 0 obj
 << /Length 20429
 >>
 stream
@@ -69863,27 +69911,27 @@ Q
 
 endstream
 endobj
-579 0 obj
+581 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 578 0 R
+/Contents 580 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F6.0 71 0 R
-/F6.1 409 0 R
+/F6.1 411 0 R
 /F8.0 197 0 R
 /F1.0 8 0 R
 /F2.0 18 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
 >>
 endobj
-580 0 obj
-[579 0 R /XYZ 0 426.48999999999995 null]
+582 0 obj
+[581 0 R /XYZ 0 426.48999999999995 null]
 endobj
-581 0 obj
+583 0 obj
 << /Length 33584
 >>
 stream
@@ -72272,23 +72320,23 @@ Q
 
 endstream
 endobj
-582 0 obj
+584 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 581 0 R
+/Contents 583 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F6.0 71 0 R
-/F6.1 409 0 R
+/F6.1 411 0 R
 /F8.0 197 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
 >>
 endobj
-583 0 obj
+585 0 obj
 << /Length 24255
 >>
 stream
@@ -73851,29 +73899,29 @@ Q
 
 endstream
 endobj
-584 0 obj
+586 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 583 0 R
+/Contents 585 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F3.1 42 0 R
 /F1.0 8 0 R
 /F6.0 71 0 R
 /F2.0 18 0 R
-/F6.1 409 0 R
+/F6.1 411 0 R
 /F8.0 197 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
-/Annots [586 0 R 587 0 R 588 0 R]
+/Annots [588 0 R 589 0 R 590 0 R]
 >>
 endobj
-585 0 obj
-[584 0 R /XYZ 0 706.99 null]
+587 0 obj
+[586 0 R /XYZ 0 706.99 null]
 endobj
-586 0 obj
+588 0 obj
 << /Border [0 0 0]
 /Dest (_ugfun_how-tos_contributed-members)
 /Subtype /Link
@@ -73881,7 +73929,7 @@ endobj
 /Type /Annot
 >>
 endobj
-587 0 obj
+589 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -73892,7 +73940,7 @@ endobj
 /Type /Annot
 >>
 endobj
-588 0 obj
+590 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -73903,10 +73951,10 @@ endobj
 /Type /Annot
 >>
 endobj
-589 0 obj
-[584 0 R /XYZ 0 197.5500000000002 null]
+591 0 obj
+[586 0 R /XYZ 0 197.5500000000002 null]
 endobj
-590 0 obj
+592 0 obj
 << /Length 24918
 >>
 stream
@@ -75575,29 +75623,29 @@ Q
 
 endstream
 endobj
-591 0 obj
+593 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 590 0 R
+/Contents 592 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F6.0 71 0 R
-/F6.1 409 0 R
+/F6.1 411 0 R
 /F8.0 197 0 R
 /F1.0 8 0 R
 /F2.0 18 0 R
 /F5.0 50 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
-/Annots [593 0 R 595 0 R 596 0 R 597 0 R 598 0 R 599 0 R]
+/Annots [595 0 R 597 0 R 598 0 R 599 0 R 600 0 R 601 0 R]
 >>
 endobj
-592 0 obj
-[591 0 R /XYZ 0 514.27 null]
+594 0 obj
+[593 0 R /XYZ 0 514.27 null]
 endobj
-593 0 obj
+595 0 obj
 << /Border [0 0 0]
 /Dest (_ugfun_how-tos_domain-services_organizing-services)
 /Subtype /Link
@@ -75605,10 +75653,10 @@ endobj
 /Type /Annot
 >>
 endobj
-594 0 obj
-[591 0 R /XYZ 0 350.30999999999995 null]
+596 0 obj
+[593 0 R /XYZ 0 350.30999999999995 null]
 endobj
-595 0 obj
+597 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -75619,7 +75667,7 @@ endobj
 /Type /Annot
 >>
 endobj
-596 0 obj
+598 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -75630,7 +75678,7 @@ endobj
 /Type /Annot
 >>
 endobj
-597 0 obj
+599 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -75641,7 +75689,7 @@ endobj
 /Type /Annot
 >>
 endobj
-598 0 obj
+600 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -75652,7 +75700,7 @@ endobj
 /Type /Annot
 >>
 endobj
-599 0 obj
+601 0 obj
 << /Border [0 0 0]
 /Dest (rgsvc.adoc)
 /Subtype /Link
@@ -75660,7 +75708,7 @@ endobj
 /Type /Annot
 >>
 endobj
-600 0 obj
+602 0 obj
 << /Length 19287
 >>
 stream
@@ -76834,27 +76882,27 @@ Q
 
 endstream
 endobj
-601 0 obj
+603 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 600 0 R
+/Contents 602 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 18 0 R
 /F1.0 8 0 R
 /F6.0 71 0 R
 /F8.0 197 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
-/Annots [603 0 R 604 0 R 605 0 R]
+/Annots [605 0 R 606 0 R 607 0 R]
 >>
 endobj
-602 0 obj
-[601 0 R /XYZ 0 841.89 null]
+604 0 obj
+[603 0 R /XYZ 0 841.89 null]
 endobj
-603 0 obj
+605 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -76865,7 +76913,7 @@ endobj
 /Type /Annot
 >>
 endobj
-604 0 obj
+606 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -76876,7 +76924,7 @@ endobj
 /Type /Annot
 >>
 endobj
-605 0 obj
+607 0 obj
 << /Border [0 0 0]
 /Dest (rgsvc.adoc)
 /Subtype /Link
@@ -76884,10 +76932,10 @@ endobj
 /Type /Annot
 >>
 endobj
-606 0 obj
-[601 0 R /XYZ 0 107.91000000000014 null]
+608 0 obj
+[603 0 R /XYZ 0 107.91000000000014 null]
 endobj
-607 0 obj
+609 0 obj
 << /Length 11872
 >>
 stream
@@ -77623,11 +77671,11 @@ Q
 
 endstream
 endobj
-608 0 obj
+610 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 607 0 R
+/Contents 609 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F5.0 50 0 R
@@ -77635,13 +77683,13 @@ endobj
 /F2.0 18 0 R
 /F3.1 42 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
-/Annots [609 0 R 610 0 R 612 0 R 615 0 R 616 0 R 618 0 R 620 0 R 622 0 R]
+/Annots [611 0 R 612 0 R 614 0 R 617 0 R 618 0 R 620 0 R 622 0 R 624 0 R]
 >>
 endobj
-609 0 obj
+611 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -77652,7 +77700,7 @@ endobj
 /Type /Annot
 >>
 endobj
-610 0 obj
+612 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -77663,10 +77711,10 @@ endobj
 /Type /Annot
 >>
 endobj
-611 0 obj
-[608 0 R /XYZ 0 592.6200000000002 null]
+613 0 obj
+[610 0 R /XYZ 0 592.6200000000002 null]
 endobj
-612 0 obj
+614 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -77677,13 +77725,13 @@ endobj
 /Type /Annot
 >>
 endobj
-613 0 obj
-[608 0 R /XYZ 0 515.7800000000004 null]
+615 0 obj
+[610 0 R /XYZ 0 515.7800000000004 null]
 endobj
-614 0 obj
-[608 0 R /XYZ 0 439.9200000000004 null]
+616 0 obj
+[610 0 R /XYZ 0 439.9200000000004 null]
 endobj
-615 0 obj
+617 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -77694,7 +77742,7 @@ endobj
 /Type /Annot
 >>
 endobj
-616 0 obj
+618 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -77705,10 +77753,10 @@ endobj
 /Type /Annot
 >>
 endobj
-617 0 obj
-[608 0 R /XYZ 0 370.86000000000035 null]
+619 0 obj
+[610 0 R /XYZ 0 370.86000000000035 null]
 endobj
-618 0 obj
+620 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -77719,10 +77767,10 @@ endobj
 /Type /Annot
 >>
 endobj
-619 0 obj
-[608 0 R /XYZ 0 301.8000000000003 null]
+621 0 obj
+[610 0 R /XYZ 0 301.8000000000003 null]
 endobj
-620 0 obj
+622 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -77733,10 +77781,10 @@ endobj
 /Type /Annot
 >>
 endobj
-621 0 obj
-[608 0 R /XYZ 0 236.14000000000024 null]
+623 0 obj
+[610 0 R /XYZ 0 236.14000000000024 null]
 endobj
-622 0 obj
+624 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -77747,10 +77795,10 @@ endobj
 /Type /Annot
 >>
 endobj
-623 0 obj
-[608 0 R /XYZ 0 167.0800000000002 null]
+625 0 obj
+[610 0 R /XYZ 0 167.0800000000002 null]
 endobj
-624 0 obj
+626 0 obj
 << /Length 32147
 >>
 stream
@@ -79883,11 +79931,11 @@ Q
 
 endstream
 endobj
-625 0 obj
+627 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 624 0 R
+/Contents 626 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 18 0 R
 /F3.1 42 0 R
@@ -79895,21 +79943,21 @@ endobj
 /F6.0 71 0 R
 /F7.0 154 0 R
 /F8.0 197 0 R
-/F6.1 409 0 R
+/F6.1 411 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
-/Annots [628 0 R 629 0 R 630 0 R 631 0 R 632 0 R 633 0 R 634 0 R 635 0 R 636 0 R 637 0 R]
+/Annots [630 0 R 631 0 R 632 0 R 633 0 R 634 0 R 635 0 R 636 0 R 637 0 R 638 0 R 639 0 R]
 >>
 endobj
-626 0 obj
-[625 0 R /XYZ 0 841.89 null]
+628 0 obj
+[627 0 R /XYZ 0 841.89 null]
 endobj
-627 0 obj
-[625 0 R /XYZ 0 741.6300000000001 null]
+629 0 obj
+[627 0 R /XYZ 0 741.6300000000001 null]
 endobj
-628 0 obj
+630 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -79920,7 +79968,7 @@ endobj
 /Type /Annot
 >>
 endobj
-629 0 obj
+631 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -79931,7 +79979,7 @@ endobj
 /Type /Annot
 >>
 endobj
-630 0 obj
+632 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -79942,7 +79990,7 @@ endobj
 /Type /Annot
 >>
 endobj
-631 0 obj
+633 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -79953,7 +80001,7 @@ endobj
 /Type /Annot
 >>
 endobj
-632 0 obj
+634 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -79964,7 +80012,7 @@ endobj
 /Type /Annot
 >>
 endobj
-633 0 obj
+635 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -79975,7 +80023,7 @@ endobj
 /Type /Annot
 >>
 endobj
-634 0 obj
+636 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -79986,7 +80034,7 @@ endobj
 /Type /Annot
 >>
 endobj
-635 0 obj
+637 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -79997,7 +80045,7 @@ endobj
 /Type /Annot
 >>
 endobj
-636 0 obj
+638 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -80008,7 +80056,7 @@ endobj
 /Type /Annot
 >>
 endobj
-637 0 obj
+639 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -80019,7 +80067,7 @@ endobj
 /Type /Annot
 >>
 endobj
-638 0 obj
+640 0 obj
 << /Length 20169
 >>
 stream
@@ -81274,11 +81322,11 @@ Q
 
 endstream
 endobj
-639 0 obj
+641 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 638 0 R
+/Contents 640 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F3.1 42 0 R
 /F1.0 8 0 R
@@ -81287,13 +81335,13 @@ endobj
 /F8.0 197 0 R
 /F7.0 154 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
-/Annots [640 0 R]
+/Annots [642 0 R]
 >>
 endobj
-640 0 obj
+642 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -81304,15 +81352,15 @@ endobj
 /Type /Annot
 >>
 endobj
-641 0 obj
-[639 0 R /XYZ 0 615.87 null]
+643 0 obj
+[641 0 R /XYZ 0 615.87 null]
 endobj
-642 0 obj
+644 0 obj
 << /Limits [(_ugfun_how-tos_ui-hints_eager-rendering) (architecture-must-be-robust)]
-/Names [(_ugfun_how-tos_ui-hints_eager-rendering) 529 0 R (_ugfun_how-tos_ui-hints_layout) 527 0 R (_ugfun_how-tos_ui-hints_names-and-descriptions) 506 0 R (_ugfun_how-tos_ui-hints_object-titles-and-icons) 483 0 R (_ugfun_how-tos_ui_are-you-sure) 550 0 R (_ugfun_object-layout) 761 0 R (_ugfun_object-layout_application-menu) 901 0 R (_ugfun_object-layout_dynamic) 884 0 R (_ugfun_object-layout_dynamic_xml) 817 0 R (_ugfun_object-layout_dynamic_xml-unreferenced) 850 0 R (_ugfun_object-layout_static) 763 0 R (_ugfun_object-layout_static-vs-dynamic) 926 0 R (action-parameters) 521 0 R (actions) 199 0 R (actions-2) 518 0 R (all-members-hidden) 657 0 R (all-members-unmodifiable-disabling-the-edit-button) 670 0 R (aop-concepts) 91 0 R (app-structure) 388 0 R (architecture-must-be-robust) 113 0 R]
+/Names [(_ugfun_how-tos_ui-hints_eager-rendering) 531 0 R (_ugfun_how-tos_ui-hints_layout) 529 0 R (_ugfun_how-tos_ui-hints_names-and-descriptions) 508 0 R (_ugfun_how-tos_ui-hints_object-titles-and-icons) 485 0 R (_ugfun_how-tos_ui_are-you-sure) 552 0 R (_ugfun_object-layout) 763 0 R (_ugfun_object-layout_application-menu) 903 0 R (_ugfun_object-layout_dynamic) 886 0 R (_ugfun_object-layout_dynamic_xml) 819 0 R (_ugfun_object-layout_dynamic_xml-unreferenced) 852 0 R (_ugfun_object-layout_static) 765 0 R (_ugfun_object-layout_static-vs-dynamic) 928 0 R (action-parameters) 523 0 R (actions) 199 0 R (actions-2) 520 0 R (all-members-hidden) 659 0 R (all-members-unmodifiable-disabling-the-edit-button) 672 0 R (aop-concepts) 91 0 R (app-structure) 390 0 R (architecture-must-be-robust) 113 0 R]
 >>
 endobj
-643 0 obj
+645 0 obj
 << /Length 12103
 >>
 stream
@@ -82100,11 +82148,11 @@ Q
 
 endstream
 endobj
-644 0 obj
+646 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 643 0 R
+/Contents 645 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F8.0 197 0 R
 /F6.0 71 0 R
@@ -82113,28 +82161,28 @@ endobj
 /F3.1 42 0 R
 /F7.0 154 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
-/Annots [650 0 R 651 0 R 652 0 R]
+/Annots [652 0 R 653 0 R 654 0 R]
 >>
 endobj
-645 0 obj
-[644 0 R /XYZ 0 594.2499999999999 null]
-endobj
-646 0 obj
-[644 0 R /XYZ 0 525.19 null]
-endobj
 647 0 obj
-[644 0 R /XYZ 0 456.1300000000001 null]
+[646 0 R /XYZ 0 594.2499999999999 null]
 endobj
 648 0 obj
-[644 0 R /XYZ 0 387.07000000000005 null]
+[646 0 R /XYZ 0 525.19 null]
 endobj
 649 0 obj
-[644 0 R /XYZ 0 311.21000000000004 null]
+[646 0 R /XYZ 0 456.1300000000001 null]
 endobj
 650 0 obj
+[646 0 R /XYZ 0 387.07000000000005 null]
+endobj
+651 0 obj
+[646 0 R /XYZ 0 311.21000000000004 null]
+endobj
+652 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -82145,7 +82193,7 @@ endobj
 /Type /Annot
 >>
 endobj
-651 0 obj
+653 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -82156,7 +82204,7 @@ endobj
 /Type /Annot
 >>
 endobj
-652 0 obj
+654 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -82167,22 +82215,22 @@ endobj
 /Type /Annot
 >>
 endobj
-653 0 obj
-[644 0 R /XYZ 0 242.14999999999998 null]
-endobj
-654 0 obj
-[644 0 R /XYZ 0 212.26999999999995 null]
-endobj
 655 0 obj
-[644 0 R /XYZ 0 182.38999999999993 null]
+[646 0 R /XYZ 0 242.14999999999998 null]
 endobj
 656 0 obj
-[644 0 R /XYZ 0 152.5099999999999 null]
+[646 0 R /XYZ 0 212.26999999999995 null]
 endobj
 657 0 obj
-[644 0 R /XYZ 0 122.6299999999999 null]
+[646 0 R /XYZ 0 182.38999999999993 null]
 endobj
 658 0 obj
+[646 0 R /XYZ 0 152.5099999999999 null]
+endobj
+659 0 obj
+[646 0 R /XYZ 0 122.6299999999999 null]
+endobj
+660 0 obj
 << /Length 10549
 >>
 stream
@@ -82818,11 +82866,11 @@ Q
 
 endstream
 endobj
-659 0 obj
+661 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 658 0 R
+/Contents 660 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 18 0 R
 /F3.1 42 0 R
@@ -82830,21 +82878,21 @@ endobj
 /F6.0 71 0 R
 /F7.0 154 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
-/Annots [662 0 R 663 0 R 664 0 R 674 0 R 675 0 R 676 0 R 677 0 R 678 0 R 679 0 R 680 0 R 681 0 R 682 0 R 683 0 R 689 0 R 690 0 R]
+/Annots [664 0 R 665 0 R 666 0 R 676 0 R 677 0 R 678 0 R 679 0 R 680 0 R 681 0 R 682 0 R 683 0 R 684 0 R 685 0 R 691 0 R 692 0 R]
 >>
 endobj
-660 0 obj
-[659 0 R /XYZ 0 841.89 null]
+662 0 obj
+[661 0 R /XYZ 0 841.89 null]
 endobj
-661 0 obj
+663 0 obj
 << /Limits [(usability-use-it) (what-this-means-in-practice)]
-/Names [(usability-use-it) 660 0 R (use-for-prototyping) 278 0 R (using-a-checkbox) 556 0 R (using-a-regular-servlet-container) 313 0 R (using-action-semantics) 551 0 R (using-datanucleus-type-safe-queries) 619 0 R (using-mvn-jetty-plugin) 312 0 R (using-the-app) 329 0 R (validate-adding-or-removing-from-a-collection) 685 0 R (validate-arguments-to-invoke-an-action) 686 0 R (validate-change-to-a-property) 684 0 R (validating-a-contributed-property-collection-or-action) 687 0 R (validity-do-it) 673 0 R (value-vs-reference-types) 425 0 R (view-model) 754 0 R (visibility-see-it) 649 0 R (what-this-means-in-practice) 79 0 R]
+/Names [(usability-use-it) 662 0 R (use-for-prototyping) 278 0 R (using-a-checkbox) 558 0 R (using-a-regular-servlet-container) 313 0 R (using-action-semantics) 553 0 R (using-datanucleus-type-safe-queries) 621 0 R (using-mvn-jetty-plugin) 312 0 R (using-the-app) 329 0 R (validate-adding-or-removing-from-a-collection) 687 0 R (validate-arguments-to-invoke-an-action) 688 0 R (validate-change-to-a-property) 686 0 R (validating-a-contributed-property-collection-or-action) 689 0 R (validity-do-it) 675 0 R (value-vs-reference-types) 427 0 R (view-model) 756 0 R (visibility-see-it) 651 0 R (what-this-means-in-practice) 79 0 R]
 >>
 endobj
-662 0 obj
+664 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -82855,7 +82903,7 @@ endobj
 /Type /Annot
 >>
 endobj
-663 0 obj
+665 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -82866,7 +82914,7 @@ endobj
 /Type /Annot
 >>
 endobj
-664 0 obj
+666 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -82877,36 +82925,36 @@ endobj
 /Type /Annot
 >>
 endobj
-665 0 obj
-[659 0 R /XYZ 0 741.6300000000001 null]
-endobj
-666 0 obj
-[659 0 R /XYZ 0 711.7500000000002 null]
-endobj
 667 0 obj
-<< /Limits [(deploy-to-production) (downloading-an-initial-layout)]
-/Names [(deploy-to-production) 271 0 R (derived-collection) 695 0 R (derived-property) 692 0 R (disable-a-collection) 666 0 R (disable-a-contributed-property-collection-or-action) 669 0 R (disable-a-property) 665 0 R (disable-an-action) 668 0 R (domain-services) 875 0 R (domain-services-vs-view-services) 205 0 R (domainservicelayout) 903 0 R (downloading-an-initial-layout) 896 0 R]
->>
+[661 0 R /XYZ 0 741.6300000000001 null]
 endobj
 668 0 obj
-[659 0 R /XYZ 0 681.8700000000003 null]
+[661 0 R /XYZ 0 711.7500000000002 null]
 endobj
 669 0 obj
-[659 0 R /XYZ 0 651.9900000000005 null]
+<< /Limits [(deploy-to-production) (downloading-an-initial-layout)]
+/Names [(deploy-to-production) 271 0 R (derived-collection) 697 0 R (derived-property) 694 0 R (disable-a-collection) 668 0 R (disable-a-contributed-property-collection-or-action) 671 0 R (disable-a-property) 667 0 R (disable-an-action) 670 0 R (domain-services) 877 0 R (domain-services-vs-view-services) 205 0 R (domainservicelayout) 905 0 R (downloading-an-initial-layout) 898 0 R]
+>>
 endobj
 670 0 obj
-[659 0 R /XYZ 0 622.1100000000006 null]
+[661 0 R /XYZ 0 681.8700000000003 null]
 endobj
 671 0 obj
-[659 0 R /XYZ 0 536.6700000000008 null]
+[661 0 R /XYZ 0 651.9900000000005 null]
 endobj
 672 0 obj
-[659 0 R /XYZ 0 484.8300000000008 null]
+[661 0 R /XYZ 0 622.1100000000006 null]
 endobj
 673 0 obj
-[659 0 R /XYZ 0 456.99000000000075 null]
+[661 0 R /XYZ 0 536.6700000000008 null]
 endobj
 674 0 obj
+[661 0 R /XYZ 0 484.8300000000008 null]
+endobj
+675 0 obj
+[661 0 R /XYZ 0 456.99000000000075 null]
+endobj
+676 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -82917,7 +82965,7 @@ endobj
 /Type /Annot
 >>
 endobj
-675 0 obj
+677 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -82928,7 +82976,7 @@ endobj
 /Type /Annot
 >>
 endobj
-676 0 obj
+678 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -82939,7 +82987,7 @@ endobj
 /Type /Annot
 >>
 endobj
-677 0 obj
+679 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -82950,7 +82998,7 @@ endobj
 /Type /Annot
 >>
 endobj
-678 0 obj
+680 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -82961,7 +83009,7 @@ endobj
 /Type /Annot
 >>
 endobj
-679 0 obj
+681 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -82972,7 +83020,7 @@ endobj
 /Type /Annot
 >>
 endobj
-680 0 obj
+682 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -82983,7 +83031,7 @@ endobj
 /Type /Annot
 >>
 endobj
-681 0 obj
+683 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -82994,7 +83042,7 @@ endobj
 /Type /Annot
 >>
 endobj
-682 0 obj
+684 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -83005,7 +83053,7 @@ endobj
 /Type /Annot
 >>
 endobj
-683 0 obj
+685 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -83016,22 +83064,22 @@ endobj
 /Type /Annot
 >>
 endobj
-684 0 obj
-[659 0 R /XYZ 0 387.93000000000075 null]
-endobj
-685 0 obj
-[659 0 R /XYZ 0 358.0500000000007 null]
-endobj
 686 0 obj
-[659 0 R /XYZ 0 328.1700000000007 null]
+[661 0 R /XYZ 0 387.93000000000075 null]
 endobj
 687 0 obj
-[659 0 R /XYZ 0 298.2900000000007 null]
+[661 0 R /XYZ 0 358.0500000000007 null]
 endobj
 688 0 obj
-[659 0 R /XYZ 0 268.4100000000007 null]
+[661 0 R /XYZ 0 328.1700000000007 null]
 endobj
 689 0 obj
+[661 0 R /XYZ 0 298.2900000000007 null]
+endobj
+690 0 obj
+[661 0 R /XYZ 0 268.4100000000007 null]
+endobj
+691 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -83042,7 +83090,7 @@ endobj
 /Type /Annot
 >>
 endobj
-690 0 obj
+692 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -83053,13 +83101,13 @@ endobj
 /Type /Annot
 >>
 endobj
-691 0 obj
-[659 0 R /XYZ 0 202.75000000000068 null]
+693 0 obj
+[661 0 R /XYZ 0 202.75000000000068 null]
 endobj
-692 0 obj
-[659 0 R /XYZ 0 126.89000000000067 null]
+694 0 obj
+[661 0 R /XYZ 0 126.89000000000067 null]
 endobj
-693 0 obj
+695 0 obj
 << /Length 16868
 >>
 stream
@@ -84170,11 +84218,11 @@ Q
 
 endstream
 endobj
-694 0 obj
+696 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 693 0 R
+/Contents 695 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 18 0 R
 /F3.1 42 0 R
@@ -84183,19 +84231,19 @@ endobj
 /F6.0 71 0 R
 /F7.0 154 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
-/Annots [697 0 R 698 0 R 699 0 R 700 0 R 701 0 R 702 0 R 704 0 R 705 0 R 706 0 R 707 0 R 708 0 R 709 0 R 713 0 R 714 0 R 715 0 R 717 0 R 718 0 R 719 0 R 721 0 R 722 0 R 723 0 R]
+/Annots [699 0 R 700 0 R 701 0 R 702 0 R 703 0 R 704 0 R 706 0 R 707 0 R 708 0 R 709 0 R 710 0 R 711 0 R 715 0 R 716 0 R 717 0 R 719 0 R 720 0 R 721 0 R 723 0 R 724 0 R 725 0 R]
 >>
 endobj
-695 0 obj
-[694 0 R /XYZ 0 841.89 null]
+697 0 obj
+[696 0 R /XYZ 0 841.89 null]
 endobj
-696 0 obj
-[694 0 R /XYZ 0 532.07 null]
+698 0 obj
+[696 0 R /XYZ 0 532.07 null]
 endobj
-697 0 obj
+699 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -84206,7 +84254,7 @@ endobj
 /Type /Annot
 >>
 endobj
-698 0 obj
+700 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -84217,7 +84265,7 @@ endobj
 /Type /Annot
 >>
 endobj
-699 0 obj
+701 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -84228,7 +84276,7 @@ endobj
 /Type /Annot
 >>
 endobj
-700 0 obj
+702 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -84239,7 +84287,7 @@ endobj
 /Type /Annot
 >>
 endobj
-701 0 obj
+703 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -84250,7 +84298,7 @@ endobj
 /Type /Annot
 >>
 endobj
-702 0 obj
+704 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -84261,10 +84309,10 @@ endobj
 /Type /Annot
 >>
 endobj
-703 0 obj
-[694 0 R /XYZ 0 463.0100000000001 null]
+705 0 obj
+[696 0 R /XYZ 0 463.0100000000001 null]
 endobj
-704 0 obj
+706 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -84275,7 +84323,7 @@ endobj
 /Type /Annot
 >>
 endobj
-705 0 obj
+707 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -84286,7 +84334,7 @@ endobj
 /Type /Annot
 >>
 endobj
-706 0 obj
+708 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -84297,7 +84345,7 @@ endobj
 /Type /Annot
 >>
 endobj
-707 0 obj
+709 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -84308,7 +84356,7 @@ endobj
 /Type /Annot
 >>
 endobj
-708 0 obj
+710 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -84319,7 +84367,7 @@ endobj
 /Type /Annot
 >>
 endobj
-709 0 obj
+711 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -84330,16 +84378,16 @@ endobj
 /Type /Annot
 >>
 endobj
-710 0 obj
-[694 0 R /XYZ 0 393.95000000000005 null]
-endobj
-711 0 obj
-[694 0 R /XYZ 0 318.09000000000003 null]
-endobj
 712 0 obj
-[694 0 R /XYZ 0 249.02999999999997 null]
+[696 0 R /XYZ 0 393.95000000000005 null]
 endobj
 713 0 obj
+[696 0 R /XYZ 0 318.09000000000003 null]
+endobj
+714 0 obj
+[696 0 R /XYZ 0 249.02999999999997 null]
+endobj
+715 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -84350,7 +84398,7 @@ endobj
 /Type /Annot
 >>
 endobj
-714 0 obj
+716 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -84361,7 +84409,7 @@ endobj
 /Type /Annot
 >>
 endobj
-715 0 obj
+717 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -84372,10 +84420,10 @@ endobj
 /Type /Annot
 >>
 endobj
-716 0 obj
-[694 0 R /XYZ 0 183.36999999999995 null]
+718 0 obj
+[696 0 R /XYZ 0 183.36999999999995 null]
 endobj
-717 0 obj
+719 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -84386,7 +84434,7 @@ endobj
 /Type /Annot
 >>
 endobj
-718 0 obj
+720 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -84397,7 +84445,7 @@ endobj
 /Type /Annot
 >>
 endobj
-719 0 obj
+721 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -84408,10 +84456,10 @@ endobj
 /Type /Annot
 >>
 endobj
-720 0 obj
-[694 0 R /XYZ 0 117.70999999999992 null]
+722 0 obj
+[696 0 R /XYZ 0 117.70999999999992 null]
 endobj
-721 0 obj
+723 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -84422,7 +84470,7 @@ endobj
 /Type /Annot
 >>
 endobj
-722 0 obj
+724 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -84433,7 +84481,7 @@ endobj
 /Type /Annot
 >>
 endobj
-723 0 obj
+725 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -84444,7 +84492,7 @@ endobj
 /Type /Annot
 >>
 endobj
-724 0 obj
+726 0 obj
 << /Length 10614
 >>
 stream
@@ -85066,11 +85114,11 @@ Q
 
 endstream
 endobj
-725 0 obj
+727 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 724 0 R
+/Contents 726 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 18 0 R
 /F3.1 42 0 R
@@ -85078,19 +85126,19 @@ endobj
 /F6.0 71 0 R
 /F7.0 154 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
-/Annots [728 0 R 729 0 R 730 0 R 732 0 R 733 0 R 734 0 R 736 0 R 737 0 R 738 0 R 740 0 R 741 0 R 742 0 R 746 0 R 748 0 R 750 0 R]
+/Annots [730 0 R 731 0 R 732 0 R 734 0 R 735 0 R 736 0 R 738 0 R 739 0 R 740 0 R 742 0 R 743 0 R 744 0 R 748 0 R 750 0 R 752 0 R]
 >>
 endobj
-726 0 obj
-[725 0 R /XYZ 0 841.89 null]
+728 0 obj
+[727 0 R /XYZ 0 841.89 null]
 endobj
-727 0 obj
-[725 0 R /XYZ 0 741.6300000000001 null]
+729 0 obj
+[727 0 R /XYZ 0 741.6300000000001 null]
 endobj
-728 0 obj
+730 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -85101,7 +85149,7 @@ endobj
 /Type /Annot
 >>
 endobj
-729 0 obj
+731 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -85112,7 +85160,7 @@ endobj
 /Type /Annot
 >>
 endobj
-730 0 obj
+732 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -85123,10 +85171,10 @@ endobj
 /Type /Annot
 >>
 endobj
-731 0 obj
-[725 0 R /XYZ 0 675.9700000000003 null]
+733 0 obj
+[727 0 R /XYZ 0 675.9700000000003 null]
 endobj
-732 0 obj
+734 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -85137,7 +85185,7 @@ endobj
 /Type /Annot
 >>
 endobj
-733 0 obj
+735 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -85148,7 +85196,7 @@ endobj
 /Type /Annot
 >>
 endobj
-734 0 obj
+736 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -85159,10 +85207,10 @@ endobj
 /Type /Annot
 >>
 endobj
-735 0 obj
-[725 0 R /XYZ 0 610.3100000000004 null]
+737 0 obj
+[727 0 R /XYZ 0 610.3100000000004 null]
 endobj
-736 0 obj
+738 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -85173,7 +85221,7 @@ endobj
 /Type /Annot
 >>
 endobj
-737 0 obj
+739 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -85184,7 +85232,7 @@ endobj
 /Type /Annot
 >>
 endobj
-738 0 obj
+740 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -85195,10 +85243,10 @@ endobj
 /Type /Annot
 >>
 endobj
-739 0 obj
-[725 0 R /XYZ 0 544.6500000000005 null]
+741 0 obj
+[727 0 R /XYZ 0 544.6500000000005 null]
 endobj
-740 0 obj
+742 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -85209,7 +85257,7 @@ endobj
 /Type /Annot
 >>
 endobj
-741 0 obj
+743 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -85220,7 +85268,7 @@ endobj
 /Type /Annot
 >>
 endobj
-742 0 obj
+744 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -85231,18 +85279,18 @@ endobj
 /Type /Annot
 >>
 endobj
-743 0 obj
-[725 0 R /XYZ 0 478.9900000000007 null]
+745 0 obj
+[727 0 R /XYZ 0 478.9900000000007 null]
 endobj
-744 0 obj
+746 0 obj
 << /Limits [(hide-an-action) (mapping-to-varbinary-or-varchar)]
-/Names [(hide-an-action) 655 0 R (imperative) 672 0 R (imperative-style) 490 0 R (implement-your-own-viewer) 286 0 R (initialization) 606 0 R (instantiating-and-persisting-objects) 614 0 R (isis-add-on-modules) 921 0 R (json-layout-file) 890 0 R (mandatory-and-optional) 626 0 R (mapping-blobs) 447 0 R (mapping-blobs-and-clobs) 445 0 R (mapping-clobs) 453 0 R (mapping-to-varbinary-or-varchar) 456 0 R]
+/Names [(hide-an-action) 657 0 R (imperative) 674 0 R (imperative-style) 492 0 R (implement-your-own-viewer) 286 0 R (initialization) 608 0 R (instantiating-and-persisting-objects) 616 0 R (isis-add-on-modules) 923 0 R (json-layout-file) 892 0 R (mandatory-and-optional) 628 0 R (mapping-blobs) 449 0 R (mapping-blobs-and-clobs) 447 0 R (mapping-clobs) 455 0 R (mapping-to-varbinary-or-varchar) 458 0 R]
 >>
 endobj
-745 0 obj
-[725 0 R /XYZ 0 409.93000000000063 null]
+747 0 obj
+[727 0 R /XYZ 0 409.93000000000063 null]
 endobj
-746 0 obj
+748 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -85253,10 +85301,10 @@ endobj
 /Type /Annot
 >>
 endobj
-747 0 obj
-[725 0 R /XYZ 0 344.27000000000055 null]
+749 0 obj
+[727 0 R /XYZ 0 344.27000000000055 null]
 endobj
-748 0 obj
+750 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -85267,10 +85315,10 @@ endobj
 /Type /Annot
 >>
 endobj
-749 0 obj
-[725 0 R /XYZ 0 290.3900000000005 null]
+751 0 obj
+[727 0 R /XYZ 0 290.3900000000005 null]
 endobj
-750 0 obj
+752 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -85281,10 +85329,10 @@ endobj
 /Type /Annot
 >>
 endobj
-751 0 obj
-[725 0 R /XYZ 0 214.53000000000046 null]
+753 0 obj
+[727 0 R /XYZ 0 214.53000000000046 null]
 endobj
-752 0 obj
+754 0 obj
 << /Length 21772
 >>
 stream
@@ -86667,11 +86715,11 @@ Q
 
 endstream
 endobj
-753 0 obj
+755 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 752 0 R
+/Contents 754 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 18 0 R
 /F3.1 42 0 R
@@ -86679,19 +86727,19 @@ endobj
 /F6.0 71 0 R
 /F8.0 197 0 R
 >>
-/XObject << /Stamp1 1081 0 R
+/XObject << /Stamp1 1083 0 R
 >>
 >>
-/Annots [756 0 R 758 0 R]
+/Annots [758 0 R 760 0 R]
 >>
 endobj
-754 0 obj
-[753 0 R /XYZ 0 841.89 null]
+756 0 obj
+[755 0 R /XYZ 0 841.89 null]
 endobj
-755 0 obj
-

<TRUNCATED>

[3/8] isis-site git commit: ISIS-1335: improving docs for setting up file/live templates for IntelliJ, some small fixes. Also updated the cheat sheet PDF/docx

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/ec1efb3c/content/guides/ugtst.pdf
----------------------------------------------------------------------
diff --git a/content/guides/ugtst.pdf b/content/guides/ugtst.pdf
index e18a8d4..254916a 100644
--- a/content/guides/ugtst.pdf
+++ b/content/guides/ugtst.pdf
@@ -4,16 +4,16 @@
 << /Title (Testing)
 /Creator (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0)
 /Producer (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0)
-/CreationDate (D:20160329132528+01'00')
-/ModDate (D:20160329132528+01'00')
+/CreationDate (D:20160425191445+01'00')
+/ModDate (D:20160425191445+01'00')
 >>
 endobj
 2 0 obj
 << /Type /Catalog
 /Pages 3 0 R
 /Names 14 0 R
-/Outlines 356 0 R
-/PageLabels 389 0 R
+/Outlines 358 0 R
+/PageLabels 391 0 R
 /PageMode /UseOutlines
 /OpenAction [7 0 R /FitH 842.89]
 /ViewerPreferences << /DisplayDocTitle true
@@ -23,7 +23,7 @@ endobj
 3 0 obj
 << /Type /Pages
 /Count 50
-/Kids [7 0 R 10 0 R 12 0 R 32 0 R 43 0 R 49 0 R 55 0 R 63 0 R 70 0 R 76 0 R 81 0 R 87 0 R 96 0 R 102 0 R 105 0 R 112 0 R 114 0 R 119 0 R 122 0 R 130 0 R 136 0 R 138 0 R 141 0 R 146 0 R 154 0 R 159 0 R 164 0 R 170 0 R 172 0 R 187 0 R 193 0 R 201 0 R 206 0 R 218 0 R 220 0 R 225 0 R 232 0 R 237 0 R 241 0 R 246 0 R 251 0 R 255 0 R 258 0 R 260 0 R 262 0 R 267 0 R 274 0 R 281 0 R 286 0 R 291 0 R]
+/Kids [7 0 R 10 0 R 12 0 R 32 0 R 43 0 R 49 0 R 55 0 R 63 0 R 70 0 R 78 0 R 83 0 R 89 0 R 98 0 R 104 0 R 107 0 R 114 0 R 116 0 R 121 0 R 124 0 R 132 0 R 138 0 R 140 0 R 143 0 R 148 0 R 156 0 R 161 0 R 166 0 R 172 0 R 174 0 R 189 0 R 195 0 R 203 0 R 208 0 R 220 0 R 222 0 R 227 0 R 234 0 R 239 0 R 243 0 R 248 0 R 253 0 R 257 0 R 260 0 R 262 0 R 264 0 R 269 0 R 276 0 R 283 0 R 288 0 R 293 0 R]
 >>
 endobj
 4 0 obj
@@ -80,11 +80,11 @@ endobj
 << /Type /Font
 /BaseFont /AAAADT+NotoSerif
 /Subtype /TrueType
-/FontDescriptor 391 0 R
+/FontDescriptor 393 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 393 0 R
-/ToUnicode 392 0 R
+/Widths 395 0 R
+/ToUnicode 394 0 R
 >>
 endobj
 9 0 obj
@@ -1353,7 +1353,7 @@ endobj
 /F6.0 41 0 R
 >>
 >>
-/Annots [292 0 R 293 0 R 294 0 R 295 0 R 296 0 R 297 0 R 298 0 R 299 0 R 300 0 R 301 0 R 302 0 R 303 0 R 304 0 R 305 0 R 306 0 R 307 0 R 308 0 R 309 0 R 310 0 R 311 0 R 312 0 R 313 0 R 314 0 R 315 0 R 316 0 R 317 0 R 318 0 R 319 0 R 320 0 R 321 0 R 322 0 R 323 0 R 324 0 R 325 0 R 326 0 R 327 0 R 328 0 R 329 0 R 330 0 R 331 0 R 332 0 R 333 0 R 334 0 R 335 0 R 336 0 R 337 0 R 338 0 R 339 0 R 340 0 R 341 0 R 342 0 R 343 0 R 344 0 R 345 0 R 346 0 R 347 0 R 348 0 R 349 0 R 350 0 R 351 0 R 352 0 R 353 0 R 354 0 R]
+/Annots [294 0 R 295 0 R 296 0 R 297 0 R 298 0 R 299 0 R 300 0 R 301 0 R 302 0 R 303 0 R 304 0 R 305 0 R 306 0 R 307 0 R 308 0 R 309 0 R 310 0 R 311 0 R 312 0 R 313 0 R 314 0 R 315 0 R 316 0 R 317 0 R 318 0 R 319 0 R 320 0 R 321 0 R 322 0 R 323 0 R 324 0 R 325 0 R 326 0 R 327 0 R 328 0 R 329 0 R 330 0 R 331 0 R 332 0 R 333 0 R 334 0 R 335 0 R 336 0 R 337 0 R 338 0 R 339 0 R 340 0 R 341 0 R 342 0 R 343 0 R 344 0 R 345 0 R 346 0 R 347 0 R 348 0 R 349 0 R 350 0 R 351 0 R 352 0 R 353 0 R 354 0 R 355 0 R 356 0 R]
 >>
 endobj
 11 0 obj
@@ -1934,7 +1934,7 @@ endobj
 /Font << /F2.0 16 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 355 0 R
+/XObject << /Stamp1 357 0 R
 >>
 >>
 /Annots [18 0 R 19 0 R 20 0 R 21 0 R 22 0 R 23 0 R 24 0 R 25 0 R 26 0 R 27 0 R 28 0 R 29 0 R 30 0 R]
@@ -1949,18 +1949,18 @@ endobj
 >>
 endobj
 15 0 obj
-<< /Kids [107 0 R 174 0 R 108 0 R]
+<< /Kids [109 0 R 176 0 R 110 0 R]
 >>
 endobj
 16 0 obj
 << /Type /Font
 /BaseFont /AAAADU+NotoSerif-Bold
 /Subtype /TrueType
-/FontDescriptor 395 0 R
+/FontDescriptor 397 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 397 0 R
-/ToUnicode 396 0 R
+/Widths 399 0 R
+/ToUnicode 398 0 R
 >>
 endobj
 17 0 obj
@@ -2746,7 +2746,7 @@ endobj
 /F5.0 38 0 R
 /F6.0 41 0 R
 >>
-/XObject << /Stamp1 355 0 R
+/XObject << /Stamp1 357 0 R
 >>
 >>
 /Annots [39 0 R]
@@ -2762,22 +2762,22 @@ endobj
 << /Type /Font
 /BaseFont /AAAADV+FontAwesome
 /Subtype /TrueType
-/FontDescriptor 399 0 R
+/FontDescriptor 401 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 401 0 R
-/ToUnicode 400 0 R
+/Widths 403 0 R
+/ToUnicode 402 0 R
 >>
 endobj
 36 0 obj
 << /Type /Font
 /BaseFont /AAAADW+NotoSerif-BoldItalic
 /Subtype /TrueType
-/FontDescriptor 403 0 R
+/FontDescriptor 405 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 405 0 R
-/ToUnicode 404 0 R
+/Widths 407 0 R
+/ToUnicode 406 0 R
 >>
 endobj
 37 0 obj
@@ -2787,11 +2787,11 @@ endobj
 << /Type /Font
 /BaseFont /AAAADX+NotoSerif-Italic
 /Subtype /TrueType
-/FontDescriptor 407 0 R
+/FontDescriptor 409 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 409 0 R
-/ToUnicode 408 0 R
+/Widths 411 0 R
+/ToUnicode 410 0 R
 >>
 endobj
 39 0 obj
@@ -2812,11 +2812,11 @@ endobj
 << /Type /Font
 /BaseFont /AAAADY+mplus1mn-regular
 /Subtype /TrueType
-/FontDescriptor 411 0 R
+/FontDescriptor 413 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 413 0 R
-/ToUnicode 412 0 R
+/Widths 415 0 R
+/ToUnicode 414 0 R
 >>
 endobj
 42 0 obj
@@ -3419,7 +3419,7 @@ endobj
 /F2.0 16 0 R
 >>
 /XObject << /I1 46 0 R
-/Stamp1 355 0 R
+/Stamp1 357 0 R
 >>
 >>
 /Annots [44 0 R 45 0 R]
@@ -4481,7 +4481,7 @@ endobj
 /F3.1 35 0 R
 /F2.0 16 0 R
 >>
-/XObject << /Stamp1 355 0 R
+/XObject << /Stamp1 357 0 R
 >>
 >>
 /Annots [53 0 R]
@@ -4491,11 +4491,11 @@ endobj
 << /Type /Font
 /BaseFont /AAAADZ+mplus1mn-bold
 /Subtype /TrueType
-/FontDescriptor 415 0 R
+/FontDescriptor 417 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 417 0 R
-/ToUnicode 416 0 R
+/Widths 419 0 R
+/ToUnicode 418 0 R
 >>
 endobj
 51 0 obj
@@ -5050,7 +5050,7 @@ endobj
 /F2.0 16 0 R
 /F3.1 35 0 R
 >>
-/XObject << /Stamp1 355 0 R
+/XObject << /Stamp1 357 0 R
 >>
 >>
 /Annots [57 0 R 59 0 R 60 0 R 61 0 R]
@@ -6530,7 +6530,7 @@ endobj
 /F6.0 41 0 R
 /F7.0 50 0 R
 >>
-/XObject << /Stamp1 355 0 R
+/XObject << /Stamp1 357 0 R
 >>
 >>
 /Annots [66 0 R 68 0 R]
@@ -6568,7 +6568,7 @@ endobj
 >>
 endobj
 69 0 obj
-<< /Length 28178
+<< /Length 28324
 >>
 stream
 q
@@ -7037,7 +7037,7 @@ ET
 q
 0.5 w
 0.933 0.933 0.933 SCN
-113.807 481.720 m
+113.807 465.940 m
 113.807 537.060 l
 S
 Q
@@ -7049,7 +7049,7 @@ Q
 0.067 0.067 0.067 SCN
 
 BT
-80.17133333333334 500.8100000000003 Td
+80.17133333333334 492.9200000000003 Td
 /F3.1 24 Tf
 <21> Tj
 ET
@@ -7089,43 +7089,70 @@ ET
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
+2.504 Tw
+
 BT
 125.80666666666667 489.5360000000003 Td
 /F1.0 10.5 Tf
 <64657461696c732c2073656520> Tj
 ET
 
+
+0.000 Tw
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 0.259 0.545 0.792 scn
 0.259 0.545 0.792 SCN
 
+2.504 Tw
+
 BT
-182.83216666666667 489.5360000000003 Td
+187.83921794871793 489.5360000000003 Td
 /F1.0 10.5 Tf
 <68657265> Tj
 ET
 
+
+0.000 Tw
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
+2.504 Tw
+
 BT
-205.66966666666667 489.5360000000003 Td
+210.67671794871796 489.5360000000003 Td
 /F1.0 10.5 Tf
-<2e2020416c736f20636865636b206f75742074686520> Tj
+<2e2020416c736f20636865636b206f7574207468652074656d706c6174657320696e2074686520646576656c6f70657273272067756964652028> Tj
 ET
 
+
+0.000 Tw
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 0.259 0.545 0.792 scn
 0.259 0.545 0.792 SCN
 
+2.504 Tw
+
 BT
-307.1836666666667 489.5360000000003 Td
+516.7384999999999 489.5360000000003 Td
 /F1.0 10.5 Tf
-<4944452074656d706c61746573> Tj
+<6c697665> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+125.80666666666667 473.7560000000003 Td
+/F1.0 10.5 Tf
+<74656d706c6174657320666f7220496e74656c6c694a> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7134,9 +7161,31 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-376.7986666666667 489.5360000000003 Td
+228.52816666666666 473.7560000000003 Td
 /F1.0 10.5 Tf
-<20666f7220667572746865722067756964616e63652e> Tj
+<202f20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+236.9911666666667 473.7560000000003 Td
+/F1.0 10.5 Tf
+<656469746f722074656d706c6174657320666f722045636c69707365> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+374.1001666666667 473.7560000000003 Td
+/F1.0 10.5 Tf
+<2920666f7220667572746865722067756964616e63652e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7147,7 +7196,7 @@ ET
 3.620 Tw
 
 BT
-48.24000000000001 457.75600000000026 Td
+48.24000000000001 441.9760000000003 Td
 /F1.0 10.5 Tf
 [<46> 40.0390625 <6f72206578616d706c652c20737570706f7365207468617420>] TJ
 ET
@@ -7162,7 +7211,7 @@ ET
 3.620 Tw
 
 BT
-196.42735390625 457.75600000000026 Td
+196.42735390625 441.9760000000003 Td
 /F6.0 10.5 Tf
 <506172656e74446f6d61696e4f626a656374> Tj
 ET
@@ -7177,7 +7226,7 @@ ET
 3.620 Tw
 
 BT
-290.92735390625 457.75600000000026 Td
+290.92735390625 441.9760000000003 Td
 /F1.0 10.5 Tf
 <20616e6420> Tj
 ET
@@ -7192,7 +7241,7 @@ ET
 3.620 Tw
 
 BT
-322.7167359375 457.75600000000026 Td
+322.7167359375 441.9760000000003 Td
 /F6.0 10.5 Tf
 <4368696c64446f6d61696e4f626a656374> Tj
 ET
@@ -7207,7 +7256,7 @@ ET
 3.620 Tw
 
 BT
-411.9667359375 457.75600000000026 Td
+411.9667359375 441.9760000000003 Td
 /F1.0 10.5 Tf
 <2068617665206120313a6d2072656c6174696f6e73686970> Tj
 ET
@@ -7222,7 +7271,7 @@ ET
 4.423 Tw
 
 BT
-48.24000000000001 441.9760000000002 Td
+48.24000000000001 426.19600000000025 Td
 /F1.0 10.5 Tf
 <28> Tj
 ET
@@ -7237,7 +7286,7 @@ ET
 4.423 Tw
 
 BT
-51.87300000000001 441.9760000000002 Td
+51.87300000000001 426.19600000000025 Td
 /F6.0 10.5 Tf
 <506172656e74446f6d61696e4f626a656374236368696c6472656e> Tj
 ET
@@ -7252,7 +7301,7 @@ ET
 4.423 Tw
 
 BT
-193.62300000000002 441.9760000000002 Td
+193.62300000000002 426.19600000000025 Td
 /F1.0 10.5 Tf
 <202f20> Tj
 ET
@@ -7267,7 +7316,7 @@ ET
 4.423 Tw
 
 BT
-210.931625 441.9760000000002 Td
+210.931625 426.19600000000025 Td
 /F6.0 10.5 Tf
 <4368696c64446f6d61696e4f626a65637423706172656e74> Tj
 ET
@@ -7282,7 +7331,7 @@ ET
 4.423 Tw
 
 BT
-336.931625 441.9760000000002 Td
+336.931625 426.19600000000025 Td
 /F1.0 10.5 Tf
 <292c20616e6420616c736f20> Tj
 ET
@@ -7297,7 +7346,7 @@ ET
 4.423 Tw
 
 BT
-403.6765625 441.9760000000002 Td
+403.6765625 426.19600000000025 Td
 /F6.0 10.5 Tf
 <50656572446f6d61696e4f626a656374> Tj
 ET
@@ -7312,7 +7361,7 @@ ET
 4.423 Tw
 
 BT
-487.6765625 441.9760000000002 Td
+487.6765625 426.19600000000025 Td
 /F1.0 10.5 Tf
 <20686173206120313a31> Tj
 ET
@@ -7325,7 +7374,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 426.19600000000025 Td
+48.24000000000001 410.4160000000003 Td
 /F1.0 10.5 Tf
 <72656c6174696f6e73686970207769746820697473656c662028> Tj
 ET
@@ -7336,7 +7385,7 @@ ET
 0.694 0.129 0.275 SCN
 
 BT
-168.0765 426.19600000000025 Td
+168.0765 410.4160000000003 Td
 /F6.0 10.5 Tf
 <50656572446f6d61696e4f626a656374236e657874> Tj
 ET
@@ -7347,7 +7396,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-278.3265 426.19600000000025 Td
+278.3265 410.4160000000003 Td
 /F1.0 10.5 Tf
 <202f20> Tj
 ET
@@ -7358,7 +7407,7 @@ ET
 0.694 0.129 0.275 SCN
 
 BT
-286.7895 426.19600000000025 Td
+286.7895 410.4160000000003 Td
 /F6.0 10.5 Tf
 <50656572446f6d61696e4f626a6563742370726576696f7573> Tj
 ET
@@ -7369,7 +7418,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-418.0395 426.19600000000025 Td
+418.0395 410.4160000000003 Td
 /F1.0 10.5 Tf
 <292e> Tj
 ET
@@ -7380,7 +7429,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 398.4160000000002 Td
+48.24000000000001 382.63600000000025 Td
 /F1.0 10.5 Tf
 <54686520666f6c6c6f77696e672077696c6c2065786572636973652074686573652072656c6174696f6e73686970733a> Tj
 ET
@@ -7389,28 +7438,28 @@ ET
 0.000 0.000 0.000 scn
 q
 0.961 0.961 0.961 scn
-52.240 382.600 m
-543.040 382.600 l
-545.249 382.600 547.040 380.809 547.040 378.600 c
-547.040 172.980 l
-547.040 170.771 545.249 168.980 543.040 168.980 c
-52.240 168.980 l
-50.031 168.980 48.240 170.771 48.240 172.980 c
-48.240 378.600 l
-48.240 380.809 50.031 382.600 52.240 382.600 c
+52.240 366.820 m
+543.040 366.820 l
+545.249 366.820 547.040 365.029 547.040 362.820 c
+547.040 157.200 l
+547.040 154.991 545.249 153.200 543.040 153.200 c
+52.240 153.200 l
+50.031 153.200 48.240 154.991 48.240 157.200 c
+48.240 362.820 l
+48.240 365.029 50.031 366.820 52.240 366.820 c
 h
 f
 0.800 0.800 0.800 SCN
 0.75 w
-52.240 382.600 m
-543.040 382.600 l
-545.249 382.600 547.040 380.809 547.040 378.600 c
-547.040 172.980 l
-547.040 170.771 545.249 168.980 543.040 168.980 c
-52.240 168.980 l
-50.031 168.980 48.240 170.771 48.240 172.980 c
-48.240 378.600 l
-48.240 380.809 50.031 382.600 52.240 382.600 c
+52.240 366.820 m
+543.040 366.820 l
+545.249 366.820 547.040 365.029 547.040 362.820 c
+547.040 157.200 l
+547.040 154.991 545.249 153.200 543.040 153.200 c
+52.240 153.200 l
+50.031 153.200 48.240 154.991 48.240 157.200 c
+48.240 362.820 l
+48.240 365.029 50.031 366.820 52.240 366.820 c
 h
 S
 Q
@@ -7418,7 +7467,7 @@ Q
 0.000 0.533 0.000 SCN
 
 BT
-59.24000000000001 359.77500000000026 Td
+59.24000000000001 343.9950000000003 Td
 /F7.0 11 Tf
 <7075626c6963> Tj
 ET
@@ -7429,7 +7478,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-92.24000000000001 359.77500000000026 Td
+92.24000000000001 343.9950000000003 Td
 /F6.0 11 Tf
 <20> Tj
 ET
@@ -7440,7 +7489,7 @@ ET
 0.000 0.533 0.000 SCN
 
 BT
-97.74000000000001 359.77500000000026 Td
+97.74000000000001 343.9950000000003 Td
 /F7.0 11 Tf
 <636c617373> Tj
 ET
@@ -7451,7 +7500,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-125.24000000000001 359.77500000000026 Td
+125.24000000000001 343.9950000000003 Td
 /F6.0 11 Tf
 <20> Tj
 ET
@@ -7462,7 +7511,7 @@ ET
 0.733 0.000 0.400 SCN
 
 BT
-130.74 359.77500000000026 Td
+130.74 343.9950000000003 Td
 /F7.0 11 Tf
 <4269646972656374696f6e616c52656c6174696f6e73686970436f6e747261637454657374416c6c> Tj
 ET
@@ -7473,7 +7522,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24000000000001 345.03500000000025 Td
+59.24000000000001 329.2550000000003 Td
 /F6.0 11 Tf
 <ca20202020202020> Tj
 ET
@@ -7484,7 +7533,7 @@ ET
 0.000 0.533 0.000 SCN
 
 BT
-103.24000000000001 345.03500000000025 Td
+103.24000000000001 329.2550000000003 Td
 /F7.0 11 Tf
 <657874656e6473> Tj
 ET
@@ -7495,7 +7544,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-141.74 345.03500000000025 Td
+141.74 329.2550000000003 Td
 /F6.0 11 Tf
 <20> Tj
 ET
@@ -7506,7 +7555,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-147.24 345.03500000000025 Td
+147.24 329.2550000000003 Td
 /F6.0 11 Tf
 <4269646972656374696f6e616c52656c6174696f6e73686970436f6e7472616374546573744162737472616374> Tj
 ET
@@ -7517,7 +7566,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-394.74 345.03500000000025 Td
+394.74 329.2550000000003 Td
 /F6.0 11 Tf
 <20> Tj
 ET
@@ -7528,7 +7577,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-400.24 345.03500000000025 Td
+400.24 329.2550000000003 Td
 /F6.0 11 Tf
 <7b> Tj
 ET
@@ -7539,7 +7588,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24000000000001 315.55500000000023 Td
+59.24000000000001 299.77500000000026 Td
 /F6.0 11 Tf
 <ca202020> Tj
 ET
@@ -7550,7 +7599,7 @@ ET
 0.000 0.533 0.000 SCN
 
 BT
-81.24000000000001 315.55500000000023 Td
+81.24000000000001 299.77500000000026 Td
 /F7.0 11 Tf
 <7075626c6963> Tj
 ET
@@ -7561,7 +7610,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-114.24000000000001 315.55500000000023 Td
+114.24000000000001 299.77500000000026 Td
 /F6.0 11 Tf
 <20> Tj
 ET
@@ -7572,7 +7621,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-119.74000000000001 315.55500000000023 Td
+119.74000000000001 299.77500000000026 Td
 /F6.0 11 Tf
 <4269646972656374696f6e616c52656c6174696f6e73686970436f6e747261637454657374416c6c> Tj
 ET
@@ -7583,7 +7632,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-339.74 315.55500000000023 Td
+339.74 299.77500000000026 Td
 /F6.0 11 Tf
 <2829> Tj
 ET
@@ -7594,7 +7643,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-350.74 315.55500000000023 Td
+350.74 299.77500000000026 Td
 /F6.0 11 Tf
 <20> Tj
 ET
@@ -7605,7 +7654,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-356.24 315.55500000000023 Td
+356.24 299.77500000000026 Td
 /F6.0 11 Tf
 <7b> Tj
 ET
@@ -7616,7 +7665,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24000000000001 300.8150000000002 Td
+59.24000000000001 285.03500000000025 Td
 /F6.0 11 Tf
 <ca20202020202020> Tj
 ET
@@ -7627,7 +7676,7 @@ ET
 0.000 0.533 0.000 SCN
 
 BT
-103.24000000000001 300.8150000000002 Td
+103.24000000000001 285.03500000000025 Td
 /F7.0 11 Tf
 <7375706572> Tj
 ET
@@ -7638,7 +7687,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-130.74 300.8150000000002 Td
+130.74 285.03500000000025 Td
 /F6.0 11 Tf
 <28> Tj
 ET
@@ -7649,7 +7698,7 @@ ET
 0.867 0.133 0.000 SCN
 
 BT
-136.24 300.8150000000002 Td
+136.24 285.03500000000025 Td
 /F6.0 11 Tf
 <226f72672e6170616368652e697369732e636f72652e756e697474657374737570706f72742e626964697222> Tj
 ET
@@ -7660,7 +7709,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-378.24 300.8150000000002 Td
+378.24 285.03500000000025 Td
 /F6.0 11 Tf
 <2c> Tj
 ET
@@ -7671,7 +7720,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24000000000001 286.0750000000003 Td
+59.24000000000001 270.2950000000003 Td
 /F6.0 11 Tf
 <ca202020202020202020202020202020> Tj
 ET
@@ -7682,7 +7731,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-147.24 286.0750000000003 Td
+147.24 270.2950000000003 Td
 /F6.0 11 Tf
 <496d6d757461626c654d6170> Tj
 ET
@@ -7693,7 +7742,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-213.24 286.0750000000003 Td
+213.24 270.2950000000003 Td
 /F6.0 11 Tf
 <2e3c> Tj
 ET
@@ -7704,7 +7753,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-224.24 286.0750000000003 Td
+224.24 270.2950000000003 Td
 /F6.0 11 Tf
 <436c617373> Tj
 ET
@@ -7715,7 +7764,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-251.74 286.0750000000003 Td
+251.74 270.2950000000003 Td
 /F6.0 11 Tf
 <3c3f3e2c> Tj
 ET
@@ -7726,7 +7775,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-273.74 286.0750000000003 Td
+273.74 270.2950000000003 Td
 /F6.0 11 Tf
 <496e7374616e746961746f72> Tj
 ET
@@ -7737,7 +7786,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-339.74 286.0750000000003 Td
+339.74 270.2950000000003 Td
 /F6.0 11 Tf
 <3e> Tj
 ET
@@ -7748,7 +7797,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-345.24 286.0750000000003 Td
+345.24 270.2950000000003 Td
 /F6.0 11 Tf
 <6f66> Tj
 ET
@@ -7759,7 +7808,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-356.24 286.0750000000003 Td
+356.24 270.2950000000003 Td
 /F6.0 11 Tf
 <28> Tj
 ET
@@ -7770,7 +7819,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24000000000001 271.33500000000026 Td
+59.24000000000001 255.5550000000003 Td
 /F6.0 11 Tf
 <ca20202020202020202020202020202020202020> Tj
 ET
@@ -7781,7 +7830,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-169.24 271.33500000000026 Td
+169.24 255.5550000000003 Td
 /F6.0 11 Tf
 <4368696c64446f6d61696e4f626a656374> Tj
 ET
@@ -7792,7 +7841,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-262.74 271.33500000000026 Td
+262.74 255.5550000000003 Td
 /F6.0 11 Tf
 <2e> Tj
 ET
@@ -7803,7 +7852,7 @@ ET
 0.200 0.400 0.600 SCN
 
 BT
-268.24 271.33500000000026 Td
+268.24 255.5550000000003 Td
 /F6.0 11 Tf
 <636c617373> Tj
 ET
@@ -7814,7 +7863,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-295.74 271.33500000000026 Td
+295.74 255.5550000000003 Td
 /F6.0 11 Tf
 <2c> Tj
 ET
@@ -7825,7 +7874,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-301.24 271.33500000000026 Td
+301.24 255.5550000000003 Td
 /F6.0 11 Tf
 <20> Tj
 ET
@@ -7836,7 +7885,7 @@ ET
 0.000 0.533 0.000 SCN
 
 BT
-306.74 271.33500000000026 Td
+306.74 255.5550000000003 Td
 /F7.0 11 Tf
 <6e6577> Tj
 ET
@@ -7847,7 +7896,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-323.24 271.33500000000026 Td
+323.24 255.5550000000003 Td
 /F6.0 11 Tf
 <20> Tj
 ET
@@ -7858,7 +7907,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-328.74 271.33500000000026 Td
+328.74 255.5550000000003 Td
 /F6.0 11 Tf
 <496e7374616e746961746f72466f724368696c64446f6d61696e4f626a656374> Tj
 ET
@@ -7869,7 +7918,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-504.74 271.33500000000026 Td
+504.74 255.5550000000003 Td
 /F6.0 11 Tf
 <28292c> Tj
 ET
@@ -7880,7 +7929,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24000000000001 256.59500000000025 Td
+59.24000000000001 240.81500000000028 Td
 /F6.0 11 Tf
 <ca20202020202020202020202020202020202020> Tj
 ET
@@ -7891,7 +7940,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-169.24 256.59500000000025 Td
+169.24 240.81500000000028 Td
 /F6.0 11 Tf
 <50656572446f6d61696e4f626a656374> Tj
 ET
@@ -7902,7 +7951,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-257.24 256.59500000000025 Td
+257.24 240.81500000000028 Td
 /F6.0 11 Tf
 <2e> Tj
 ET
@@ -7913,7 +7962,7 @@ ET
 0.200 0.400 0.600 SCN
 
 BT
-262.74 256.59500000000025 Td
+262.74 240.81500000000028 Td
 /F6.0 11 Tf
 <636c617373> Tj
 ET
@@ -7924,7 +7973,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-290.24 256.59500000000025 Td
+290.24 240.81500000000028 Td
 /F6.0 11 Tf
 <2c> Tj
 ET
@@ -7935,7 +7984,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-295.74 256.59500000000025 Td
+295.74 240.81500000000028 Td
 /F6.0 11 Tf
 <20> Tj
 ET
@@ -7946,7 +7995,7 @@ ET
 0.000 0.533 0.000 SCN
 
 BT
-301.24 256.59500000000025 Td
+301.24 240.81500000000028 Td
 /F7.0 11 Tf
 <6e6577> Tj
 ET
@@ -7957,7 +8006,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-317.74 256.59500000000025 Td
+317.74 240.81500000000028 Td
 /F6.0 11 Tf
 <20> Tj
 ET
@@ -7968,7 +8017,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-323.24 256.59500000000025 Td
+323.24 240.81500000000028 Td
 /F6.0 11 Tf
 <496e7374616e746961746f7253696d706c65> Tj
 ET
@@ -7979,7 +8028,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24000000000001 241.85500000000025 Td
+59.24000000000001 226.07500000000027 Td
 /F6.0 11 Tf
 <28> Tj
 ET
@@ -7990,7 +8039,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-64.74000000000001 241.85500000000025 Td
+64.74000000000001 226.07500000000027 Td
 /F6.0 11 Tf
 <50656572446f6d61696e4f626a656374466f7254657374696e67> Tj
 ET
@@ -8001,7 +8050,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-207.74 241.85500000000025 Td
+207.74 226.07500000000027 Td
 /F6.0 11 Tf
 <2e> Tj
 ET
@@ -8012,7 +8061,7 @@ ET
 0.200 0.400 0.600 SCN
 
 BT
-213.24 241.85500000000025 Td
+213.24 226.07500000000027 Td
 /F6.0 11 Tf
 <636c617373> Tj
 ET
@@ -8023,7 +8072,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-240.74 241.85500000000025 Td
+240.74 226.07500000000027 Td
 /F6.0 11 Tf
 <29> Tj
 ET
@@ -8034,7 +8083,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24000000000001 227.11500000000026 Td
+59.24000000000001 211.3350000000003 Td
 /F6.0 11 Tf
 <ca202020202020202020202020202020> Tj
 ET
@@ -8045,7 +8094,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-147.24 227.11500000000026 Td
+147.24 211.3350000000003 Td
 /F6.0 11 Tf
 <29293b> Tj
 ET
@@ -8056,7 +8105,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24000000000001 212.37500000000026 Td
+59.24000000000001 196.59500000000028 Td
 /F6.0 11 Tf
 <ca20202020202020> Tj
 ET
@@ -8067,7 +8116,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-103.24000000000001 212.37500000000026 Td
+103.24000000000001 196.59500000000028 Td
 /F6.0 11 Tf
 <776974684c6f6767696e67546f> Tj
 ET
@@ -8078,7 +8127,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-174.74 212.37500000000026 Td
+174.74 196.59500000000028 Td
 /F6.0 11 Tf
 <28> Tj
 ET
@@ -8089,7 +8138,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-180.24 212.37500000000026 Td
+180.24 196.59500000000028 Td
 /F6.0 11 Tf
 <53797374656d> Tj
 ET
@@ -8100,7 +8149,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-213.24 212.37500000000026 Td
+213.24 196.59500000000028 Td
 /F6.0 11 Tf
 <2e> Tj
 ET
@@ -8111,7 +8160,7 @@ ET
 0.200 0.400 0.600 SCN
 
 BT
-218.74 212.37500000000026 Td
+218.74 196.59500000000028 Td
 /F6.0 11 Tf
 <6f7574> Tj
 ET
@@ -8122,7 +8171,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-235.24 212.37500000000026 Td
+235.24 196.59500000000028 Td
 /F6.0 11 Tf
 <293b> Tj
 ET
@@ -8133,7 +8182,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24000000000001 197.63500000000025 Td
+59.24000000000001 181.85500000000027 Td
 /F6.0 11 Tf
 <ca202020> Tj
 ET
@@ -8144,7 +8193,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-81.24000000000001 197.63500000000025 Td
+81.24000000000001 181.85500000000027 Td
 /F6.0 11 Tf
 <7d> Tj
 ET
@@ -8155,7 +8204,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24000000000001 182.89500000000024 Td
+59.24000000000001 167.11500000000026 Td
 /F6.0 11 Tf
 <7d> Tj
 ET
@@ -8168,7 +8217,7 @@ ET
 0.981 Tw
 
 BT
-48.24000000000001 145.01600000000025 Td
+48.24000000000001 129.23600000000027 Td
 /F1.0 10.5 Tf
 <54686520666972737420617267756d656e7420746f2074686520636f6e7374727563746f722073636f706573207468652073656172636820666f7220646f6d61696e206f626a656374733b20757375616c6c79207468697320776f756c64206265> Tj
 ET
@@ -8181,7 +8230,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 129.23600000000025 Td
+48.24000000000001 113.45600000000027 Td
 /F1.0 10.5 Tf
 [<736f6d657468696e67206c696b> 20.01953125 <6520>] TJ
 ET
@@ -8192,7 +8241,7 @@ ET
 0.694 0.129 0.275 SCN
 
 BT
-124.27029492187502 129.23600000000025 Td
+124.27029492187502 113.45600000000027 Td
 /F6.0 10.5 Tf
 <22636f6d2e6d79636f6d70616e792e646f6d22> Tj
 ET
@@ -8203,7 +8252,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-224.020294921875 129.23600000000025 Td
+224.020294921875 113.45600000000027 Td
 /F1.0 10.5 Tf
 <2e> Tj
 ET
@@ -8216,7 +8265,7 @@ ET
 1.044 Tw
 
 BT
-48.24000000000001 101.45600000000024 Td
+48.24000000000001 85.67600000000027 Td
 /F1.0 10.5 Tf
 <546865207365636f6e6420617267756d656e742070726f76696465732061206d6170206f6620> Tj
 ET
@@ -8231,7 +8280,7 @@ ET
 1.044 Tw
 
 BT
-258.9612333333333 101.45600000000024 Td
+258.9612333333333 85.67600000000027 Td
 /F6.0 10.5 Tf
 <496e7374616e746961746f72> Tj
 ET
@@ -8246,7 +8295,7 @@ ET
 1.044 Tw
 
 BT
-321.9612333333333 101.45600000000024 Td
+321.9612333333333 85.67600000000027 Td
 /F1.0 10.5 Tf
 <20666f72206365727461696e206f662074686520646f6d61696e206f626a6563742074797065732e2054686973> Tj
 ET
@@ -8261,7 +8310,7 @@ ET
 0.952 Tw
 
 BT
-48.24000000000001 85.67600000000024 Td
+48.24000000000001 69.89600000000027 Td
 /F1.0 10.5 Tf
 [<6861732074776f206d61696e20707572706f7365732e2046697273742c20666f72206162737472> 20.01953125 <61637420636c61737365732c206974206e6f6d696e6174657320616e20616c7465726e617469766520636f6e637265746520636c61737320746f206265>] TJ
 ET
@@ -8276,7 +8325,7 @@ ET
 1.281 Tw
 
 BT
-48.24000000000001 69.89600000000024 Td
+48.24000000000001 54.11600000000027 Td
 /F1.0 10.5 Tf
 <696e7374616e7469617465642e205365636f6e642c20666f7220636c617373657320287375636820617320> Tj
 ET
@@ -8291,7 +8340,7 @@ ET
 1.281 Tw
 
 BT
-259.67742857142855 69.89600000000024 Td
+259.67742857142855 54.11600000000027 Td
 /F6.0 10.5 Tf
 <4368696c64446f6d61696e4f626a656374> Tj
 ET
@@ -8306,7 +8355,7 @@ ET
 1.281 Tw
 
 BT
-348.92742857142855 69.89600000000024 Td
+348.92742857142855 54.11600000000027 Td
 /F1.0 10.5 Tf
 <2920746861742061726520> Tj
 ET
@@ -8321,7 +8370,7 @@ ET
 1.281 Tw
 
 BT
-400.9753928571428 69.89600000000024 Td
+400.9753928571428 54.11600000000027 Td
 /F6.0 10.5 Tf
 <436f6d70617261626c65> Tj
 ET
@@ -8336,7 +8385,7 @@ ET
 1.281 Tw
 
 BT
-453.4753928571428 69.89600000000024 Td
+453.4753928571428 54.11600000000027 Td
 /F1.0 10.5 Tf
 <20616e64206172652068656c6420696e2061> Tj
 ET
@@ -8345,36 +8394,6 @@ ET
 0.000 Tw
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.694 0.129 0.275 scn
-0.694 0.129 0.275 SCN
-
-1.989 Tw
-
-BT
-48.24000000000001 54.11600000000024 Td
-/F6.0 10.5 Tf
-<536f72746564536574> Tj
-ET
-
-
-0.000 Tw
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-1.989 Tw
-
-BT
-95.49000000000001 54.11600000000024 Td
-/F1.0 10.5 Tf
-<292c2069742070726f766964657320746865206162696c69747920746f20656e73757265207468617420646966666572656e7420696e7374616e6365732061726520756e69717565207768656e20636f6d7061726564> Tj
-ET
-
-
-0.000 Tw
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
 q
 0.000 0.000 0.000 scn
 0.000 0.000 0.000 SCN
@@ -8411,10 +8430,10 @@ endobj
 /F2.0 16 0 R
 /F3.1 35 0 R
 >>
-/XObject << /Stamp1 355 0 R
+/XObject << /Stamp1 357 0 R
 >>
 >>
-/Annots [72 0 R 73 0 R 74 0 R]
+/Annots [72 0 R 73 0 R 74 0 R 75 0 R 76 0 R]
 >>
 endobj
 71 0 obj
@@ -8438,7 +8457,7 @@ endobj
 /URI (ugfun.pdf#_ugfun_how-tos_entity-relationships_managed-1-to-m-bidirectional-relationships)
 >>
 /Subtype /Link
-/Rect [182.83216666666667 486.4700000000003 205.66966666666667 500.7500000000003]
+/Rect [187.83921794871793 486.4700000000003 210.67671794871796 500.7500000000003]
 /Type /Annot
 >>
 endobj
@@ -8446,27 +8465,79 @@ endobj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
-/URI (dg.pdf#_dg_ide-templates)
+/URI (dg.pdf#_dg_ide_intellij_live-templates)
 >>
 /Subtype /Link
-/Rect [307.1836666666667 486.4700000000003 376.7986666666667 500.7500000000003]
+/Rect [516.7384999999999 486.4700000000003 535.04 500.7500000000003]
 /Type /Annot
 >>
 endobj
 75 0 obj
-<< /Length 22612
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (dg.pdf#_dg_ide_intellij_live-templates)
+>>
+/Subtype /Link
+/Rect [125.80666666666667 470.69000000000034 228.52816666666666 484.9700000000003]
+/Type /Annot
+>>
+endobj
+76 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (dg.pdf#_dg_ide_eclipse_editor-templates)
+>>
+/Subtype /Link
+/Rect [236.9911666666667 470.69000000000034 374.1001666666667 484.9700000000003]
+/Type /Annot
+>>
+endobj
+77 0 obj
+<< /Length 23221
 >>
 stream
 q
 /DeviceRGB cs
-0.200 0.200 0.200 scn
+0.694 0.129 0.275 scn
 /DeviceRGB CS
+0.694 0.129 0.275 SCN
+
+1.989 Tw
+
+BT
+48.24 794.6759999999999 Td
+/F6.0 10.5 Tf
+<536f72746564536574> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+1.989 Tw
+
+BT
+95.49000000000001 794.6759999999999 Td
+/F1.0 10.5 Tf
+<292c2069742070726f766964657320746865206162696c69747920746f20656e73757265207468617420646966666572656e7420696e7374616e6365732061726520756e69717565207768656e20636f6d7061726564> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 3.389 Tw
 
 BT
-48.24 794.6759999999999 Td
+48.24 778.896 Td
 /F1.0 10.5 Tf
 <616761696e73742065616368206f746865722e204966206e6f20> Tj
 ET
@@ -8481,7 +8552,7 @@ ET
 3.389 Tw
 
 BT
-188.28743038504464 794.6759999999999 Td
+188.28743038504464 778.896 Td
 /F6.0 10.5 Tf
 <496e7374616e746961746f72> Tj
 ET
@@ -8496,7 +8567,7 @@ ET
 3.389 Tw
 
 BT
-251.28743038504464 794.6759999999999 Td
+251.28743038504464 778.896 Td
 /F1.0 10.5 Tf
 [<2069732070726f76696465642c207468656e2074686520636f6e7472> 20.01953125 <61637420746573742073696d706c7920617474656d70747320746f>] TJ
 ET
@@ -8509,7 +8580,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 778.896 Td
+48.24 763.116 Td
 /F1.0 10.5 Tf
 <696e7374616e7469617465732074686520636c6173732e> Tj
 ET
@@ -8522,7 +8593,7 @@ ET
 3.412 Tw
 
 BT
-48.24 751.116 Td
+48.24 735.3359999999999 Td
 /F1.0 10.5 Tf
 [<496620616e> 20.01953125 <79206f662074686520737570706f7274696e67206d6574686f64732028>] TJ
 ET
@@ -8537,7 +8608,7 @@ ET
 3.412 Tw
 
 BT
-238.5300431463068 751.116 Td
+238.5300431463068 735.3359999999999 Td
 /F6.0 10.5 Tf
 <616464546f5878782829> Tj
 ET
@@ -8552,7 +8623,7 @@ ET
 3.412 Tw
 
 BT
-291.0300431463068 751.116 Td
+291.0300431463068 735.3359999999999 Td
 /F1.0 10.5 Tf
 <2c20> Tj
 ET
@@ -8567,7 +8638,7 @@ ET
 3.412 Tw
 
 BT
-299.7868345170454 751.116 Td
+299.7868345170454 735.3359999999999 Td
 /F6.0 10.5 Tf
 <72656d6f766546726f6d5878782829> Tj
 ET
@@ -8582,7 +8653,7 @@ ET
 3.412 Tw
 
 BT
-378.53683451704546 751.116 Td
+378.53683451704546 735.3359999999999 Td
 /F1.0 10.5 Tf
 <2c20> Tj
 ET
@@ -8597,7 +8668,7 @@ ET
 3.412 Tw
 
 BT
-387.2936258877841 751.116 Td
+387.2936258877841 735.3359999999999 Td
 /F6.0 10.5 Tf
 <6d6f646966795878782829> Tj
 ET
@@ -8612,7 +8683,7 @@ ET
 3.412 Tw
 
 BT
-445.0436258877841 751.116 Td
+445.0436258877841 735.3359999999999 Td
 /F1.0 10.5 Tf
 <206f7220> Tj
 ET
@@ -8627,7 +8698,7 @@ ET
 3.412 Tw
 
 BT
-468.3112086292614 751.116 Td
+468.3112086292614 735.3359999999999 Td
 /F6.0 10.5 Tf
 <636c6561725878782829> Tj
 ET
@@ -8642,7 +8713,7 @@ ET
 3.412 Tw
 
 BT
-520.8112086292614 751.116 Td
+520.8112086292614 735.3359999999999 Td
 /F1.0 10.5 Tf
 <2920617265> Tj
 ET
@@ -8655,7 +8726,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 735.336 Td
+48.24 719.5559999999999 Td
 /F1.0 10.5 Tf
 <6d697373696e672c207468652072656c6174696f6e7368697020697320736b69707065642e> Tj
 ET
@@ -8668,7 +8739,7 @@ ET
 0.621 Tw
 
 BT
-48.24 707.556 Td
+48.24 691.776 Td
 /F1.0 10.5 Tf
 [<54> 29.78515625 <6f207365652077686174d57320676f696e67206f6e2028616e6420746f206964656e7469667920616e> 20.01953125 <7920736b69707065642072656c6174696f6e7368697073292c207573652074686520>] TJ
 ET
@@ -8683,7 +8754,7 @@ ET
 0.621 Tw
 
 BT
-426.5715750558036 707.556 Td
+426.5715750558036 691.776 Td
 /F6.0 10.5 Tf
 <776974684c6f6767696e67546f2829> Tj
 ET
@@ -8698,7 +8769,7 @@ ET
 0.621 Tw
 
 BT
-505.3215750558036 707.556 Td
+505.3215750558036 691.776 Td
 /F1.0 10.5 Tf
 <206d6574686f64> Tj
 ET
@@ -8713,7 +8784,7 @@ ET
 1.452 Tw
 
 BT
-48.24 691.7760000000001 Td
+48.24 675.996 Td
 /F1.0 10.5 Tf
 [<63616c6c2e20496620616e> 20.01953125 <7920617373657274696f6e206661696c73207468656e20746865206572726f722073686f756c6420626520646573637269707469766520656e6f75676820746f20666967757265206f7574207468652070726f626c656d>] TJ
 ET
@@ -8726,7 +8797,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 675.9960000000001 Td
+48.24 660.216 Td
 /F1.0 10.5 Tf
 <28776974686f757420656e61626c696e67206c6f6767696e67292e> Tj
 ET
@@ -8737,7 +8808,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 648.216 Td
+48.24 632.4359999999999 Td
 /F1.0 10.5 Tf
 <546865206578616d706c652074657374732063616e20626520666f756e6420> Tj
 ET
@@ -8748,7 +8819,7 @@ ET
 0.259 0.545 0.792 SCN
 
 BT
-208.23900000000003 648.216 Td
+208.23900000000003 632.4359999999999 Td
 /F1.0 10.5 Tf
 <68657265> Tj
 ET
@@ -8759,7 +8830,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-231.07650000000004 648.216 Td
+231.07650000000004 632.4359999999999 Td
 /F1.0 10.5 Tf
 <2e> Tj
 ET
@@ -8770,7 +8841,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 613.7160000000001 Td
+48.24 597.936 Td
 /F2.0 13 Tf
 <332e312e332e20496e6a6563746564205365727669636573204d6574686f64> Tj
 ET
@@ -8783,7 +8854,7 @@ ET
 2.901 Tw
 
 BT
-48.24 587.1560000000002 Td
+48.24 571.3760000000001 Td
 /F1.0 10.5 Tf
 <497420697320717569746520636f6d6d6f6e20666f7220736f6d6520626173696320736572766963657320746f20626520696e6a656374656420696e20612070726f6a6563742d737065636966696320646f6d61696e206f626a656374> Tj
 ET
@@ -8796,7 +8867,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 571.3760000000002 Td
+48.24 555.5960000000001 Td
 /F1.0 10.5 Tf
 <7375706572636c6173733b20666f72206578616d706c65206120> Tj
 ET
@@ -8807,7 +8878,7 @@ ET
 0.694 0.129 0.275 SCN
 
 BT
-177.894 571.3760000000002 Td
+177.894 555.5960000000001 Td
 /F6.0 10.5 Tf
 <436c6f636b53657276696365> Tj
 ET
@@ -8818,7 +8889,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-240.894 571.3760000000002 Td
+240.894 555.5960000000001 Td
 /F1.0 10.5 Tf
 [<206d696768742067656e6572> 20.01953125 <616c6c7920626520696e6a656374656420657665727977686572653a>] TJ
 ET
@@ -8827,28 +8898,28 @@ ET
 0.000 0.000 0.000 scn
 q
 0.961 0.961 0.961 scn
-52.240 555.560 m
-543.040 555.560 l
-545.249 555.560 547.040 553.769 547.040 551.560 c
-547.040 478.600 l
-547.040 476.391 545.249 474.600 543.040 474.600 c
-52.240 474.600 l
-50.031 474.600 48.240 476.391 48.240 478.600 c
-48.240 551.560 l
-48.240 553.769 50.031 555.560 52.240 555.560 c
+52.240 539.780 m
+543.040 539.780 l
+545.249 539.780 547.040 537.989 547.040 535.780 c
+547.040 462.820 l
+547.040 460.611 545.249 458.820 543.040 458.820 c
+52.240 458.820 l
+50.031 458.820 48.240 460.611 48.240 462.820 c
+48.240 535.780 l
+48.240 537.989 50.031 539.780 52.240 539.780 c
 h
 f
 0.800 0.800 0.800 SCN
 0.75 w
-52.240 555.560 m
-543.040 555.560 l
-545.249 555.560 547.040 553.769 547.040 551.560 c
-547.040 478.600 l
-547.040 476.391 545.249 474.600 543.040 474.600 c
-52.240 474.600 l
-50.031 474.600 48.240 476.391 48.240 478.600 c
-48.240 551.560 l
-48.240 553.769 50.031 555.560 52.240 555.560 c
+52.240 539.780 m
+543.040 539.780 l
+545.249 539.780 547.040 537.989 547.040 535.780 c
+547.040 462.820 l
+547.040 460.611 545.249 458.820 543.040 458.820 c
+52.240 458.820 l
+50.031 458.820 48.240 460.611 48.240 462.820 c
+48.240 535.780 l
+48.240 537.989 50.031 539.780 52.240 539.780 c
 h
 S
 Q
@@ -8856,7 +8927,7 @@ Q
 0.000 0.533 0.000 SCN
 
 BT
-59.24 532.7350000000004 Td
+59.24 516.9550000000002 Td
 /F7.0 11 Tf
 <7075626c6963> Tj
 ET
@@ -8867,7 +8938,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-92.24000000000001 532.7350000000004 Td
+92.24000000000001 516.9550000000002 Td
 /F6.0 11 Tf
 <20> Tj
 ET
@@ -8878,7 +8949,7 @@ ET
 0.000 0.533 0.000 SCN
 
 BT
-97.74000000000001 532.7350000000004 Td
+97.74000000000001 516.9550000000002 Td
 /F7.0 11 Tf
 <6162737472616374> Tj
 ET
@@ -8889,7 +8960,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-141.74 532.7350000000004 Td
+141.74 516.9550000000002 Td
 /F6.0 11 Tf
 <20> Tj
 ET
@@ -8900,7 +8971,7 @@ ET
 0.000 0.533 0.000 SCN
 
 BT
-147.24 532.7350000000004 Td
+147.24 516.9550000000002 Td
 /F7.0 11 Tf
 <636c617373> Tj
 ET
@@ -8911,7 +8982,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-174.74 532.7350000000004 Td
+174.74 516.9550000000002 Td
 /F6.0 11 Tf
 <20> Tj
 ET
@@ -8922,7 +8993,7 @@ ET
 0.733 0.000 0.400 SCN
 
 BT
-180.24 532.7350000000004 Td
+180.24 516.9550000000002 Td
 /F7.0 11 Tf
 <4573746174696f446f6d61696e4f626a656374> Tj
 ET
@@ -8933,7 +9004,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-284.74 532.7350000000004 Td
+284.74 516.9550000000002 Td
 /F6.0 11 Tf
 <20> Tj
 ET
@@ -8944,7 +9015,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-290.24 532.7350000000004 Td
+290.24 516.9550000000002 Td
 /F6.0 11 Tf
 <7b> Tj
 ET
@@ -8955,7 +9026,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24 517.9950000000003 Td
+59.24 502.2150000000002 Td
 /F6.0 11 Tf
 <ca202020> Tj
 ET
@@ -8966,7 +9037,7 @@ ET
 0.333 0.333 0.333 SCN
 
 BT
-81.24000000000001 517.9950000000003 Td
+81.24000000000001 502.2150000000002 Td
 /F6.0 11 Tf
 <406a61766178> Tj
 ET
@@ -8977,7 +9048,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-114.24000000000001 517.9950000000003 Td
+114.24000000000001 502.2150000000002 Td
 /F6.0 11 Tf
 <2e> Tj
 ET
@@ -8988,7 +9059,7 @@ ET
 0.200 0.400 0.600 SCN
 
 BT
-119.74000000000001 517.9950000000003 Td
+119.74000000000001 502.2150000000002 Td
 /F6.0 11 Tf
 <696e6a656374> Tj
 ET
@@ -8999,7 +9070,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-152.74 517.9950000000003 Td
+152.74 502.2150000000002 Td
 /F6.0 11 Tf
 <2e> Tj
 ET
@@ -9010,7 +9081,7 @@ ET
 0.200 0.400 0.600 SCN
 
 BT
-158.24 517.9950000000003 Td
+158.24 502.2150000000002 Td
 /F6.0 11 Tf
 <496e6a656374> Tj
 ET
@@ -9021,7 +9092,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24 503.2550000000003 Td
+59.24 487.4750000000002 Td
 /F6.0 11 Tf
 <ca202020> Tj
 ET
@@ -9032,7 +9103,7 @@ ET
 0.000 0.533 0.000 SCN
 
 BT
-81.24000000000001 503.2550000000003 Td
+81.24000000000001 487.4750000000002 Td
 /F7.0 11 Tf
 <70726f746563746564> Tj
 ET
@@ -9043,7 +9114,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-130.74 503.2550000000003 Td
+130.74 487.4750000000002 Td
 /F6.0 11 Tf
 <20> Tj
 ET
@@ -9054,7 +9125,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-136.24 503.2550000000003 Td
+136.24 487.4750000000002 Td
 /F6.0 11 Tf
 <436c6f636b53657276696365> Tj
 ET
@@ -9065,7 +9136,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-202.24 503.2550000000003 Td
+202.24 487.4750000000002 Td
 /F6.0 11 Tf
 <20> Tj
 ET
@@ -9076,7 +9147,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-207.74 503.2550000000003 Td
+207.74 487.4750000000002 Td
 /F6.0 11 Tf
 <636c6f636b53657276696365> Tj
 ET
@@ -9087,7 +9158,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-273.74 503.2550000000003 Td
+273.74 487.4750000000002 Td
 /F6.0 11 Tf
 <3b> Tj
 ET
@@ -9098,7 +9169,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24 488.51500000000027 Td
+59.24 472.7350000000002 Td
 /F6.0 11 Tf
 <7d> Tj
 ET
@@ -9111,7 +9182,7 @@ ET
 0.660 Tw
 
 BT
-48.24 450.63600000000025 Td
+48.24 434.85600000000017 Td
 /F1.0 10.5 Tf
 <4966206120737562636c61737320696e616476657274616e746c79206f76657272696465732074686973206d6574686f6420616e642070726f766964657320697473206f776e20> Tj
 ET
@@ -9126,7 +9197,7 @@ ET
 0.660 Tw
 
 BT
-410.0305357142857 450.63600000000025 Td
+410.0305357142857 434.85600000000017 Td
 /F6.0 10.5 Tf
 <436c6f636b53657276696365> Tj
 ET
@@ -9141,7 +9212,7 @@ ET
 0.660 Tw
 
 BT
-473.0305357142857 450.63600000000025 Td
+473.0305357142857 434.85600000000017 Td
 /F1.0 10.5 Tf
 <206669656c642c207468656e20746865> Tj
 ET
@@ -9156,7 +9227,7 @@ ET
 1.986 Tw
 
 BT
-48.24 434.8560000000002 Td
+48.24 419.07600000000014 Td
 /F1.0 10.5 Tf
 <6669656c6420696e20746865207375706572636c6173732077696c6c206e6576657220696e697469616c697a65642e20417320796f75206d6967687420696d6167696e652c20> Tj
 ET
@@ -9171,7 +9242,7 @@ ET
 1.986 Tw
 
 BT
-405.0259583333333 434.8560000000002 Td
+405.0259583333333 419.07600000000014 Td
 /F6.0 10.5 Tf
 <4e756c6c506f696e746572457863657074696f6e> Tj
 ET
@@ -9186,7 +9257,7 @@ ET
 1.986 Tw
 
 BT
-510.0259583333333 434.8560000000002 Td
+510.0259583333333 419.07600000000014 Td
 /F1.0 10.5 Tf
 <7320636f756c64> Tj
 ET
@@ -9199,7 +9270,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 419.07600000000025 Td
+48.24 403.29600000000016 Td
 /F1.0 10.5 Tf
 <7468656e2061726973652e> Tj
 ET
@@ -9212,7 +9283,7 @@ ET
 0.094 Tw
 
 BT
-48.24 391.2960000000002 Td
+48.24 375.51600000000013 Td
 /F1.0 10.5 Tf
 [<5468697320636f6e7472> 20.01953125 <6163742074657374206175746f6d61746963616c6c7920636865636b7320746861742074686520>] TJ
 ET
@@ -9227,7 +9298,7 @@ ET
 0.094 Tw
 
 BT
-286.0999053485577 391.2960000000002 Td
+286.0999053485577 375.51600000000013 Td
 /F6.0 10.5 Tf
 <696e6a65637458787828> Tj
 ET
@@ -9242,7 +9313,7 @@ ET
 0.094 Tw
 
 BT
-338.5999053485577 391.2960000000002 Td
+338.5999053485577 375.51600000000013 Td
 /F8.0 10.5 Tf
 <c9> Tj
 ET
@@ -9257,7 +9328,7 @@ ET
 0.094 Tw
 
 BT
-349.0999053485577 391.2960000000002 Td
+349.0999053485577 375.51600000000013 Td
 /F6.0 10.5 Tf
 <29> Tj
 ET
@@ -9272,7 +9343,7 @@ ET
 0.094 Tw
 
 BT
-354.3499053485577 391.2960000000002 Td
+354.3499053485577 375.51600000000013 Td
 /F1.0 10.5 Tf
 <206d6574686f642c20746f20616c6c6f7720666f7220696e6a65637465642073657276696365732c> Tj
 ET
@@ -9285,7 +9356,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 375.5160000000002 Td
+48.24 359.7360000000001 Td
 /F1.0 10.5 Tf
 <6973206e6f74206f76657272696461626c652c20696520> Tj
 ET
@@ -9296,7 +9367,7 @@ ET
 0.694 0.129 0.275 SCN
 
 BT
-153.96450000000002 375.5160000000002 Td
+153.96450000000002 359.7360000000001 Td
 /F6.0 10.5 Tf
 <66696e616c> Tj
 ET
@@ -9307,7 +9378,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-180.21450000000002 375.5160000000002 Td
+180.21450000000002 359.7360000000001 Td
 /F1.0 10.5 Tf
 <2e> Tj
 ET
@@ -9317,8 +9388,8 @@ ET
 q
 0.5 w
 0.933 0.933 0.933 SCN
-113.807 304.360 m
-113.807 359.700 l
+113.807 288.580 m
+113.807 343.920 l
 S
 Q
 0.098 0.251 0.486 scn
@@ -9329,7 +9400,7 @@ Q
 0.098 0.251 0.486 SCN
 
 BT
-76.73933333333333 323.4500000000002 Td
+76.73933333333333 307.67000000000013 Td
 /F3.1 24 Tf
 <22> Tj
 ET
@@ -9342,7 +9413,7 @@ ET
 3.981 Tw
 
 BT
-125.80666666666667 343.7360000000002 Td
+125.80666666666667 327.95600000000013 Td
 /F1.0 10.5 Tf
 [<5468697320636f6e7472> 20.01953125 <61637420746573742069732073656d692d6f62736f6c6574653b206d6f7374206f66207468652074696d6520796f752077696c6c2077616e7420746f20757365>] TJ
 ET
@@ -9357,7 +9428,7 @@ ET
 1.263 Tw
 
 BT
-125.80666666666667 327.95600000000024 Td
+125.80666666666667 312.17600000000016 Td
 /F6.0 10.5 Tf
 <406a617661782e696e6a6563742e496e6a656374> Tj
 ET
@@ -9372,7 +9443,7 @@ ET
 1.263 Tw
 
 BT
-230.80666666666667 327.95600000000024 Td
+230.80666666666667 312.17600000000016 Td
 /F1.0 10.5 Tf
 [<206f6e206669656c64732072> 20.01953125 <6174686572207468616e2074686520>] TJ
 ET
@@ -9387,7 +9458,7 @@ ET
 1.263 Tw
 
 BT
-365.3489846354166 327.95600000000024 Td
+365.3489846354166 312.17600000000016 Td
 /F6.0 10.5 Tf
 <696e6a6563745878782829> Tj
 ET
@@ -9402,7 +9473,7 @@ ET
 1.263 Tw
 
 BT
-423.0989846354167 327.95600000000024 Td
+423.0989846354167 312.17600000000016 Td
 /F1.0 10.5 Tf
 <206d6574686f642e20205468652066656174757265> Tj
 ET
@@ -9415,7 +9486,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-125.80666666666667 312.1760000000002 Td
+125.80666666666667 296.39600000000013 Td
 /F1.0 10.5 Tf
 <64617465732066726f6d20612074696d65206265666f726520417061636865204973697320737570706f727465642074686520> Tj
 ET
@@ -9426,7 +9497,7 @@ ET
 0.694 0.129 0.275 SCN
 
 BT
-383.3296666666667 312.1760000000002 Td
+383.3296666666667 296.39600000000013 Td
 /F6.0 10.5 Tf
 <40496e6a656374> Tj
 ET
@@ -9437,7 +9508,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-420.0796666666667 312.1760000000002 Td
+420.0796666666667 296.39600000000013 Td
 /F1.0 10.5 Tf
 <20616e6e6f746174696f6e2e> Tj
 ET
@@ -9450,7 +9521,7 @@ ET
 1.410 Tw
 
 BT
-48.24000000000001 280.39600000000024 Td
+48.24000000000001 264.61600000000016 Td
 /F1.0 10.5 Tf
 [<54> 29.78515625 <6f207573652074686520636f6e7472> 20.01953125 <61637420746573742c202c20737562636c61737320>] TJ
 ET
@@ -9465,7 +9536,7 @@ ET
 1.410 Tw
 
 BT
-228.10789615885415 280.39600000000024 Td
+228.10789615885415 264.61600000000016 Td
 /F6.0 10.5 Tf
 <536f7274656453657473436f6e7472616374546573744162737472616374> Tj
 ET
@@ -9480,7 +9551,7 @@ ET
 1.410 Tw
 
 BT
-385.60789615885415 280.39600000000024 Td
+385.60789615885415 264.61600000000016 Td
 /F1.0 10.5 Tf
 <2c2073706563696679696e672074686520726f6f74207061636b61676520746f> Tj
 ET
@@ -9493,7 +9564,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 264.6160000000002 Td
+48.24000000000001 248.83600000000015 Td
 /F1.0 10.5 Tf
 <73656172636820666f7220646f6d61696e20636c61737365732e> Tj
 ET
@@ -9504,7 +9575,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 236.83600000000024 Td
+48.24000000000001 221.05600000000015 Td
 /F1.0 10.5 Tf
 [<46> 40.0390625 <6f72206578616d706c653a>] TJ
 ET
@@ -9513,28 +9584,28 @@ ET
 0.000 0.000 0.000 scn
 q
 0.961 0.961 0.961 scn
-52.240 221.020 m
-543.040 221.020 l
-545.249 221.020 547.040 219.229 547.040 217.020 c
-547.040 85.100 l
-547.040 82.891 545.249 81.100 543.040 81.100 c
-52.240 81.100 l
-50.031 81.100 48.240 82.891 48.240 85.100 c
-48.240 217.020 l
-48.240 219.229 50.031 221.020 52.240 221.020 c
+52.240 205.240 m
+543.040 205.240 l
+545.249 205.240 547.040 203.449 547.040 201.240 c
+547.040 69.320 l
+547.040 67.111 545.249 65.320 543.040 65.320 c
+52.240 65.320 l
+50.031 65.320 48.240 67.111 48.240 69.320 c
+48.240 201.240 l
+48.240 203.449 50.031 205.240 52.240 205.240 c
 h
 f
 0.800 0.800 0.800 SCN
 0.75 w
-52.240 221.020 m
-543.040 221.020 l
-545.249 221.020 547.040 219.229 547.040 217.020 c
-547.040 85.100 l
-547.040 82.891 545.249 81.100 543.040 81.100 c
-52.240 81.100 l
-50.031 81.100 48.240 82.891 48.240 85.100 c
-48.240 217.020 l
-48.240 219.229 50.031 221.020 52.240 221.020 c
+52.240 205.240 m
+543.040 205.240 l
+545.249 205.240 547.040 203.449 547.040 201.240 c
+547.040 69.320 l
+547.040 67.111 545.249 65.320 543.040 65.320 c
+52.240 65.320 l
+50.031 65.320 48.240 67.111 48.240 69.320 c
+48.240 201.240 l
+48.240 203.449 50.031 205.240 52.240 205.240 c
 h
 S
 Q
@@ -9542,7 +9613,7 @@ Q
 0.000 0.533 0.000 SCN
 
 BT
-59.24000000000001 198.19500000000022 Td
+59.24000000000001 182.41500000000013 Td
 /F7.0 11 Tf
 <7075626c6963> Tj
 ET
@@ -9553,7 +9624,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-92.24000000000001 198.19500000000022 Td
+92.24000000000001 182.41500000000013 Td
 /F6.0 11 Tf
 <20> Tj
 ET
@@ -9564,7 +9635,7 @@ ET
 0.000 0.533 0.000 SCN
 
 BT
-97.74000000000001 198.19500000000022 Td
+97.74000000000001 182.41500000000013 Td
 /F7.0 11 Tf
 <636c617373> Tj
 ET
@@ -9575,7 +9646,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-125.24000000000001 198.19500000000022 Td
+125.24000000000001 182.41500000000013 Td
 /F6.0 11 Tf
 <20> Tj
 ET
@@ -9586,7 +9657,7 @@ ET
 0.733 0.000 0.400 SCN
 
 BT
-130.74 198.19500000000022 Td
+130.74 182.41500000000013 Td
 /F7.0 11 Tf
 <496e6a656374536572766963654d6574686f644d757374426546696e616c436f6e747261637454657374416c6c> Tj
 ET
@@ -9597,7 +9668,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-378.24 198.19500000000022 Td
+378.24 182.41500000000013 Td
 /F6.0 11 Tf
 <20> Tj
 ET
@@ -9608,7 +9679,7 @@ ET
 0.000 0.533 0.000 SCN
 
 BT
-383.74 198.19500000000022 Td
+383.74 182.41500000000013 Td
 /F7.0 11 Tf
 <657874656e6473> Tj
 ET
@@ -9619,7 +9690,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-422.24 198.19500000000022 Td
+422.24 182.41500000000013 Td
 ET
 
 0.000 0.000 0.000 SCN
@@ -9628,7 +9699,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24000000000001 183.45500000000024 Td
+59.24000000000001 167.67500000000013 Td
 /F6.0 11 Tf
 <496e6a656374536572766963654d6574686f644d757374426546696e616c436f6e7472616374546573744162737472616374> Tj
 ET
@@ -9639,7 +9710,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-334.24 183.45500000000024 Td
+334.24 167.67500000000013 Td
 /F6.0 11 Tf
 <20> Tj
 ET
@@ -9650,7 +9721,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-339.74 183.45500000000024 Td
+339.74 167.67500000000013 Td
 /F6.0 11 Tf
 <7b> Tj
 ET
@@ -9661,7 +9732,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24000000000001 153.97500000000022 Td
+59.24000000000001 138.19500000000014 Td
 /F6.0 11 Tf
 <ca202020> Tj
 ET
@@ -9672,7 +9743,7 @@ ET
 0.000 0.533 0.000 SCN
 
 BT
-81.24000000000001 153.97500000000022 Td
+81.24000000000001 138.19500000000014 Td
 /F7.0 11 Tf
 <7075626c6963> Tj
 ET
@@ -9683,7 +9754,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-114.24000000000001 153.97500000000022 Td
+114.24000000000001 138.19500000000014 Td
 /F6.0 11 Tf
 <20> Tj
 ET
@@ -9694,7 +9765,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-119.74000000000001 153.97500000000022 Td
+119.74000000000001 138.19500000000014 Td
 /F6.0 11 Tf
 <496e6a656374536572766963654d6574686f644d757374426546696e616c436f6e747261637454657374416c6c> Tj
 ET
@@ -9705,7 +9776,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-367.24 153.97500000000022 Td
+367.24 138.19500000000014 Td
 /F6.0 11 Tf
 <2829> Tj
 ET
@@ -9716,7 +9787,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-378.24 153.97500000000022 Td
+378.24 138.19500000000014 Td
 /F6.0 11 Tf
 <20> Tj
 ET
@@ -9727,7 +9798,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-383.74 153.97500000000022 Td
+383.74 138.19500000000014 Td
 /F6.0 11 Tf
 <7b> Tj
 ET
@@ -9738,7 +9809,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24000000000001 139.23500000000024 Td
+59.24000000000001 123.45500000000014 Td
 /F6.0 11 Tf
 <ca20202020202020> Tj
 ET
@@ -9749,7 +9820,7 @@ ET
 0.000 0.533 0.000 SCN
 
 BT
-103.24000000000001 139.23500000000024 Td
+103.24000000000001 123.45500000000014 Td
 /F7.0 11 Tf
 <7375706572> Tj
 ET
@@ -9760,7 +9831,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-130.74 139.23500000000024 Td
+130.74 123.45500000000014 Td
 /F6.0 11 Tf
 <28> Tj
 ET
@@ -9771,7 +9842,7 @@ ET
 0.867 0.133 0.000 SCN
 
 BT
-136.24 139.23500000000024 Td
+136.24 123.45500000000014 Td
 /F6.0 11 Tf
 <226f72672e6573746174696f2e646f6d22> Tj
 ET
@@ -9782,7 +9853,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-229.74 139.23500000000024 Td
+229.74 123.45500000000014 Td
 /F6.0 11 Tf
 <293b> Tj
 ET
@@ -9793,7 +9864,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24000000000001 124.49500000000023 Td
+59.24000000000001 108.71500000000015 Td
 /F6.0 11 Tf
 <ca20202020202020> Tj
 ET
@@ -9804,7 +9875,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-103.24000000000001 124.49500000000023 Td
+103.24000000000001 108.71500000000015 Td
 /F6.0 11 Tf
 <776974684c6f6767696e67546f> Tj
 ET
@@ -9815,7 +9886,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-174.74 124.49500000000023 Td
+174.74 108.71500000000015 Td
 /F6.0 11 Tf
 <28> Tj
 ET
@@ -9826,7 +9897,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-180.24 124.49500000000023 Td
+180.24 108.71500000000015 Td
 /F6.0 11 Tf
 <53797374656d> Tj
 ET
@@ -9837,7 +9908,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-213.24 124.49500000000023 Td
+213.24 108.71500000000015 Td
 /F6.0 11 Tf
 <2e> Tj
 ET
@@ -9848,7 +9919,7 @@ ET
 0.200 0.400 0.600 SCN
 
 BT
-218.74 124.49500000000023 Td
+218.74 108.71500000000015 Td
 /F6.0 11 Tf
 <6f7574> Tj
 ET
@@ -9859,7 +9930,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-235.24 124.49500000000023 Td
+235.24 108.71500000000015 Td
 /F6.0 11 Tf
 <293b> Tj
 ET
@@ -9870,7 +9941,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24000000000001 109.75500000000024 Td
+59.24000000000001 93.97500000000015 Td
 /F6.0 11 Tf
 <ca202020> Tj
 ET
@@ -9881,7 +9952,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-81.24000000000001 109.75500000000024 Td
+81.24000000000001 93.97500000000015 Td
 /F6.0 11 Tf
 <7d> Tj
 ET
@@ -9892,7 +9963,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24000000000001 95.01500000000024 Td
+59.24000000000001 79.23500000000016 Td
 /F6.0 11 Tf
 <7d> Tj
 ET
@@ -9923,51 +9994,51 @@ Q
 
 endstream
 endobj
-76 0 obj
+78 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 75 0 R
+/Contents 77 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F1.0 8 0 R
-/F6.0 41 0 R
+/Font << /F6.0 41 0 R
+/F1.0 8 0 R
 /F2.0 16 0 R
 /F7.0 50 0 R
-/F8.0 79 0 R
+/F8.0 81 0 R
 /F3.1 35 0 R
 >>
-/XObject << /Stamp1 355 0 R
+/XObject << /Stamp1 357 0 R
 >>
 >>
-/Annots [77 0 R]
+/Annots [79 0 R]
 >>
 endobj
-77 0 obj
+79 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
 /URI (https://github.com/apache/isis/tree/master/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/bidir)
 >>
 /Subtype /Link
-/Rect [208.23900000000003 645.15 231.07650000000004 659.4300000000001]
+/Rect [208.23900000000003 629.3699999999999 231.07650000000004 643.65]
 /Type /Annot
 >>
 endobj
-78 0 obj
-[76 0 R /XYZ 0 632.4000000000001 null]
+80 0 obj
+[78 0 R /XYZ 0 616.62 null]
 endobj
-79 0 obj
+81 0 obj
 << /Type /Font
 /BaseFont /AAAAEA+mplus-1p-regular
 /Subtype /TrueType
-/FontDescriptor 419 0 R
+/FontDescriptor 421 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 421 0 R
-/ToUnicode 420 0 R
+/Widths 423 0 R
+/ToUnicode 422 0 R
 >>
 endobj
-80 0 obj
+82 0 obj
 << /Length 20014
 >>
 stream
@@ -11310,27 +11381,27 @@ Q
 
 endstream
 endobj
-81 0 obj
+83 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 80 0 R
+/Contents 82 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 16 0 R
 /F1.0 8 0 R
 /F6.0 41 0 R
 /F7.0 50 0 R
 >>
-/XObject << /Stamp1 355 0 R
+/XObject << /Stamp1 357 0 R
 >>
 >>
-/Annots [83 0 R 85 0 R]
+/Annots [85 0 R 87 0 R]
 >>
 endobj
-82 0 obj
-[81 0 R /XYZ 0 841.89 null]
+84 0 obj
+[83 0 R /XYZ 0 841.89 null]
 endobj
-83 0 obj
+85 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -11341,10 +11412,10 @@ endobj
 /Type /Annot
 >>
 endobj
-84 0 obj
-[81 0 R /XYZ 0 452.6700000000002 null]
+86 0 obj
+[83 0 R /XYZ 0 452.6700000000002 null]
 endobj
-85 0 obj
+87 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -11355,7 +11426,7 @@ endobj
 /Type /Annot
 >>
 endobj
-86 0 obj
+88 0 obj
 << /Length 23100
 >>
 stream
@@ -12847,26 +12918,26 @@ Q
 
 endstream
 endobj
-87 0 obj
+89 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 86 0 R
+/Contents 88 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F3.1 35 0 R
 /F5.0 38 0 R
 /F1.0 8 0 R
 /F6.0 41 0 R
-/F8.0 79 0 R
+/F8.0 81 0 R
 /F7.0 50 0 R
 >>
-/XObject << /Stamp1 355 0 R
+/XObject << /Stamp1 357 0 R
 >>
 >>
-/Annots [88 0 R 89 0 R 90 0 R 91 0 R 92 0 R 93 0 R 94 0 R]
+/Annots [90 0 R 91 0 R 92 0 R 93 0 R 94 0 R 95 0 R 96 0 R]
 >>
 endobj
-88 0 obj
+90 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -12877,7 +12948,7 @@ endobj
 /Type /Annot
 >>
 endobj
-89 0 obj
+91 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -12888,7 +12959,7 @@ endobj
 /Type /Annot
 >>
 endobj
-90 0 obj
+92 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -12899,7 +12970,7 @@ endobj
 /Type /Annot
 >>
 endobj
-91 0 obj
+93 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -12910,7 +12981,7 @@ endobj
 /Type /Annot
 >>
 endobj
-92 0 obj
+94 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -12921,7 +12992,7 @@ endobj
 /Type /Annot
 >>
 endobj
-93 0 obj
+95 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -12932,7 +13003,7 @@ endobj
 /Type /Annot
 >>
 endobj
-94 0 obj
+96 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -12943,7 +13014,7 @@ endobj
 /Type /Annot
 >>
 endobj
-95 0 obj
+97 0 obj
 << /Length 10666
 >>
 stream
@@ -13435,27 +13506,27 @@ Q
 
 endstream
 endobj
-96 0 obj
+98 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 95 0 R
+/Contents 97 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 16 0 R
 /F1.0 8 0 R
 /F6.0 41 0 R
 /F3.1 35 0 R
 >>
-/XObject << /Stamp1 355 0 R
+/XObject << /Stamp1 357 0 R
 >>
 >>
-/Annots [98 0 R 99 0 R]
+/Annots [100 0 R 101 0 R]
 >>
 endobj
-97 0 obj
-[96 0 R /XYZ 0 841.89 null]
+99 0 obj
+[98 0 R /XYZ 0 841.89 null]
 endobj
-98 0 obj
+100 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -13466,7 +13537,7 @@ endobj
 /Type /Annot
 >>
 endobj
-99 0 obj
+101 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -13477,10 +13548,10 @@ endobj
 /Type /Annot
 >>
 endobj
-100 0 obj
-[96 0 R /XYZ 0 556.8100000000002 null]
+102 0 obj
+[98 0 R /XYZ 0 556.8100000000002 null]
 endobj
-101 0 obj
+103 0 obj
 << /Length 44609
 >>
 stream
@@ -16598,34 +16669,34 @@ Q
 
 endstream
 endobj
-102 0 obj
+104 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 101 0 R
+/Contents 103 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F7.0 50 0 R
 /F6.0 41 0 R
-/F6.1 103 0 R
+/F6.1 105 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 355 0 R
+/XObject << /Stamp1 357 0 R
 >>
 >>
 >>
 endobj
-103 0 obj
+105 0 obj
 << /Type /Font
 /BaseFont /AAAAEB+mplus1mn-regular
 /Subtype /TrueType
-/FontDescriptor 423 0 R
+/FontDescriptor 425 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 425 0 R
-/ToUnicode 424 0 R
+/Widths 427 0 R
+/ToUnicode 426 0 R
 >>
 endobj
-104 0 obj
+106 0 obj
 << /Length 19537
 >>
 stream
@@ -17835,41 +17906,41 @@ Q
 
 endstream
 endobj
-105 0 obj
+107 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 104 0 R
+/Contents 106 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F6.1 103 0 R
+/Font << /F6.1 105 0 R
 /F1.0 8 0 R
 /F6.0 41 0 R
 /F7.0 50 0 R
 /F2.0 16 0 R
 >>
-/XObject << /Stamp1 355 0 R
+/XObject << /Stamp1 357 0 R
 >>
 >>
-/Annots [110 0 R]
+/Annots [112 0 R]
 >>
 endobj
-106 0 obj
-[105 0 R /XYZ 0 455.51 null]
+108 0 obj
+[107 0 R /XYZ 0 455.51 null]
 endobj
-107 0 obj
+109 0 obj
 << /Limits [(1-8-0-and-earlier) (_ugtst_integ-test-support_typical-usage)]
-/Names [(1-8-0-and-earlier) 134 0 R (1-9-0-code-appmanifest-code) 132 0 R (_ugtst) 13 0 R (_ugtst_aaa) 33 0 R (_ugtst_bdd-spec-support) 173 0 R (_ugtst_bdd-spec-support_bdd-tooling) 210 0 R (_ugtst_bdd-spec-support_how-it-works) 178 0 R (_ugtst_bdd-spec-support_key-classes) 183 0 R (_ugtst_bdd-spec-support_maven-configuration) 215 0 R (_ugtst_bdd-spec-support_writing-a-bdd-spec) 191 0 R (_ugtst_fixture-scripts) 221 0 R (_ugtst_fixture-scripts_api-and-usage) 226 0 R (_ugtst_fixture-scripts_api-and-usage_organizing) 268 0 R (_ugtst_fixture-scripts_sudo-service) 288 0 R (_ugtst_integ-test-support) 115 0 R (_ugtst_integ-test-support_bootstrapping) 126 0 R (_ugtst_integ-test-support_bootstrapping_IntegrationTestAbstract) 144 0 R (_ugtst_integ-test-support_maven-configuration) 166 0 R (_ugtst_integ-test-support_typical-usage) 116 0 R]
+/Names [(1-8-0-and-earlier) 136 0 R (1-9-0-code-appmanifest-code) 134 0 R (_ugtst) 13 0 R (_ugtst_aaa) 33 0 R (_ugtst_bdd-spec-support) 175 0 R (_ugtst_bdd-spec-support_bdd-tooling) 212 0 R (_ugtst_bdd-spec-support_how-it-works) 180 0 R (_ugtst_bdd-spec-support_key-classes) 185 0 R (_ugtst_bdd-spec-support_maven-configuration) 217 0 R (_ugtst_bdd-spec-support_writing-a-bdd-spec) 193 0 R (_ugtst_fixture-scripts) 223 0 R (_ugtst_fixture-scripts_api-and-usage) 228 0 R (_ugtst_fixture-scripts_api-and-usage_organizing) 270 0 R (_ugtst_fixture-scripts_sudo-service) 290 0 R (_ugtst_integ-test-support) 117 0 R (_ugtst_integ-test-support_bootstrapping) 128 0 R (_ugtst_integ-test-support_bootstrapping_IntegrationTestAbstract) 146 0 R (_ugtst_integ-test-support_maven-configuration) 168 0 R (_ugtst_integ-test-support_typical-usage) 118 0 R]
 >>
 endobj
-108 0 obj
+110 0 obj
 << /Limits [(fake-data) (xml-marshalling-support)]
-/Names [(fake-data) 56 0 R (feature-toggles) 58 0 R (firing-domain-events) 162 0 R (fixture-management) 52 0 R (further-approaches) 284 0 R (given-when-then) 51 0 R (injected-services-method) 78 0 R (integ-tests-vs-bdd-specs) 37 0 R (isisconfigurationforjdointegtests) 139 0 R (other-guides) 17 0 R (simulated-ui-code-wrapperfactory-code) 40 0 R (system-initializer) 131 0 R (unit-tests-vs-integ-tests) 34 0 R (using-the-wrapper) 160 0 R (using-within-tests) 264 0 R (value-objects) 82 0 R (wrapping-and-unwrapping) 156 0 R (xml-marshalling-support) 106 0 R]
+/Names [(fake-data) 56 0 R (feature-toggles) 58 0 R (firing-domain-events) 164 0 R (fixture-management) 52 0 R (further-approaches) 286 0 R (given-when-then) 51 0 R (injected-services-method) 80 0 R (integ-tests-vs-bdd-specs) 37 0 R (isisconfigurationforjdointegtests) 141 0 R (other-guides) 17 0 R (simulated-ui-code-wrapperfactory-code) 40 0 R (system-initializer) 133 0 R (unit-tests-vs-integ-tests) 34 0 R (using-the-wrapper) 162 0 R (using-within-tests) 266 0 R (value-objects) 84 0 R (wrapping-and-unwrapping) 158 0 R (xml-marshalling-support) 108 0 R]
 >>
 endobj
-109 0 obj
-[105 0 R /XYZ 0 362.89 null]
+111 0 obj
+[107 0 R /XYZ 0 362.89 null]
 endobj
-110 0 obj
+112 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -17880,7 +17951,7 @@ endobj
 /Type /Annot
 >>
 endobj
-111 0 obj
+113 0 obj
 << /Length 10913
 >>
 stream
@@ -18622,22 +18693,22 @@ Q
 
 endstream
 endobj
-112 0 obj
+114 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 111 0 R
+/Contents 113 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F7.0 50 0 R
 /F6.0 41 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 355 0 R
+/XObject << /Stamp1 357 0 R
 >>
 >>
 >>
 endobj
-113 0 obj
+115 0 obj
 << /Length 26834
 >>
 stream
@@ -20438,30 +20509,30 @@ Q
 
 endstream
 endobj
-114 0 obj
+116 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 113 0 R
+/Contents 115 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 16 0 R
 /F1.0 8 0 R
 /F6.0 41 0 R
 /F7.0 50 0 R
 >>
-/XObject << /Stamp1 355 0 R
+/XObject << /Stamp1 357 0 R
 >>
 >>
-/Annots [117 0 R]
+/Annots [119 0 R]
 >>
 endobj
-115 0 obj
-[114 0 R /XYZ 0 841.89 null]
+117 0 obj
+[116 0 R /XYZ 0 841.89 null]
 endobj
-116 0 obj
-[114 0 R /XYZ 0 584.9300000000003 null]
+118 0 obj
+[116 0 R /XYZ 0 584.9300000000003 null]
 endobj
-117 0 obj
+119 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -20472,7 +20543,7 @@ endobj
 /Type /Annot
 >>
 endobj
-118 0 obj
+120 0 obj
 << /Length 35332
 >>
 stream
@@ -22962,24 +23033,24 @@ Q
 
 endstream
 endobj
-119 0 obj
+121 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 118 0 R
+/Contents 120 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F7.0 50 0 R
 /F6.0 41 0 R
-/F6.1 103 0 R
+/F6.1 105 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 355 0 R
+/XObject << /Stamp1 357 0 R
 >>
 >>
-/Annots [120 0 R]
+/Annots [122 0 R]
 >>
 endobj
-120 0 obj
+122 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -22990,7 +23061,7 @@ endobj
 /Type /Annot
 >>
 endobj
-121 0 obj
+123 0 obj
 << /Length 23586
 >>
 stream
@@ -24490,25 +24561,25 @@ Q
 
 endstream
 endobj
-122 0 obj
+124 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 121 0 R
+/Contents 123 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F6.1 103 0 R
+/Font << /F6.1 105 0 R
 /F1.0 8 0 R
 /F6.0 41 0 R
 /F7.0 50 0 R
 /F2.0 16 0 R
 >>
-/XObject << /Stamp1 355 0 R
+/XObject << /Stamp1 357 0 R
 >>
 >>
-/Annots [123 0 R 124 0 R 125 0 R 127 0 R 128 0 R]
+/Annots [125 0 R 126 0 R 127 0 R 129 0 R 130 0 R]
 >>
 endobj
-123 0 obj
+125 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -24519,7 +24590,7 @@ endobj
 /Type /Annot
 >>
 endobj
-124 0 obj
+126 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -24530,7 +24601,7 @@ endobj
 /Type /Annot
 >>
 endobj
-125 0 obj
+127 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -24541,10 +24612,10 @@ endobj
 /Type /Annot
 >>
 endobj
-126 0 obj
-[122 0 R /XYZ 0 274.47 null]
+128 0 obj
+[124 0 R /XYZ 0 274.47 null]
 endobj
-127 0 obj
+129 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -24555,7 +24626,7 @@ endobj
 /Type /Annot
 >>
 endobj
-128 0 obj
+130 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -24566,7 +24637,7 @@ endobj
 /Type /Annot
 >>
 endobj
-129 0 obj
+131 0 obj
 << /Length 31603
 >>
 stream
@@ -26727,30 +26798,30 @@ Q
 
 endstream
 endobj
-130 0 obj
+132 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 129 0 R
+/Contents 131 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 16 0 R
 /F1.0 8 0 R
 /F6.0 41 0 R
 /F7.0 50 0 R
 >>
-/XObject << /Stamp1 355 0 R
+/XObject << /Stamp1 357 0 R
 >>
 >>
-/Annots [133 0 R]
+/Annots [135 0 R]
 >>
 endobj
-131 0 obj
-[130 0 R /XYZ 0 841.89 null]
+133 0 obj
+[132 0 R /XYZ 0 841.89 null]
 endobj
-132 0 obj
-[130 0 R /XYZ 0 733.8500000000001 null]
+134 0 obj
+[132 0 R /XYZ 0 733.8500000000001 null]
 endobj
-133 0 obj
+135 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -26761,10 +26832,10 @@ endobj
 /Type /Annot
 >>
 endobj
-134 0 obj
-[130 0 R /XYZ 0 184.1300000000003 null]
+136 0 obj
+[132 0 R /XYZ 0 184.1300000000003 null]
 endobj
-135 0 obj
+137 0 obj
 << /Length 37903
 >>
 stream
@@ -29422,23 +29493,23 @@ Q
 
 endstream
 endobj
-136 0 obj
+138 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 135 0 R
+/Contents 137 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F7.0 50 0 R
 /F6.0 41 0 R
-/F6.1 103 0 R
+/F6.1 105 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 355 0 R
+/XObject << /Stamp1 357 0 R
 >>
 >>
 >>
 endobj
-137 0 obj
+139 0 obj
 << /Length 27786
 >>
 stream
@@ -31311,26 +31382,26 @@ Q
 
 endstream
 endobj
-138 0 obj
+140 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 137 0 R
+/Contents 139 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 16 0 R
 /F1.0 8 0 R
 /F6.0 41 0 R
 /F5.0 38 0 R
 >>
-/XObject << /Stamp1 355 0 R
+/XObject << /Stamp1 357 0 R
 >>
 >>
 >>
 endobj
-139 0 obj
-[138 0 R /XYZ 0 841.89 null]
+141 0 obj
+[140 0 R /XYZ 0 841.89 null]
 endobj
-140 0 obj
+142 0 obj
 << /Length 24603
 >>
 stream
@@ -32948,28 +33019,28 @@ Q
 
 endstream
 endobj
-141 0 obj
+143 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 140 0 R
+/Contents 142 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 16 0 R
 /F6.0 41 0 R
 /F1.0 8 0 R
 /F7.0 50 0 R
-/F6.1 103 0 R
+/F6.1 105 0 R
 >>
-/XObject << /Stamp1 355 0 R
+/XObject << /Stamp1 357 0 R
 >>
 >>
-/Annots [143 0 R]
+/Annots [145 0 R]
 >>
 endobj
-142 0 obj
-[141 0 R /XYZ 0 657.9300000000001 null]
+144 0 obj
+[143 0 R /XYZ 0 657.9300000000001 null]
 endobj
-143 0 obj
+145 0 obj
 << /Border [0 0 0]
 /Dest (_ugtst_bdd-spec-support)
 /Subtype /Link
@@ -32977,10 +33048,10 @@ endobj
 /Type /Annot
 >>
 endobj
-144 0 obj
-[141 0 R /XYZ 0 304.4900000000002 null]
+146 0 obj
+[143 0 R /XYZ 0 304.4900000000002 null]
 endobj
-145 0 obj
+147 0 obj
 << /Length 26775
 >>
 stream
@@ -34710,27 +34781,27 @@ Q
 
 endstream
 endobj
-146 0 obj
+148 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 145 0 R
+/Contents 147 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F6.0 41 0 R
 /F7.0 50 0 R
-/F6.1 103 0 R
+/F6.1 105 0 R
 /F1.0 8 0 R
-/F8.0 79 0 R
+/F8.0 81 0 R
 /F2.0 16 0 R
 /F3.1 35 0 R
 >>
-/XObject << /Stamp1 355 0 R
+/XObject << /Stamp1 357 0 R
 >>
 >>
-/Annots [147 0 R 148 0 R 150 0 R 151 0 R 152 0 R]
+/Annots [149 0 R 150 0 R 152 0 R 153 0 R 154 0 R]
 >>
 endobj
-147 0 obj
+149 0 obj
 << /Border [0 0 0]
 /Dest (_ugtst_unit-test-support_jmock-extensions)
 /Subtype /Link
@@ -34738,7 +34809,7 @@ endobj
 /Type /Annot
 >>
 endobj
-148 0 obj
+150 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -34749,10 +34820,10 @@ endobj
 /Type /Annot
 >>
 endobj
-149 0 obj
-[146 0 R /XYZ 0 377.2100000000001 null]
+151 0 obj
+[148 0 R /XYZ 0 377.2100000000001 null]
 endobj
-150 0 obj
+152 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -34763,7 +34834,7 @@ endobj
 /Type /Annot
 >>
 endobj
-151 0 obj
+153 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -34774,7 +34845,7 @@ endobj
 /Type /Annot
 >>
 endobj
-152 0 obj
+154 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -34785,7 +34856,7 @@ endobj
 /Type /Annot
 >>
 endobj
-153 0 obj
+155 0 obj
 << /Length 15359
 >>
 stream
@@ -35723,25 +35794,25 @@ Q
 
 endstream
 endobj
-154 0 obj
+156 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 153 0 R
+/Contents 155 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F6.0 41 0 R
 /F2.0 16 0 R
-/F8.0 79 0 R
-/F1.1 157 0 R
+/F8.0 81 0 R
+/F1.1 159 0 R
 >>
-/XObject << /I2 155 0 R
-/Stamp1 355 0 R
+/XObject << /I2 157 0 R
+/Stamp1 357 0 R
 >>
 >>
 >>
 endobj
-155 0 obj
+157 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 336
@@ -35782,21 +35853,21 @@ soH
 ���~P�~�����%���~�	�'�H(����ylB��@4J��I�b\l$p�&��'�H(���p��]�~w����p��]�~w����p��]�~w����p��]�~w����p��]�~w����p��]�~w����p��]�~w����p��]�~w����p���
 endstream
 endobj
-156 0 obj
-[154 0 R /XYZ 0 403.62356828193845 null]
+158 0 obj
+[156 0 R /XYZ 0 403.62356828193845 null]
 endobj
-157 0 obj
+159 0 obj
 << /Type /Font
 /BaseFont /AAAAEC+NotoSerif
 /Subtype /TrueType
-/FontDescriptor 427 0 R
+/FontDescriptor 429 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 429 0 R
-/ToUnicode 428 0 R
+/Widths 431 0 R
+/ToUnicode 430 0 R
 >>
 endobj
-158 0 obj
+160 0 obj
 << /Length 29659
 >>
 stream
@@ -37762,31 +37833,31 @@ Q
 
 endstream
 endobj
-159 0 obj
+161 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 158 0 R
+/Contents 160 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F6.0 41 0 R
 /F1.0 8 0 R
-/F8.0 79 0 R
+/F8.0 81 0 R
 /F2.0 16 0 R
 /F4.0 36 0 R
 /F3.1 35 0 R
 /F5.0 38 0 R
 /F7.0 50 0 R
 >>
-/XObject << /Stamp1 355 0 R
+/XObject << /Stamp1 357 0 R
 >>
 >>
-/Annots [161 0 R]
+/Annots [163 0 R]
 >>
 endobj
-160 0 obj
-[159 0 R /XYZ 0 698.85 null]
+162 0 obj
+[161 0 R /XYZ 0 698.85 null]
 endobj
-161 0 obj
+163 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -37797,10 +37868,10 @@ endobj
 /Type /Annot
 >>
 endobj
-162 0 obj
-[159 0 R /XYZ 0 303.09000000000026 null]
+164 0 obj
+[161 0 R /XYZ 0 303.09000000000026 null]
 endobj
-163 0 obj
+165 0 obj
 << /Length 28634
 >>
 stream
@@ -39819,27 +39890,27 @@ Q
 
 endstream
 endobj
-164 0 obj
+166 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 163 0 R
+/Contents 165 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F6.0 41 0 R
 /F7.0 50 0 R
-/F6.1 103 0 R
-/F8.0 79 0 R
+/F6.1 105 0 R
+/F8.0 81 0 R
 /F3.1 35 0 R
 /F2.0 16 0 R
 >>
-/XObject << /Stamp1 355 0 R
+/XObject << /Stamp1 357 0 R
 >>
 >>
-/Annots [165 0 R 167 0 R 168 0 R]
+/Annots [167 0 R 169 0 R 170 0 R]
 >>
 endobj
-165 0 obj
+167 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -39850,10 +39921,10 @@ endobj
 /Type /Annot
 >>
 endobj
-166 0 obj
-[164 0 R /XYZ 0 200.7800000000001 null]
+168 0 obj
+[166 0 R /XYZ 0 200.7800000000001 null]
 endobj
-167 0 obj
+169 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -39864,7 +39935,7 @@ endobj
 /Type /Annot
 >>
 endobj
-168 0 obj
+170 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -39875,7 +39946,7 @@ endobj
 /Type /Annot
 >>
 endobj
-169 0 obj
+171 0 obj
 << /Length 15707
 >>
 stream
@@ -40920,22 +40991,22 @@ Q
 
 endstream
 endobj
-170 0 obj
+172 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 169 0 R
+/Contents 171 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F7.0 50 0 R
 /F6.0 41 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 355 0 R
+/XObject << /Stamp1 357 0 R
 >>
 >>
 >>
 endobj
-171 0 obj
+173 0 obj
 << /Length 15550
 >>
 stream
@@ -41764,11 +41835,11 @@ Q
 
 endstream
 endobj
-172 0 obj
+174 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 171 0 R
+/Contents 173 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 16 0 R
 /F1.0 8 0 R
@@ -41776,21 +41847,21 @@ endobj
 /F3.1 35 0 R
 /F6.0 41 0 R
 >>
-/XObject << /Stamp1 355 0 R
+/XObject << /Stamp1 357 0 R
 >>
 >>
-/Annots [175 0 R 176 0 R 177 0 R 179 0 R 180 0 R 181 0 R 182 0 R 184 0 R]
+/Annots [177 0 R 178 0 R 179 0 R 181 0 R 182 0 R 183 0 R 184 0 R 186 0 R]
 >>
 endobj
-173 0 obj
-[172 0 R /XYZ 0 841.89 null]
+175 0 obj
+[174 0 R /XYZ 0 841.89 null]
 endobj
-174 0 obj
+176 0 obj
 << /Limits [(_ugtst_integ-test-support_wrapper-factory) (dependency-injection)]
-/Names [(_ugtst_integ-test-support_wrapper-factory) 149 0 R (_ugtst_unit-test-support) 64 0 R (_ugtst_unit-test-support_contract-tests) 65 0 R (_ugtst_unit-test-support_jmock-extensions) 84 0 R (_ugtst_unit-test-support_maven-configuration) 109 0 R (_ugtst_unit-test-support_soap-fake-server-junit-rule) 97 0 R (abstract-class) 142 0 R (bidirectional) 71 0 R (code-cukeglueabstract-code) 190 0 R (code-fixturescript-code) 252 0 R (code-fixturescripts-code) 227 0 R (code-isissystemfortest-code) 185 0 R (code-scenarioexecution-code) 188 0 R (code-soapendpointpublishingrule-code) 100 0 R (code-sortedset-code-s) 67 0 R (code-wrapperfactory-code) 189 0 R (dependency-injection) 47 0 R]
+/Names [(_ugtst_integ-test-support_wrapper-factory) 151 0 R (_ugtst_unit-test-support) 64 0 R (_ugtst_unit-test-support_contract-tests) 65 0 R (_ugtst_unit-test-support_jmock-extensions) 86 0 R (_ugtst_unit-test-support_maven-configuration) 111 0 R (_ugtst_unit-test-support_soap-fake-server-junit-rule) 99 0 R (abstract-class) 144 0 R (bidirectional) 71 0 R (code-cukeglueabstract-code) 192 0 R (code-fixturescript-code) 254 0 R (code-fixturescripts-code) 229 0 R (code-isissystemfortest-code) 187 0 R (code-scenarioexecution-code) 190 0 R (code-soapendpointpublishingrule-code) 102 0 R (code-sortedset-code-s) 67 0 R (code-wrapperfactory-code) 191 0 R (dependency-injection) 47 0 R]
 >>
 endobj
-175 0 obj
+177 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -41801,7 +41872,7 @@ endobj
 /Type /Annot
 >>
 endobj
-176 0 obj
+178 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -41812,7 +41883,7 @@ endobj
 /Type /Annot
 >>
 endobj
-177 0 obj
+179 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -41823,10 +41894,10 @@ endobj
 /Type /Annot
 >>
 endobj
-178 0 obj
-[172 0 R /XYZ 0 508.2500000000001 null]
+180 0 obj
+[174 0 R /XYZ 0 508.2500000000001 null]
 endobj
-179 0 obj
+181 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -41837,7 +41908,7 @@ endobj
 /Type /Annot
 >>
 endobj
-180 0 obj
+182 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -41848,7 +41919,7 @@ endobj
 /Type /Annot
 >>
 endobj
-181 0 obj
+183 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -41859,7 +41930,7 @@ endobj
 /Type /Annot
 >>
 endobj
-182 0 obj
+184 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -41870,10 +41941,10 @@ endobj
 /Type /Annot
 >>
 endobj
-183 0 obj
-[172 0 R /XYZ 0 244.37000000000023 null]
+185 0 obj
+[174 0 R /XYZ 0 244.37000000000023 null]
 endobj
-184 0 obj
+186 0 obj
 << /Border [0 0 0]
 /Dest (_ugtst_integ-test-support)
 /Subtype /Link
@@ -41881,10 +41952,10 @@ endobj
 /Type /Annot
 >>
 endobj
-185 0 obj
-[172 0 R /XYZ 0 140.73000000000022 null]
+187 0 obj
+[174 0 R /XYZ 0 140.73000000000022 null]
 endobj
-186 0 obj
+188 0 obj
 << /Length 19277
 >>
 stream
@@ -43081,36 +43152,36 @@ Q
 
 endstream
 endobj
-187 0 obj
+189 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 186 0 R
+/Contents 188 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F2.0 16 0 R
 /F6.0 41 0 R
-/F8.0 79 0 R
+/F8.0 81 0 R
 /F3.1 35 0 R
 >>
-/XObject << /Stamp1 355 0 R
+/XObject << /Stamp1 357 0 R
 >>
 >>
 >>
 endobj
-188 0 obj
-[187 0 R /XYZ 0 778.86 null]
-endobj
-189 0 obj
-[187 0 R /XYZ 0 432.8800000000001 null]
-endobj
 190 0 obj
-[187 0 R /XYZ 0 356.0400000000001 null]
+[189 0 R /XYZ 0 778.86 null]
 endobj
 191 0 obj
-[187 0 R /XYZ 0 263.4200000000001 null]
+[189 0 R /XYZ 0 432.8800000000001 null]
 endobj
 192 0 obj
+[189 0 R /XYZ 0 356.0400000000001 null]
+endobj
+193 0 obj
+[189 0 R /XYZ 0 263.4200000000001 null]
+endobj
+194 0 obj
 << /Length 30019
 >>
 stream
@@ -45109,11 +45180,11 @@ Q
 
 endstream
 endobj
-193 0 obj
+195 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 192 0 R
+/Contents 194 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F6.0 41 0 R
@@ -45121,13 +45192,13 @@ endobj
 /F3.1 35 0 R
 /F5.0 38 0 R
 >>
-/XObject << /Stamp1 355 0 R
+/XObject << /Stamp1 357 0 R
 >>
 >>
-/Annots [194 0 R 195 0 R 196 0 R 197 0 R 198 0 R 199 0 R]
+/Annots [196 0 R 197 0 R 198 0 R 199 0 R 200 0 R 201 0 R]
 >>
 endobj
-194 0 obj
+196 0 obj
 << /Border [0 0 0]
 /Dest (_ugtst_integ-test-support)
 /Subtype /Link
@@ -45135,7 +45206,7 @@ endobj
 /Type /Annot
 >>
 endobj
-195 0 obj
+197 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -45146,7 +45217,7 @@ endobj
 /Type /Annot
 >>
 endobj
-196 0 obj
+198 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -45157,7 +45228,7 @@ endobj
 /Type /Annot
 >>
 endobj
-197 0 obj
+199 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -45168,7 +45239,7 @@ endobj
 /Type /Annot
 >>
 endobj
-198 0 obj
+200 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -45179,7 +45250,7 @@ endobj
 /Type /Annot
 >>
 endobj
-199 0 obj
+201 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -45190,7 +45261,7 @@ endobj
 /Type /Annot
 >>
 endobj
-200 0 obj
+202 0 obj
 << /Length 34724
 >>
 stream
@@ -47669,23 +47740,23 @@ Q
 
 endstream
 endobj
-201 0 obj
+203 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 200 0 R
+/Contents 202 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F6.0 41 0 R
 /F7.0 50 0 R
 >>
-/XObject << /Stamp1 355 0 R
+/XObject << /Stamp1 357 0 R
 >>
 >>
-/Annots [202 0 R 203 0 R 204 0 R]
+/Annots [204 0 R 205 0 R 206 0 R]
 >>
 endobj
-202 0 obj
+204 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -47696,7 +47767,7 @@ endobj
 /Type /Annot
 >>
 endobj
-203 0 obj
+205 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -47707,7 +47778,7 @@ endobj
 /Type /Annot
 >>
 endobj
-204 0 obj
+206 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -47718,7 +47789,7 @@ endobj
 /Type /Annot
 >>
 endobj
-205 0 obj
+207 0 obj
 << /Length 31043
 >>
 stream
@@ -49879,26 +49950,26 @@ Q
 
 endstream
 endobj
-206 0 obj
+208 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 205 0 R
+/Contents 207 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F6.0 41 0 R
 /F7.0 50 0 R
 /F3.1 35 0 R
 /F2.0 16 0 R
-/F6.1 103 0 R
+/F6.1 105 0 R
 >>
-/XObject << /Stamp1 355 0 R
+/XObject << /Stamp1 357 0 R
 >>
 >>
-/Annots [207 0 R 208 0 R 209 0 R 211 0 R 212 0 R 213 0 R 214 0 R 216 0 R]
+/Annots [209 0 R 210 0 R 211 0 R 213 0 R 214 0 R 215 0 R 216 0 R 218 0 R]
 >>
 endobj
-207 0 obj
+209 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -49909,7 +49980,7 @@ endobj
 /Type /Annot
 >>
 endobj
-208 0 obj
+210 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -49920,7 +49991,7 @@ endobj
 /Type /Annot
 >>
 endobj
-209 0 obj
+211 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -49931,10 +50002,10 @@ endobj
 /Type /Annot
 >>
 endobj
-210 0 obj
-[206 0 R /XYZ 0 426.19 null]
+212 0 obj
+[208 0 R /XYZ 0 426.19 null]
 endobj
-211 0 obj
+213 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -49945,7 +50016,7 @@ endobj
 /Type /Annot
 >>
 endobj
-212 0 obj
+214 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -49956,7 +50027,7 @@ endobj
 /Type /Annot
 >>
 endobj
-213 0 obj
+215 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -49967,7 +50038,7 @@ endobj
 /Type /Annot
 >>
 endobj
-214 0 obj
+216 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -49978,10 +50049,10 @@ endobj
 /Type /Annot
 >>
 endobj
-215 0 obj
-[206 0 R /XYZ 0 326.77 null]
+217 0 obj
+[208 0 R /XYZ 0 326.77 null]
 endobj
-216 0 obj
+218 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -49992,7 +50063,7 @@ endobj
 /Type /Annot
 >>
 endobj
-217 0 obj
+219 0 obj
 << /Length 21113
 >>
 stream
@@ -51386,22 +51457,22 @@ Q
 
 endstream
 endobj
-218 0 obj
+220 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 217 0 R
+/Contents 219 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F7.0 50 0 R
 /F6.0 41 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 355 0 R
+/XObject << /Stamp1 357 0 R
 >>
 >>
 >>
 endobj
-219 0 obj
+221 0 obj
 << /Length 14694
 >>
 stream
@@ -52144,11 +52215,11 @@ Q
 
 endstream
 endobj
-220 0 obj
+222 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 219 0 R
+/Contents 221 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 16 0 R
 /F1.0 8 0 R
@@ -52156,16 +52227,16 @@ endobj
 /F3.1 35 0 R
 /F5.0 38 0 R
 >>
-/XObject << /Stamp1 355 0 R
+/XObject << /Stamp1 357 0 R
 >>
 >>
-/Annots [222 0 R 223 0 R]
+/Annots [224 0 R 225 0 R]
 >>
 endobj
-221 0 obj
-[220 0 R /XYZ 0 841.89 null]
+223 0 obj
+[222 0 R /XYZ 0 841.89 null]
 endobj
-222 0 obj
+224 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -52176,7 +52247,7 @@ endobj
 /Type /Annot
 >>
 endobj
-223 0 obj
+225 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -52187,7 +52258,7 @@ endobj
 /Type /Annot
 >>
 endobj
-224 0 obj
+226 0 obj
 << /Length 13765
 >>
 stream
@@ -53003,29 +53074,29 @@ Q
 
 endstream
 endobj
-225 0 obj
+227 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 224 0 R
+/Contents 226 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F2.0 16 0 R
 /F6.0 41 0 R
 >>
-/XObject << /Stamp1 355 0 R
+/XObject << /Stamp1 357 0 R
 >>
 >>
-/Annots [228 0 R 229 0 R 230 0 R]
+/Annots [230 0 R 231 0 R 232 0 R]
 >>
 endobj
-226 0 obj
-[225 0 R /XYZ 0 778.11 null]
+228 0 obj
+[227 0 R /XYZ 0 778.11 null]
 endobj
-227 0 obj
-[225 0 R /XYZ 0 569.7900000000002 null]
+229 0 obj
+[227 0 R /XYZ 0 569.7900000000002 null]
 endobj
-228 0 obj
+230 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -53036,7 +53107,7 @@ endobj
 /Type /Annot
 >>
 endobj
-229 0 obj
+231 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -53047,7 +53118,7 @@ endobj
 /Type /Annot
 >>
 endobj
-230 0 obj
+232 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -53058,7 +53129,7 @@ endobj
 /Type /Annot
 >>
 endobj
-231 0 obj
+233 0 obj
 << /Length 22108
 >>
 stream
@@ -54531,24 +54602,24 @@ Q
 
 endstream
 endobj
-232 0 obj
+234 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 231 0 R
+/Contents 233 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F6.0 41 0 R
 /F7.0 50 0 R
-/F6.1 103 0 R
+/F6.1 105 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 355 0 R
+/XObject << /Stamp1 357 0 R
 >>
 >>
-/Annots [233 0 R 234 0 R 235 0 R]
+/Annots [235 0 R 236 0 R 237 0 R]
 >>
 endobj
-233 0 obj
+235 0 obj
 << /Border [0 0 0]
 /Dest (_ugtst_fixture-scripts_api-and-usage_organizing)
 /Subtype /Link
@@ -54556,7 +54627,7 @@ endobj
 /Type /Annot
 >>
 endobj
-234 0 obj
+236 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -54567,7 +54638,7 @@ endobj
 /Type /Annot
 >>
 endobj
-235 0 obj
+237 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -54578,7 +54649,7 @@ endobj
 /Type /Annot
 >>
 endobj
-236 0 obj
+238 0 obj
 << /Length 24599
 >>
 stream
@@ -56261,24 +56332,24 @@ Q
 
 endstream
 endobj
-237 0 obj
+239 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 236 0 R
+/Contents 238 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F6.0 41 0 R
-/F6.1 103 0 R
+/F6.1 105 0 R
 /F7.0 50 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 355 0 R
+/XObject << /Stamp1 357 0 R
 >>
 >>
-/Annots [238 0 R]
+/Annots [240 0 R]
 >>
 endobj
-238 0 obj
+240 0 obj
 << /Border [0 0 0]
 /Dest (_ugtst_fixture-scripts_api-and-usage_organizing)
 /Subtype /Link
@@ -56286,7 +56357,7 @@ endobj
 /Type /Annot
 >>
 endobj
-239 0 obj
+241 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 651
@@ -56431,7 +56502,7 @@ W
 �t�$I��*LgI�$I���@���
 endstream
 endobj
-240 0 obj
+242 0 obj
 << /Length 1312
 >>
 stream
@@ -56520,24 +56591,24 @@ Q
 
 endstream
 endobj
-241 0 obj
+243 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 240 0 R
+/Contents 242 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/XObject << /I3 239 0 R
-/I4 243 0 R
-/Stamp1 355 0 R
+/XObject << /I3 241 0 R
+/I4 245 0 R
+/Stamp1 357 0 R
 >>
 /Font << /F1.0 8 0 R
 /F6.0 41 0 R
 >>
 >>
-/Annots [242 0 R 244 0 R]
+/Annots [244 0 R 246 0 R]
 >>
 endobj
-242 0 obj
+244 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -56548,7 +56619,7 @@ endobj
 /Type /Annot
 >>
 endobj
-243 0 obj
+245 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 827
@@ -56688,7 +56759,7 @@ r!_
 R}�K�Ȼ�L���9�@��CDnذ�X��Q���m�R���mW/?^q�G�����L:6s���=Sf�^����V͊������m�7��k�?g���>=܌�Wnk|�gK:�ruO�ȗ�~p�����Q��8�iG�7ƻ3ߜ����o�J��{ϥ�hw����|L���Ϝ��&z߫I�k�u&<�#��l�ˤc˷��@���o�q�N�j�g�EG˹�����Ʋ�{�_\:��mF=O��9�ߜc����9淞�]W4b�ҳ�g�7�h~���m+G�������^s�w�ڷ���g�^�g�M_Cw���������o�1�](�|�[�w�8:4�ae�ų�9�ځC����}U�3ߜc��m��o�3߂������'f�|��c-ߜ��[S�]�e0�b�6><�x�9���}���>l<���Q���{zf�=����[v���;<������1��z�;�����[`��3�_�}��V��}�.�w&:�#�̬��Z���'e�wT/|�>u|�rl��M���c��
 �x���Z�IG��hffEnvO߲9|�jݤ�E�.L��\m]�|���m�Ǐ�ݰ�����t����ffV�z,\�|���|�$_�t�86��}8&��_��/?~�����}�:F:�����Ų(�9r��ÅiB�844�e�֎��affffe�BI�߻�ݻw����a:\hƟ�G�	A�_uc���0333�2w���{{�zܲu�`4��_����affffe�BIG333333�`'�����̬f��������j&�����̬f��������j&�����̬f��������j&�����̬f��������j&�����̬f��������j&�����̬f��������j&�����̬f��������j&�����̬f��������j6�t������ާ(L�����J�O?x_���!7�����̬��1�p\��W���YCh��133333�B20�`H�q��������Y�t433333��IG333333��t433333��IG333333��p:�
 ��������e��[1n�
 endstream
 endobj
-244 0 obj
+246 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -56699,7 +56770,7 @@ endobj
 /Type /Annot
 >>
 endobj
-245 0 obj
+247 0 obj
 << /Length 9076
 >>
 stream
@@ -57308,25 +57379,25 @@ Q
 
 endstream
 endobj
-246 0 obj
+248 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 245 0 R
+/Contents 247 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F6.0 41 0 R
-/F8.0 79 0 R
+/F8.0 81 0 R
 /F7.0 50 0 R
 >>
-/XObject << /I5 247 0 R
-/Stamp1 355 0 R
+/XObject << /I5 249 0 R
+/Stamp1 357 0 R
 >>
 >>
-/Annots [248 0 R 249 0 R]
+/Annots [250 0 R 251 0 R]
 >>
 endobj
-247 0 obj
+249 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 827
@@ -57485,7 +57556,7 @@ mO&
 *LGI�$I�����@x\
 endstream
 endobj
-248 0 obj
+250 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -57496,7 +57567,7 @@ endobj
 /Type /Annot
 >>
 endobj
-249 0 obj
+251 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -57507,7 +57578,7 @@ endobj
 /Type /Annot
 >>
 endobj
-250 0 obj
+252 0 obj
 << /Length 15001
 >>
 stream
@@ -58551,27 +58622,27 @@ Q
 
 endstream
 endobj
-251 0 obj
+253 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 250 0 R
+/Contents 252 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F6.0 41 0 R
 /F7.0 50 0 R
 /F1.0 8 0 R
 /F2.0 16 0 R
 >>
-/XObject << /Stamp1 355 0 R
+/XObject << /Stamp1 357 0 R
 >>
 >>
-/Annots [253 0 R]
+/Annots [255 0 R]
 >>
 endobj
-252 0 obj
-[251 0 R /XYZ 0 567.23 null]
+254 0 obj
+[253 0 R /XYZ 0 567.23 null]
 endobj
-253 0 obj
+255 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -58582,7 +58653,7 @@ endobj
 /Type /Annot
 >>
 endobj
-254 0 obj
+256 0 obj
 << /Length 59327
 >>
 stream
@@ -62868,24 +62939,24 @@ Q
 
 endstream
 endobj
-255 0 obj
+257 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 254 0 R
+/Contents 256 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F7.0 50 0 R
 /F6.0 41 0 R
-/F6.1 103 0 R
+/F6.1 105 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 355 0 R
+/XObject << /Stamp1 357 0 R
 >>
 >>
-/Annots [256 0 R]
+/Annots [258 0 R]
 >>
 endobj
-256 0 obj
+258 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -62896,7 +62967,7 @@ endobj
 /Type /Annot
 >>
 endobj
-257 0 obj
+259 0 obj
 << /Length 7862
 >>
 stream
@@ -63411,24 +63482,24 @@ Q
 
 endstream
 endobj
-258 0 obj
+260 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 257 0 R
+/Contents 259 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F6.1 103 0 R
+/Font << /F6.1 105 0 R
 /F1.0 8 0 R
 /F6.0 41 0 R
-/F8.0 79 0 R
+/F8.0 81 0 R
 >>
-/XObject << /I6 243 0 R
-/Stamp1 355 0 R
+/XObject << /I6 245 0 R
+/Stamp1 357 0 R
 >>
 >>
 >>
 endobj
-259 0 obj
+261 0 obj
 << /Length 30894
 >>
 stream
@@ -65607,24 +65678,24 @@ Q
 
 endstream
 endobj
-260 0 obj
+262 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 259 0 R
+/Contents 261 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/XObject << /I7 247 0 R
-/Stamp1 355 0 R
+/XObject << /I7 249 0 R
+/Stamp1 357 0 R
 >>
 /Font << /F1.0 8 0 R
 /F6.0 41 0 R
 /F7.0 50 0 R
-/F6.1 103 0 R

<TRUNCATED>

[2/8] isis-site git commit: ISIS-1335: improving docs for setting up file/live templates for IntelliJ, some small fixes. Also updated the cheat sheet PDF/docx

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/ec1efb3c/content/images/cheat-sheets/cover.png
----------------------------------------------------------------------
diff --git a/content/images/cheat-sheets/cover.png b/content/images/cheat-sheets/cover.png
index cb383ff..258356a 100644
Binary files a/content/images/cheat-sheets/cover.png and b/content/images/cheat-sheets/cover.png differ

http://git-wip-us.apache.org/repos/asf/isis-site/blob/ec1efb3c/content/resources/cheat-sheets/IsisCheatSheet.docx
----------------------------------------------------------------------
diff --git a/content/resources/cheat-sheets/IsisCheatSheet.docx b/content/resources/cheat-sheets/IsisCheatSheet.docx
index dfd7d82..be3757f 100644
Binary files a/content/resources/cheat-sheets/IsisCheatSheet.docx and b/content/resources/cheat-sheets/IsisCheatSheet.docx differ

http://git-wip-us.apache.org/repos/asf/isis-site/blob/ec1efb3c/content/resources/cheat-sheets/IsisCheatSheet.pdf
----------------------------------------------------------------------
diff --git a/content/resources/cheat-sheets/IsisCheatSheet.pdf b/content/resources/cheat-sheets/IsisCheatSheet.pdf
index dded201..4f2c297 100644
Binary files a/content/resources/cheat-sheets/IsisCheatSheet.pdf and b/content/resources/cheat-sheets/IsisCheatSheet.pdf differ

http://git-wip-us.apache.org/repos/asf/isis-site/blob/ec1efb3c/content/resources/templates/intellij-settings-file-templates-for-apache-isis.jar
----------------------------------------------------------------------
diff --git a/content/resources/templates/intellij-settings-file-templates-for-apache-isis.jar b/content/resources/templates/intellij-settings-file-templates-for-apache-isis.jar
deleted file mode 100644
index 2d6771c..0000000
Binary files a/content/resources/templates/intellij-settings-file-templates-for-apache-isis.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/isis-site/blob/ec1efb3c/content/resources/templates/isis-asciidoc-templates-idea.xml
----------------------------------------------------------------------
diff --git a/content/resources/templates/isis-asciidoc-templates-idea.xml b/content/resources/templates/isis-asciidoc-templates-idea.xml
deleted file mode 100644
index 6267411..0000000
--- a/content/resources/templates/isis-asciidoc-templates-idea.xml
+++ /dev/null
@@ -1,331 +0,0 @@
-<templateSet group="Isis-AsciiDoc">
-  <template name="adtbl3" value=".$tableCaption$&#10;[cols=&quot;1a,1a,1a&quot;, options=&quot;header&quot;]&#10;|===&#10;&#10;| $cell1header$ &#10;| $cell2header$&#10;| $cell3header$&#10;&#10;&#10;| $cell1row1$&#10;| $cell2row1$&#10;| $cell3row1$&#10;&#10;&#10;|&#10;|&#10;|&#10;&#10;|===" description="Table with three columns" toReformat="false" toShortenFQNames="true">
-    <variable name="tableCaption" expression="" defaultValue="&quot;Table caption&quot;" alwaysStopAt="true" />
-    <variable name="cell1header" expression="" defaultValue="&quot;Header Cell 1&quot;" alwaysStopAt="true" />
-    <variable name="cell2header" expression="" defaultValue="&quot;Header Cell 2&quot;" alwaysStopAt="true" />
-    <variable name="cell3header" expression="" defaultValue="" alwaysStopAt="true" />
-    <variable name="cell1row1" expression="" defaultValue="&quot;Row 1 Cell 1&quot;" alwaysStopAt="true" />
-    <variable name="cell2row1" expression="" defaultValue="&quot;Row 1 Cell 2&quot;" alwaysStopAt="true" />
-    <variable name="cell3row1" expression="" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adadmtip" value="[TIP]&#10;====&#10;$END$&#10;====&#10;" description="Tip admonition" toReformat="false" toShortenFQNames="true">
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adadmnote" value="[NOTE]&#10;====&#10;$END$&#10;====&#10;" description="Note admonition" toReformat="false" toShortenFQNames="true">
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adadmimportant" value="[IMPORTANT]&#10;====&#10;$END$&#10;====&#10;" description="Important admonition" toReformat="false" toShortenFQNames="true">
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adadmwarning" value="[WARNING]&#10;====&#10;$END$&#10;====&#10;" description="Warning admonition" toReformat="false" toShortenFQNames="true">
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adimgfile" value="image::{_imagesdir}$INCLUDED$/$FILE$.png[width=&quot;$END$$WIDTH$px&quot;,link=&quot;{_imagesdir}$INCLUDED$/$FILE$.png&quot;]" description="Image link to file" toReformat="false" toShortenFQNames="true">
-    <variable name="INCLUDED" expression="" defaultValue="" alwaysStopAt="true" />
-    <variable name="FILE" expression="" defaultValue="" alwaysStopAt="true" />
-    <variable name="WIDTH" expression="" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adimgurl" value="image::$URL$[width=&quot;$END$$WIDTH$px&quot;,link=&quot;$URL$&quot;]" description="Image link to URL" toReformat="false" toShortenFQNames="true">
-    <variable name="URL" expression="" defaultValue="" alwaysStopAt="true" />
-    <variable name="WIDTH" expression="" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adlink" value="link:$URL$[$TEXT$]" description="Link to URL" toReformat="false" toShortenFQNames="true">
-    <variable name="URL" expression="" defaultValue="" alwaysStopAt="true" />
-    <variable name="TEXT" expression="" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adsrcjava" value="[source,java]&#10;----&#10;$END$&#10;----&#10;" description="Source code (java)" toReformat="false" toShortenFQNames="true">
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adsrcxml" value="[source,xml]&#10;----&#10;$END$&#10;----&#10;" description="Source code (XML)" toReformat="false" toShortenFQNames="true">
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adsrcother" value="[source,$LANG$]&#10;----&#10;$END$&#10;----&#10;" description="Source code (None)" toReformat="false" toShortenFQNames="true">
-    <variable name="LANG" expression="" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adinclude" value="include::$INCLUDED$.adoc[leveloffset=+1]&#10;" description="Include" toReformat="false" toShortenFQNames="true">
-    <variable name="INCLUDED" expression="" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adlinkaddons" value="(non-ASF) link:http://isisaddons.org[Isis Addons]" description="Link to Isis Addons" toReformat="false" toShortenFQNames="true">
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adlinkaddonsmodule" value="(non-ASF) http://github.com/isisaddons/isis-module-$MODULE$[Isis addons' $MODULE$] module" description="Link to specific Isis Addons module" toReformat="false" toShortenFQNames="true">
-    <variable name="MODULE" expression="" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adtodo" value="NOTE: TODO" description="TODO note" toReformat="false" toShortenFQNames="true">
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adfootnote" value=".footnote:[$END$]" description="Footnote" toReformat="false" toShortenFQNames="true">
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adlinkaddonswicket" value="(non-ASF) http://github.com/isisaddons/isis-wicket-$WICKET$[Isis addons' $WICKET$ ] wicket extension" description="Link to specific Isis Addons wicket cpt" toReformat="false" toShortenFQNames="true">
-    <variable name="WICKET" expression="" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adlinkaddonsapp" value="(non-ASF) http://github.com/isisaddons/isis-app-$APP$[Isis addons' $APP$]" description="Link to specific Isis Addons app" toReformat="false" toShortenFQNames="true">
-    <variable name="APP" expression="" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adyoutube" value="video::$REFERENCE$[youtube,width=&quot;$WIDTH$px&quot;,height=&quot;$END$$HEIGHT$px&quot;]" description="Link to youtube" toReformat="false" toShortenFQNames="true">
-    <variable name="REFERENCE" expression="" defaultValue="" alwaysStopAt="true" />
-    <variable name="WIDTH" expression="" defaultValue="" alwaysStopAt="true" />
-    <variable name="HEIGHT" expression="" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adimgfilec" value=".$CAPTION$&#10;image::{_imagesdir}$INCLUDED$/$FILE$.png[width=&quot;$END$$WIDTH$px&quot;,link=&quot;{_imagesdir}$INCLUDED$/$FILE$.png&quot;]" description="Image link to file with caption" toReformat="false" toShortenFQNames="true">
-    <variable name="CAPTION" expression="" defaultValue="" alwaysStopAt="true" />
-    <variable name="INCLUDED" expression="" defaultValue="" alwaysStopAt="true" />
-    <variable name="FILE" expression="" defaultValue="" alwaysStopAt="true" />
-    <variable name="WIDTH" expression="" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adimgurlc" value=".$CAPTION$&#10;image::$URL$[width=&quot;$END$$WIDTH$px&quot;,link=&quot;$URL$&quot;]" description="Image link to URL with caption" toReformat="false" toShortenFQNames="true">
-    <variable name="CAPTION" expression="" defaultValue="" alwaysStopAt="true" />
-    <variable name="URL" expression="" defaultValue="" alwaysStopAt="true" />
-    <variable name="WIDTH" expression="" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adsrcjavac" value="[source,java]&#10;.$CAPTION$&#10;----&#10;$END$&#10;----&#10;" description="Source code (java) with caption" toReformat="false" toShortenFQNames="true">
-    <variable name="CAPTION" expression="" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adsrcotherc" value="[source,$LANG$]&#10;----&#10;$END$&#10;----&#10;" description="Source code (None) with caption" toReformat="false" toShortenFQNames="true">
-    <variable name="LANG" expression="" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adsrcxmlc" value="[source,xml]&#10;.$CAPTION$&#10;----&#10;$END$&#10;----&#10;" description="Source code (XML) with caption" toReformat="false" toShortenFQNames="true">
-    <variable name="CAPTION" expression="" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adsrcjavascript" value="[source,javascript]&#10;----&#10;$END$&#10;----&#10;" description="Source code (Javascript)" toReformat="false" toShortenFQNames="true">
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adsrcjavascriptc" value="[source,javascript]&#10;.$CAPTION$&#10;----&#10;$END$&#10;----&#10;" description="Source code (javascript) with caption" toReformat="false" toShortenFQNames="true">
-    <variable name="CAPTION" expression="" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-
-  <template name="adugfun" value="xref:ugfun.adoc#$bookmark$[$DisplayText$]" description="xref to fundamentals guide" toReformat="false" toShortenFQNames="true">
-    <variable name="bookmark" expression="" defaultValue="" alwaysStopAt="true" />
-    <variable name="DisplayText" expression="" defaultValue="Fundamentals Guide" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adugvw" value="xref:ugvw.adoc#$bookmark$[$DisplayText$]" description="x-ref to user guide wicket viewer" toReformat="false" toShortenFQNames="true">
-    <variable name="bookmark" expression="" defaultValue="" alwaysStopAt="true" />
-    <variable name="DisplayText" expression="" defaultValue="Wicket viewer" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adugvro" value="xref:ugvro.adoc#$bookmark$[$DisplayText$]" description="x-ref to user guide restful objects viewer" toReformat="false" toShortenFQNames="true">
-    <variable name="bookmark" expression="" defaultValue="" alwaysStopAt="true" />
-    <variable name="DisplayText" expression="" defaultValue="Wicket viewer" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adugsec" value="xref:ugsec.adoc#$bookmark$[$DisplayText$]" description="x-ref to user guide security guide" toReformat="false" toShortenFQNames="true">
-    <variable name="bookmark" expression="" defaultValue="" alwaysStopAt="true" />
-    <variable name="DisplayText" expression="" defaultValue="Security guide" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adugtst" value="xref:ugtst.adoc#$bookmark$[$DisplayText$]" description="x-ref to user guide testing guide" toReformat="false" toShortenFQNames="true">
-    <variable name="bookmark" expression="" defaultValue="" alwaysStopAt="true" />
-    <variable name="DisplayText" expression="" defaultValue="Testing guide" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adugbtb" value="xref:ugbtb.adoc#$bookmark$[$DisplayText$]" description="x-ref to user guide beyond the basics" toReformat="false" toShortenFQNames="true">
-    <variable name="bookmark" expression="" defaultValue="" alwaysStopAt="true" />
-    <variable name="DisplayText" expression="" defaultValue="Beyond the Basics guide" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-
-  <template name="adugsimpleapp" value="xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype]" description="xref to the simpleapp archetype in the user guide (fundamentals)" toReformat="false" toShortenFQNames="true">
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-
-  <template name="adrgant" value="xref:rgant.adoc#$bookmark$[$DisplayText$]" description="x-ref to ref guide (annotations)" toReformat="false" toShortenFQNames="true">
-    <variable name="bookmark" expression="" defaultValue="" alwaysStopAt="true" />
-    <variable name="DisplayText" expression="" defaultValue="Domain Services guide" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adrgsvc" value="xref:rgsvc.adoc#$bookmark$[$DisplayText$]" description="xref to ref guide (domain services)" toReformat="false" toShortenFQNames="true">
-    <variable name="bookmark" expression="" defaultValue="" alwaysStopAt="true" />
-    <variable name="DisplayText" expression="" defaultValue="Domain Services guide" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adrgcfg" value="xref:rgcfg.adoc#$bookmark$[$DisplayText$]" description="xref to ref guide (configuration properties)" toReformat="false" toShortenFQNames="true">
-    <variable name="bookmark" expression="" defaultValue="" alwaysStopAt="true" />
-    <variable name="DisplayText" expression="" defaultValue="Domain Services guide" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adrgcms" value="xref:rgcms.adoc#$bookmark$[$DisplayText$]" description="xref to ref guide (classes, methods, schema)" toReformat="false" toShortenFQNames="true">
-    <variable name="bookmark" expression="" defaultValue="" alwaysStopAt="true" />
-    <variable name="DisplayText" expression="" defaultValue="Domain Services guide" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adrgmvn" value="xref:rgmvn.adoc#$bookmark$[$DisplayText$]" description="xref to ref guide (maven plugin)" toReformat="false" toShortenFQNames="true">
-    <variable name="bookmark" expression="" defaultValue="" alwaysStopAt="true" />
-    <variable name="DisplayText" expression="" defaultValue="Domain Services guide" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-
-  <template name="adrgsa" value="xref:rgsvc.adoc#_rgsvc_api_$ServiceType$[`$ServiceType$`]" description="x-ref to ref guide manpage for service api" toReformat="false" toShortenFQNames="true">
-    <variable name="ServiceType" expression="" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adrgss" value="xref:rgsvc.adoc#_rgsvc_spi_$ServiceType$[`$ServiceType$`]" description="x-ref to ref guide manpage for service spi" toReformat="false" toShortenFQNames="true">
-    <variable name="ServiceType" expression="" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adrgna" value="xref:rgant.adoc#_rgant_$Type$[`@$Type$`]" description="x-ref to ref guide manpage for annotation" toReformat="false" toShortenFQNames="true">
-    <variable name="Type" expression="" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adrgnt" value="xref:rgant.adoc#_rgant_$Type$_$attribute$[`@$Type$#$attribute$()`]" description="x-ref to ref guide manpage for annotation's attribute" toReformat="false" toShortenFQNames="true">
-    <variable name="Type" expression="" defaultValue="" alwaysStopAt="true" />
-    <variable name="attribute" expression="" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-
-  <template name="addg" value="xref:cgcon.adoc#$bookmark$[$DisplayText$]" description="x-ref to developers' guide" toReformat="false" toShortenFQNames="true">
-    <variable name="bookmark" expression="" defaultValue="" alwaysStopAt="true" />
-    <variable name="DisplayText" expression="" defaultValue="Contributors guide" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adcgcom" value="xref:cgcom.adoc#$bookmark$[$DisplayText$]" description="x-ref to committers guide" toReformat="false" toShortenFQNames="true">
-    <variable name="bookmark" expression="" defaultValue="" alwaysStopAt="true" />
-    <variable name="DisplayText" expression="" defaultValue="Contributors guide" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-
-  <template name="adanchany" value="= anchor:$prefix$[]" description="anchor to any" toReformat="false" toShortenFQNames="true">
-    <variable name="prefix" expression="" defaultValue="chapter" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-
-  <template name="adxrefany" value="xref:$chapter$[$DisplayText$]" description="x-ref to any" toReformat="false" toShortenFQNames="true">
-    <variable name="chapter" expression="" defaultValue="" alwaysStopAt="true" />
-    <variable name="DisplayText" expression="" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-
-
-  <template name="adwip" value="NOTE: WIP - " description="WIP note" toReformat="false" toShortenFQNames="true">
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adyoutubec" value=".$CAPTION$&#10;video::$REFERENCE$[youtube,width=&quot;$WIDTH$px&quot;,height=&quot;$END$$HEIGHT$px&quot;]" description="Link to youtube with caption" toReformat="false" toShortenFQNames="true">
-    <variable name="CAPTION" expression="" defaultValue="" alwaysStopAt="true" />
-    <variable name="REFERENCE" expression="" defaultValue="" alwaysStopAt="true" />
-    <variable name="WIDTH" expression="" defaultValue="" alwaysStopAt="true" />
-    <variable name="HEIGHT" expression="" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-
-  <template name="adtg" value="xref:tg.adoc#$bookmark$[$DisplayText$]" description="x-ref to tutorials guide" toReformat="false" toShortenFQNames="true">
-    <variable name="bookmark" expression="" defaultValue="" alwaysStopAt="true" />
-    <variable name="DisplayText" expression="" defaultValue="Tutorials" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-
-</templateSet>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/isis-site/blob/ec1efb3c/content/resources/templates/isis-templates-idea.xml
----------------------------------------------------------------------
diff --git a/content/resources/templates/isis-templates-idea.xml b/content/resources/templates/isis-templates-idea.xml
deleted file mode 100644
index 6b6f195..0000000
--- a/content/resources/templates/isis-templates-idea.xml
+++ /dev/null
@@ -1,522 +0,0 @@
-<templateSet group="Apache Isis">
-  <template name="isa" value="@org.apache.isis.applib.annotation.Action()&#10;public $ReturnType$ $actionName$(final $ParameterType$ $parameterType$) {&#10;    return $END$null; // TODO: business logic here&#10;}&#10;" description="Apache Isis Action" toReformat="true" toShortenFQNames="true">
-    <variable name="actionName" expression="&quot;actionName&quot;" defaultValue="" alwaysStopAt="true" />
-    <variable name="ParameterType" expression="classNameComplete()" defaultValue="" alwaysStopAt="true" />
-    <variable name="parameterType" expression="suggestVariableName()" defaultValue="" alwaysStopAt="true" />
-    <variable name="ReturnType" expression="className()" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="HTML" value="false" />
-      <option name="XML" value="false" />
-      <option name="JAVA_CODE" value="false" />
-      <option name="JAVA_DECLARATION" value="true" />
-      <option name="JAVA_COMMENT" value="false" />
-      <option name="JAVA_STRING" value="false" />
-      <option name="COMPLETION" value="false" />
-      <option name="OTHER" value="false" />
-    </context>
-  </template>
-  <template name="isa-p-auto" value="public java.util.Collection&lt;$ParameterType$&gt; autoComplete$ParameterNum$$ActionName$(final String search) {&#10;    return $END$com.google.common.collect.Lists.newArrayList(); // TODO: return list of choices for argument N&#10;}" description="Apache Isis Action parameter auto-complete" toReformat="true" toShortenFQNames="true">
-    <variable name="ParameterNum" expression="&quot;Num&quot;" defaultValue="" alwaysStopAt="true" />
-    <variable name="ActionName" expression="&quot;ActionName&quot;" defaultValue="" alwaysStopAt="true" />
-    <variable name="ParameterType" expression="className()" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="HTML" value="false" />
-      <option name="XML" value="false" />
-      <option name="JAVA_CODE" value="false" />
-      <option name="JAVA_DECLARATION" value="true" />
-      <option name="JAVA_COMMENT" value="false" />
-      <option name="JAVA_STRING" value="false" />
-      <option name="COMPLETION" value="false" />
-      <option name="OTHER" value="false" />
-    </context>
-  </template>
-  <template name="isa-p-cho" value="public java.util.List&lt;$ParameterType$&gt; choices$ParameterNum$$ActionName$() {&#10;    return $END$com.google.common.collect.Lists.newArrayList(); // TODO: return list of choices for argument N&#10;}" description="Apache Isis Action parameter choices" toReformat="true" toShortenFQNames="true">
-    <variable name="ParameterNum" expression="&quot;Num&quot;" defaultValue="" alwaysStopAt="true" />
-    <variable name="ActionName" expression="&quot;ActionName&quot;" defaultValue="" alwaysStopAt="true" />
-    <variable name="ParameterType" expression="className()" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="HTML" value="false" />
-      <option name="XML" value="false" />
-      <option name="JAVA_CODE" value="false" />
-      <option name="JAVA_DECLARATION" value="true" />
-      <option name="JAVA_COMMENT" value="false" />
-      <option name="JAVA_STRING" value="false" />
-      <option name="COMPLETION" value="false" />
-      <option name="OTHER" value="false" />
-    </context>
-  </template>
-  <template name="isa-p-def" value="public $ParameterType$ default$ParameterNum$$ActionName$() {&#10;    return $END$null; // TODO: return default for argument N&#10;}" description="Apache Isis Action parameter defaults" toReformat="true" toShortenFQNames="true">
-    <variable name="ParameterNum" expression="&quot;Num&quot;" defaultValue="" alwaysStopAt="true" />
-    <variable name="ActionName" expression="&quot;ActionName&quot;" defaultValue="" alwaysStopAt="true" />
-    <variable name="ParameterType" expression="className()" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="HTML" value="false" />
-      <option name="XML" value="false" />
-      <option name="JAVA_CODE" value="false" />
-      <option name="JAVA_DECLARATION" value="true" />
-      <option name="JAVA_COMMENT" value="false" />
-      <option name="JAVA_STRING" value="false" />
-      <option name="COMPLETION" value="false" />
-      <option name="OTHER" value="false" />
-    </context>
-  </template>
-  <template name="isa-p-val" value="public String validate$ParamNum$$ActionName$(final $ParameterType$ $parameterType$) {&#10;    return $END$null; // TODO: return reason why action argument are invalid, null if ok&#10;}" description="Apache Isis Action parameter validation" toReformat="true" toShortenFQNames="true">
-    <variable name="ActionName" expression="&quot;ActionName&quot;" defaultValue="" alwaysStopAt="true" />
-    <variable name="ParameterType" expression="className()" defaultValue="" alwaysStopAt="true" />
-    <variable name="parameterType" expression="suggestVariableName()" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="HTML" value="false" />
-      <option name="XML" value="false" />
-      <option name="JAVA_CODE" value="false" />
-      <option name="JAVA_DECLARATION" value="true" />
-      <option name="JAVA_COMMENT" value="false" />
-      <option name="JAVA_STRING" value="false" />
-      <option name="COMPLETION" value="false" />
-      <option name="OTHER" value="false" />
-    </context>
-  </template>
-  <template name="isa-dis" value="public String disable$ActionName$() {&#10;    return $END$null; // TODO: return reason why action disabled, null if enabled&#10;}" description="Apache Isis Action disablement" toReformat="true" toShortenFQNames="true">
-    <variable name="ActionName" expression="&quot;ActionName&quot;" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="HTML" value="false" />
-      <option name="XML" value="false" />
-      <option name="JAVA_CODE" value="false" />
-      <option name="JAVA_DECLARATION" value="true" />
-      <option name="JAVA_COMMENT" value="false" />
-      <option name="JAVA_STRING" value="false" />
-      <option name="COMPLETION" value="false" />
-      <option name="OTHER" value="false" />
-    </context>
-  </template>
-  <template name="isa-event" value="public static class $ActionName$DomainEvent extends ActionDomainEvent{}&#10;@org.apache.isis.applib.annotation.Action(&#10;        domainEvent = $ActionName$DomainEvent.class&#10;)&#10;public $ReturnType$ $actionName$(final $ParameterType$ $parameterType$) {&#10;    return $END$null; // TODO: business logic here&#10;}&#10;" description="Apache Isis Action (with domain event)" toReformat="true" toShortenFQNames="true">
-    <variable name="actionName" expression="&quot;actionName&quot;" defaultValue="" alwaysStopAt="true" />
-    <variable name="ActionName" expression="capitalize(actionName)" defaultValue="" alwaysStopAt="false" />
-    <variable name="ParameterType" expression="classNameComplete()" defaultValue="" alwaysStopAt="true" />
-    <variable name="parameterType" expression="suggestVariableName()" defaultValue="" alwaysStopAt="true" />
-    <variable name="ReturnType" expression="className()" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="HTML" value="false" />
-      <option name="XML" value="false" />
-      <option name="JAVA_CODE" value="false" />
-      <option name="JAVA_DECLARATION" value="true" />
-      <option name="JAVA_COMMENT" value="false" />
-      <option name="JAVA_STRING" value="false" />
-      <option name="COMPLETION" value="false" />
-      <option name="OTHER" value="false" />
-    </context>
-  </template>
-  <template name="isa-event-decl" value="public static class $ActionName$DomainEvent extends ActionDomainEvent{}&#10;@org.apache.isis.applib.annotation.Action(&#10;        domainEvent = $ActionName$DomainEvent.class&#10;)&#10;" description="Apache Isis Action (domain event declaration only)" toReformat="true" toShortenFQNames="true">
-    <variable name="ActionName" expression="" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="HTML" value="false" />
-      <option name="XML" value="false" />
-      <option name="JAVA_CODE" value="false" />
-      <option name="JAVA_DECLARATION" value="true" />
-      <option name="JAVA_COMMENT" value="false" />
-      <option name="JAVA_STRING" value="false" />
-      <option name="COMPLETION" value="false" />
-      <option name="OTHER" value="false" />
-    </context>
-  </template>
-  <template name="isa-hid" value="public boolean hide$ActionName$() {&#10;    return $END$false; // TODO: return true if action is hidden, false if visible&#10;}" description="Apache Isis Action visibility" toReformat="true" toShortenFQNames="true">
-    <variable name="ActionName" expression="&quot;ActionName&quot;" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="HTML" value="false" />
-      <option name="XML" value="false" />
-      <option name="JAVA_CODE" value="false" />
-      <option name="JAVA_DECLARATION" value="true" />
-      <option name="JAVA_COMMENT" value="false" />
-      <option name="JAVA_STRING" value="false" />
-      <option name="COMPLETION" value="false" />
-      <option name="OTHER" value="false" />
-    </context>
-  </template>
-  <template name="isa-val" value="public String validate$ActionName$(final $ParameterType$ $parameterType$) {&#10;    return $END$null; // TODO: return reason why action arguments are invalid, null if ok&#10;}" description="Apache Isis Action validation" toReformat="true" toShortenFQNames="true">
-    <variable name="ActionName" expression="&quot;ActionName&quot;" defaultValue="" alwaysStopAt="true" />
-    <variable name="ParameterType" expression="className()" defaultValue="" alwaysStopAt="true" />
-    <variable name="parameterType" expression="suggestVariableName()" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="HTML" value="false" />
-      <option name="XML" value="false" />
-      <option name="JAVA_CODE" value="false" />
-      <option name="JAVA_DECLARATION" value="true" />
-      <option name="JAVA_COMMENT" value="false" />
-      <option name="JAVA_STRING" value="false" />
-      <option name="COMPLETION" value="false" />
-      <option name="OTHER" value="false" />
-    </context>
-  </template>
-  <template name="isc-dis" value="public String disable$CollectionName$() {&#10;    return $END$null; // TODO: return reason why collection read-only, null if editable&#10;}" description="Apache Isis Collection disablement" toReformat="true" toShortenFQNames="true">
-    <variable name="CollectionName" expression="&quot;CollectionName&quot;" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="HTML" value="false" />
-      <option name="XML" value="false" />
-      <option name="JAVA_CODE" value="false" />
-      <option name="JAVA_DECLARATION" value="true" />
-      <option name="JAVA_COMMENT" value="false" />
-      <option name="JAVA_STRING" value="false" />
-      <option name="COMPLETION" value="false" />
-      <option name="OTHER" value="false" />
-    </context>
-  </template>
-  <template name="isc-hid" value="public boolean hide$CollectionName$() {&#10;    return $END$false; // TODO: return true if hidden, false otherwise&#10;}" description="Apache Isis Collection visibility" toReformat="true" toShortenFQNames="false">
-    <variable name="CollectionName" expression="&quot;CollectionName&quot;" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="HTML" value="false" />
-      <option name="XML" value="false" />
-      <option name="JAVA_CODE" value="false" />
-      <option name="JAVA_DECLARATION" value="true" />
-      <option name="JAVA_COMMENT" value="false" />
-      <option name="JAVA_STRING" value="false" />
-      <option name="COMPLETION" value="false" />
-      <option name="OTHER" value="false" />
-    </context>
-  </template>
-  <template name="isc-jdo-1m-b-fk" value="@org.apache.isis.applib.annotation.Collection()&#10;@javax.jdo.annotations.Persistent(mappedBy=&quot;$elementNameInChild$&quot;, dependentElement=&quot;$trueOrFalse$&quot;)&#10;@lombok.Getter @lombok.Setter&#10;private java.util.SortedSet&lt;$ElementType$&gt; $collectionName$ = new java.util.TreeSet&lt;$ElementType$&gt;();&#10;" description="Apache Isis Collection (JDO, 1:m parent bidirectional to foreign key)" toReformat="true" toShortenFQNames="true">
-    <variable name="ElementType" expression="classNameComplete()" defaultValue="" alwaysStopAt="true" />
-    <variable name="collectionName" expression="suggestVariableName()" defaultValue="" alwaysStopAt="true" />
-    <variable name="elementNameInChild" expression="decapitalize(EntityName)" defaultValue="" alwaysStopAt="false" />
-    <variable name="trueOrFalse" expression="&quot;trueOrFalse&quot;" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="HTML" value="false" />
-      <option name="XML" value="false" />
-      <option name="JAVA_CODE" value="false" />
-      <option name="JAVA_DECLARATION" value="true" />
-      <option name="JAVA_COMMENT" value="false" />
-      <option name="JAVA_STRING" value="false" />
-      <option name="COMPLETION" value="false" />
-      <option name="OTHER" value="false" />
-    </context>
-  </template>
-  <template name="isc-jdo-1m-b-jt" value="@org.apache.isis.applib.annotation.Collection()&#10;@javax.jdo.annotations.Persistent(mappedBy=&quot;$elementNameInChild$&quot;, dependentElement=&quot;$trueOrFalse$&quot;)&#10;@javax.jdo.annotations.Join&#10;@lombok.Getter @lombok.Setter&#10;private java.util.SortedSet&lt;$ElementType$&gt; $collectionName$ = new java.util.TreeSet&lt;$ElementType$&gt;();&#10;" description="Apache Isis Collection (JDO, 1:m parent bidirectional to join table)" toReformat="true" toShortenFQNames="true">
-    <variable name="ElementType" expression="classNameComplete()" defaultValue="" alwaysStopAt="true" />
-    <variable name="collectionName" expression="suggestVariableName()" defaultValue="" alwaysStopAt="true" />
-    <variable name="elementNameInChild" expression="decapitalize(EntityName)" defaultValue="" alwaysStopAt="false" />
-    <variable name="trueOrFalse" expression="&quot;trueOrFalse&quot;" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="HTML" value="false" />
-      <option name="XML" value="false" />
-      <option name="JAVA_CODE" value="false" />
-      <option name="JAVA_DECLARATION" value="true" />
-      <option name="JAVA_COMMENT" value="false" />
-      <option name="JAVA_STRING" value="false" />
-      <option name="COMPLETION" value="false" />
-      <option name="OTHER" value="false" />
-    </context>
-  </template>
-  <template name="isc-jdo-1m-u-fk" value="@org.apache.isis.applib.annotation.Collection()&#10;@javax.jdo.annotations.Element(column=&quot;$ColumnName$&quot;, dependent=&quot;$trueOrFalse$&quot;)&#10;@lombok.Getter @lombok.Setter&#10;private java.util.SortedSet&lt;$ElementType$&gt; $collectionName$ = new java.util.TreeSet&lt;$ElementType$&gt;();&#10;" description="Apache Isis JDO Collection (1:m parent unidirectional)" toReformat="true" toShortenFQNames="true">
-    <variable name="ElementType" expression="classNameComplete()" defaultValue="" alwaysStopAt="true" />
-    <variable name="collectionName" expression="suggestVariableName()" defaultValue="" alwaysStopAt="true" />
-    <variable name="ColumnName" expression="&quot;ColumnName&quot;" defaultValue="" alwaysStopAt="true" />
-    <variable name="trueOrFalse" expression="&quot;trueOrFalse&quot;" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="HTML" value="false" />
-      <option name="XML" value="false" />
-      <option name="JAVA_CODE" value="false" />
-      <option name="JAVA_DECLARATION" value="true" />
-      <option name="JAVA_COMMENT" value="false" />
-      <option name="JAVA_STRING" value="false" />
-      <option name="COMPLETION" value="false" />
-      <option name="OTHER" value="false" />
-    </context>
-  </template>
-  <template name="isc-jdo-1m-u-jt" value="@org.apache.isis.applib.annotation.Collection()&#10;@javax.jdo.annotations.Join&#10;@javax.jdo.annotations.Element(dependent=&quot;$trueOrFalse$&quot;)&#10;@lombok.Getter @lombok.Setter&#10;private java.util.SortedSet&lt;$ElementType$&gt; $collectionName$ = new java.util.TreeSet&lt;$ElementType$&gt;();&#10;" description="Apache Isis Collection (JDO, 1:m parent unidirectional to join table)" toReformat="true" toShortenFQNames="true">
-    <variable name="ElementType" expression="classNameComplete()" defaultValue="" alwaysStopAt="true" />
-    <variable name="collectionName" expression="suggestVariableName()" defaultValue="" alwaysStopAt="true" />
-    <variable name="trueOrFalse" expression="&quot;trueOrFalse&quot;" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="HTML" value="false" />
-      <option name="XML" value="false" />
-      <option name="JAVA_CODE" value="false" />
-      <option name="JAVA_DECLARATION" value="true" />
-      <option name="JAVA_COMMENT" value="false" />
-      <option name="JAVA_STRING" value="false" />
-      <option name="COMPLETION" value="false" />
-      <option name="OTHER" value="false" />
-    </context>
-  </template>
-  <template name="isc-jdo-mn-ub-c" value="@org.apache.isis.applib.annotation.Collection()&#10;@javax.jdo.annotations.Persistent(mappedBy=&quot;$ChildCollectionNameInParent$&quot;)&#10;@lombok.Getter @lombok.Setter&#10;private java.util.SortedSet&lt;$ElementType$&gt; $collectionName$ = new java.util.TreeSet&lt;$ElementType$&gt;(); &#10;" description="Apache Isis Collection (JDO, m:n child)" toReformat="true" toShortenFQNames="true">
-    <variable name="ElementType" expression="classNameComplete()" defaultValue="" alwaysStopAt="true" />
-    <variable name="collectionName" expression="suggestVariableName()" defaultValue="" alwaysStopAt="true" />
-    <variable name="ChildCollectionNameInParent" expression="&quot;ChildCollectionNameInParent&quot;" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="HTML" value="false" />
-      <option name="XML" value="false" />
-      <option name="JAVA_CODE" value="false" />
-      <option name="JAVA_DECLARATION" value="true" />
-      <option name="JAVA_COMMENT" value="false" />
-      <option name="JAVA_STRING" value="false" />
-      <option name="COMPLETION" value="false" />
-      <option name="OTHER" value="false" />
-    </context>
-  </template>
-  <template name="isc-jdo-mn-ub-p" value="@org.apache.isis.applib.annotation.Collection()&#10;@javax.jdo.annotations.Persistent(table=&quot;$TableName$&quot;) &#10;@javax.jdo.annotations.Join(column=&quot;$ThisEntityFieldName$&quot;) &#10;@javax.jdo.annotations.Element(column=&quot;$RelatedEntityFieldName$&quot;)&#10;@lombok.Getter @lombok.Setter&#10;private java.util.SortedSet&lt;$ElementType$&gt; $collectionName$ = new java.util.TreeSet&lt;$ElementType$&gt;();&#10;" description="Apache Isis Collection (JDO, m:n parent)" toReformat="true" toShortenFQNames="true">
-    <variable name="ElementType" expression="classNameComplete()" defaultValue="" alwaysStopAt="true" />
-    <variable name="collectionName" expression="suggestVariableName()" defaultValue="" alwaysStopAt="true" />
-    <variable name="TableName" expression="&quot;TableName&quot;" defaultValue="" alwaysStopAt="true" />
-    <variable name="ThisEntityFieldName" expression="&quot;ThisEntityFieldName&quot;" defaultValue="" alwaysStopAt="true" />
-    <variable name="RelatedEntityFieldName" expression="&quot;RelatedEntityFieldName&quot;" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="HTML" value="false" />
-      <option name="XML" value="false" />
-      <option name="JAVA_CODE" value="false" />
-      <option name="JAVA_DECLARATION" value="true" />
-      <option name="JAVA_COMMENT" value="false" />
-      <option name="JAVA_STRING" value="false" />
-      <option name="COMPLETION" value="false" />
-      <option name="OTHER" value="false" />
-    </context>
-  </template>
-  <template name="isds-subscriber-on" value="@com.google.common.eventbus.Subscribe&#10;public void on(final $EventType$ ev) {&#10;    // TODO&#10;}&#10;" description="Apache Isis Domain Service Subscriber &quot;on&quot; event" toReformat="false" toShortenFQNames="true">
-    <variable name="EventType" expression="classNameComplete()" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="JAVA_DECLARATION" value="true" />
-    </context>
-  </template>
-  <template name="isjaxb-package.info" value="@javax.xml.bind.annotation.XmlSchema(&#10;        namespace = &quot;http://$namespaceBase$/$namespaceSuffix$/v$versionMajor$_$versionMinor$/$namespaceSuffix$.xsd&quot;,&#10;        xmlns = {&#10;                @javax.xml.bind.annotation.XmlNs(&#10;                        namespaceURI = &quot;http://isis.apache.org/schema/common&quot;,&#10;                        prefix = &quot;common&quot;&#10;                ),&#10;        },&#10;        elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED&#10;)" toReformat="false" toShortenFQNames="true">
-    <variable name="namespaceBase" expression="        groovyScript(&quot;def str = _1; def list = str.split(\&quot;\\\\.\&quot;); def revlist = list.reverse(); def ret = revlist.iterator().join(\&quot;.\&quot;); return ret&quot;, currentPackage())" defaultValue="" alwaysStopAt="true" />
-    <variable name="namespaceSuffix" expression="groovyScript(&quot;def str = _1; def list = str.split(\&quot;\\\\.\&quot;); def revlist = list.reverse(); def ret = revlist[0]; return ret&quot;, currentPackage())" defaultValue="" alwaysStopAt="true" />
-    <variable name="versionMajor" expression="" defaultValue="1" alwaysStopAt="true" />
-    <variable name="versionMinor" expression="" defaultValue="0" alwaysStopAt="true" />
-    <context>
-      <option name="JAVA_DECLARATION" value="true" />
-    </context>
-  </template>
-  <template name="isinject" value="@javax.inject.Inject&#10;$ServiceType$ $serviceType$;&#10;" description="Apache Isis Injected Dependency Service" toReformat="true" toShortenFQNames="true">
-    <variable name="ServiceType" expression="className()" defaultValue="" alwaysStopAt="true" />
-    <variable name="serviceType" expression="suggestVariableName()" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="HTML" value="false" />
-      <option name="XML" value="false" />
-      <option name="JAVA_CODE" value="false" />
-      <option name="JAVA_DECLARATION" value="true" />
-      <option name="JAVA_COMMENT" value="false" />
-      <option name="JAVA_STRING" value="false" />
-      <option name="COMPLETION" value="false" />
-      <option name="OTHER" value="false" />
-    </context>
-  </template>
-  <template name="isid" value="//region &gt; title, icon etc&#10;public String title() {&#10;    final org.apache.isis.applib.util.TitleBuffer buf = new org.apache.isis.applib.util.TitleBuffer();&#10;    $END$// TODO: append to org.apache.isis.applib.util.TitleBuffer, typically value properties&#10;    return buf.toString();&#10;}&#10;public String iconName() {&#10;    return null; // TODO: return icon name (suffix)&#10;}&#10;public String cssClass() {&#10;    return null; // TODO: return CSS class name&#10;}&#10;//endregion" description="Apache Isis Identification region" toReformat="true" toShortenFQNames="true">
-    <context>
-      <option name="HTML" value="false" />
-      <option name="XML" value="false" />
-      <option name="JAVA_CODE" value="false" />
-      <option name="JAVA_DECLARATION" value="true" />
-      <option name="JAVA_COMMENT" value="false" />
-      <option name="JAVA_STRING" value="false" />
-      <option name="COMPLETION" value="false" />
-      <option name="OTHER" value="false" />
-    </context>
-  </template>
-  <template name="isnew" value="$Type$ $type$ = $container$.newTransientInstance($Type$.class);&#10;$END$// TODO: set up any properties&#10;&#10;$container$.persist($type$);&#10;" description="Apache Isis Commonly used method (factory for persistent)" toReformat="true" toShortenFQNames="true">
-    <variable name="Type" expression="className()" defaultValue="" alwaysStopAt="true" />
-    <variable name="type" expression="suggestVariableName()" defaultValue="" alwaysStopAt="true" />
-    <variable name="container" expression="&quot;container&quot;" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="HTML" value="false" />
-      <option name="XML" value="false" />
-      <option name="JAVA_CODE" value="false" />
-      <option name="JAVA_STATEMENT" value="true" />
-      <option name="JAVA_EXPRESSION" value="false" />
-      <option name="JAVA_DECLARATION" value="false" />
-      <option name="JAVA_COMMENT" value="false" />
-      <option name="JAVA_STRING" value="false" />
-      <option name="COMPLETION" value="false" />
-      <option name="OTHER" value="false" />
-    </context>
-  </template>
-  <template name="isp-jdo" value="@org.apache.isis.applib.annotation.Property()&#10;@javax.jdo.annotations.Column(allowsNull=&quot;$trueOrFalse$&quot;)&#10;@lombok.Getter @lombok.Setter&#10;private $PropertyType$ $propertyName$;&#10;" description="Apache Isis Property (JDO)" toReformat="true" toShortenFQNames="false">
-    <variable name="PropertyType" expression="classNameComplete()" defaultValue="" alwaysStopAt="true" />
-    <variable name="propertyName" expression="suggestVariableName()" defaultValue="" alwaysStopAt="true" />
-    <variable name="trueOrFalse" expression="" defaultValue="false" alwaysStopAt="true" />
-    <context>
-      <option name="HTML" value="false" />
-      <option name="XML" value="false" />
-      <option name="JAVA_CODE" value="false" />
-      <option name="JAVA_DECLARATION" value="true" />
-      <option name="JAVA_COMMENT" value="false" />
-      <option name="JAVA_STRING" value="false" />
-      <option name="COMPLETION" value="false" />
-      <option name="OTHER" value="false" />
-    </context>
-  </template>
-  <template name="isp-auto" value="public java.util.Collection&lt;$PropertyType$&gt; autoComplete$PropertyName$(final String search) {&#10;    return $END$com.google.common.collect.Lists.newArrayList(); // TODO: return list of choices for property&#10;}" description="Apache Isis Property auto-complete" toReformat="true" toShortenFQNames="true">
-    <variable name="PropertyName" expression="&quot;PropertyName&quot;" defaultValue="" alwaysStopAt="true" />
-    <variable name="PropertyType" expression="className()" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="HTML" value="false" />
-      <option name="XML" value="false" />
-      <option name="JAVA_CODE" value="false" />
-      <option name="JAVA_DECLARATION" value="true" />
-      <option name="JAVA_COMMENT" value="false" />
-      <option name="JAVA_STRING" value="false" />
-      <option name="COMPLETION" value="false" />
-      <option name="OTHER" value="false" />
-    </context>
-  </template>
-  <template name="isp-cho" value="public java.util.Collection&lt;$PropertyType$&gt; choices$PropertyName$() {&#10;    return $END$com.google.common.collect.Lists.newArrayList(); // TODO: return list of choices for property&#10;}" description="Apache Isis Property choices" toReformat="true" toShortenFQNames="true">
-    <variable name="PropertyName" expression="&quot;PropertyName&quot;" defaultValue="" alwaysStopAt="true" />
-    <variable name="PropertyType" expression="className()" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="HTML" value="false" />
-      <option name="XML" value="false" />
-      <option name="JAVA_CODE" value="false" />
-      <option name="JAVA_DECLARATION" value="true" />
-      <option name="JAVA_COMMENT" value="false" />
-      <option name="JAVA_STRING" value="false" />
-      <option name="COMPLETION" value="false" />
-      <option name="OTHER" value="false" />
-    </context>
-  </template>
-  <template name="isp-def" value="public $PropertyType$ default$PropertyName$() {&#10;    return $END$null; // TODO: return default for property when first created&#10;}" description="Apache Isis Property default" toReformat="true" toShortenFQNames="true">
-    <variable name="PropertyName" expression="&quot;PropertyName&quot;" defaultValue="" alwaysStopAt="true" />
-    <variable name="PropertyType" expression="className()" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="HTML" value="false" />
-      <option name="XML" value="false" />
-      <option name="JAVA_CODE" value="false" />
-      <option name="JAVA_DECLARATION" value="true" />
-      <option name="JAVA_COMMENT" value="false" />
-      <option name="JAVA_STRING" value="false" />
-      <option name="COMPLETION" value="false" />
-      <option name="OTHER" value="false" />
-    </context>
-  </template>
-  <template name="isp-dis" value="public String disable$PropertyName$() {&#10;    return $END$null; // TODO: return reason why property is disabled, null if editable&#10;}" description="Apache Isis Property disablement" toReformat="true" toShortenFQNames="true">
-    <variable name="PropertyName" expression="&quot;PropertyName&quot;" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="HTML" value="false" />
-      <option name="XML" value="false" />
-      <option name="JAVA_CODE" value="false" />
-      <option name="JAVA_DECLARATION" value="true" />
-      <option name="JAVA_COMMENT" value="false" />
-      <option name="JAVA_STRING" value="false" />
-      <option name="COMPLETION" value="false" />
-      <option name="OTHER" value="false" />
-    </context>
-  </template>
-  <template name="isp-hid" value="public boolean hide$PropertyName$() {&#10;  return $END$false; // TODO: return true if hidden, false if visible&#10; }" description="Apache Isis Property visibility" toReformat="true" toShortenFQNames="true">
-    <variable name="PropertyName" expression="&quot;PropertyName&quot;" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="HTML" value="false" />
-      <option name="XML" value="false" />
-      <option name="JAVA_CODE" value="false" />
-      <option name="JAVA_DECLARATION" value="true" />
-      <option name="JAVA_COMMENT" value="false" />
-      <option name="JAVA_STRING" value="false" />
-      <option name="COMPLETION" value="false" />
-      <option name="OTHER" value="false" />
-    </context>
-  </template>
-  <template name="isp-val" value="public String validate$PropertyName$(final $PropertyType$ $propertyName$) {&#10;  if ($propertyName$ == null) return null;&#10;  return $END$null; // TODO: return reason why proposed value is invalid, null if valid&#10; }" description="Apache Isis Property validation" toReformat="true" toShortenFQNames="true">
-    <variable name="PropertyName" expression="suggestVariableName()" defaultValue="" alwaysStopAt="true" />
-    <variable name="PropertyType" expression="className()" defaultValue="" alwaysStopAt="true" />
-    <variable name="propertyName" expression="suggestVariableName()" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="HTML" value="false" />
-      <option name="XML" value="false" />
-      <option name="JAVA_CODE" value="false" />
-      <option name="JAVA_DECLARATION" value="true" />
-      <option name="JAVA_COMMENT" value="false" />
-      <option name="JAVA_STRING" value="false" />
-      <option name="COMPLETION" value="false" />
-      <option name="OTHER" value="false" />
-    </context>
-  </template>
-  <template name="isobj-events" value="//region &gt; domain events&#10;public static abstract class PropertyDomainEvent&lt;T&gt;&#10;        extends org.apache.isis.applib.services.eventbus.PropertyDomainEvent&lt;$EntityName$,T&gt; {&#10;}&#10;public static abstract class CollectionDomainEvent&lt;T&gt;&#10;        extends org.apache.isis.applib.services.eventbus.CollectionDomainEvent&lt;$EntityName$,T&gt; {&#10;}&#10;public static abstract class ActionDomainEvent&#10;        extends org.apache.isis.applib.services.eventbus.ActionDomainEvent&lt;$EntityName$&gt; {&#10;}&#10;//endregion&#10;" description="Apache Isis Object: abstract domain events declarations" toReformat="true" toShortenFQNames="true">
-    <variable name="EntityName" expression="className()" defaultValue="" alwaysStopAt="false" />
-    <context>
-      <option name="HTML" value="false" />
-      <option name="XML" value="false" />
-      <option name="JAVA_CODE" value="false" />
-      <option name="JAVA_DECLARATION" value="true" />
-      <option name="JAVA_COMMENT" value="false" />
-      <option name="JAVA_STRING" value="false" />
-      <option name="COMPLETION" value="false" />
-      <option name="OTHER" value="false" />
-    </context>
-  </template>
-  <template name="isobj-region" value="//region &gt; $Region$ &#10;$END$ &#10;//endregion" description="Apache Isis Region" toReformat="true" toShortenFQNames="true">
-    <variable name="Region" expression="&quot;Region&quot;" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="HTML" value="false" />
-      <option name="XML" value="false" />
-      <option name="JAVA_CODE" value="false" />
-      <option name="JAVA_DECLARATION" value="true" />
-      <option name="JAVA_COMMENT" value="false" />
-      <option name="JAVA_STRING" value="false" />
-      <option name="COMPLETION" value="false" />
-      <option name="OTHER" value="false" />
-    </context>
-  </template>
-  <template name="isobj-standard" value="//region &gt; compareTo, toString&#10;@Override&#10;public int compareTo(final $EntityName$ other) {&#10;    return org.apache.isis.applib.util.ObjectContracts.compare(this, other, &quot;$property$&quot;);&#10;}&#10;@Override&#10;public String toString() {&#10;    return org.apache.isis.applib.util.ObjectContracts.toString(this, &quot;$property$&quot;);&#10;}&#10;//endregion&#10;" description="Apache Isis Object: standard methods (compareTo, toString)" toReformat="true" toShortenFQNames="true">
-    <variable name="EntityName" expression="className()" defaultValue="" alwaysStopAt="false" />
-    <variable name="property" expression="" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="HTML" value="false" />
-      <option name="XML" value="false" />
-      <option name="JAVA_CODE" value="false" />
-      <option name="JAVA_DECLARATION" value="true" />
-      <option name="JAVA_COMMENT" value="false" />
-      <option name="JAVA_STRING" value="false" />
-      <option name="COMPLETION" value="false" />
-      <option name="OTHER" value="false" />
-    </context>
-  </template>
-  <template name="isobj-validate" value="public String validate() {&#10;    $END$// TODO: return reason why object is in invalid state (and so cannot be saved/updated), or null if ok&#10;}" description="Apache Isis Object: validate method" toReformat="true" toShortenFQNames="true">
-    <context>
-      <option name="HTML" value="false" />
-      <option name="XML" value="false" />
-      <option name="JAVA_CODE" value="false" />
-      <option name="JAVA_DECLARATION" value="true" />
-      <option name="JAVA_COMMENT" value="false" />
-      <option name="JAVA_STRING" value="false" />
-      <option name="COMPLETION" value="false" />
-      <option name="OTHER" value="false" />
-    </context>
-  </template>
-  <template name="isp-jdo-11c" value="@javax.jdo.annotations.Column(allowsNull=&quot;$trueOrFalse$&quot;)&#10;@javax.jdo.annotations.Persistent(mappedBy=&quot;$fieldOnChild$&quot;)&#10;@lombok.Getter @lombok.Setter&#10;private $PropertyType$ $propertyName$;&#10;" description="Apache Isis Property (JDO, 1:1 bidirectional parent to foreign key)" toReformat="true" toShortenFQNames="false">
-    <variable name="PropertyType" expression="classNameComplete()" defaultValue="" alwaysStopAt="true" />
-    <variable name="propertyName" expression="suggestVariableName()" defaultValue="" alwaysStopAt="true" />
-    <variable name="fieldOnChild" expression="" defaultValue="" alwaysStopAt="true" />
-    <variable name="trueOrFalse" expression="" defaultValue="false" alwaysStopAt="true" />
-    <context>
-      <option name="HTML" value="false" />
-      <option name="XML" value="false" />
-      <option name="JAVA_CODE" value="false" />
-      <option name="JAVA_DECLARATION" value="true" />
-      <option name="JAVA_COMMENT" value="false" />
-      <option name="JAVA_STRING" value="false" />
-      <option name="COMPLETION" value="false" />
-      <option name="OTHER" value="false" />
-    </context>
-  </template>
-  <template name="isc-event-decl" value="public static class $CollectionName$DomainEvent extends CollectionDomainEvent&lt;$ElementType$&gt;{}&#10;@org.apache.isis.applib.annotation.Collection(&#10;        domainEvent = $CollectionName$DomainEvent.class&#10;)&#10;" description="Apache Isis Collection (domain event declaration only)" toReformat="true" toShortenFQNames="true">
-    <variable name="ElementType" expression="classNameComplete()" defaultValue="" alwaysStopAt="true" />
-    <variable name="CollectionName" expression="capitalize(collectionName)" defaultValue="" alwaysStopAt="false" />
-    <context>
-      <option name="HTML" value="false" />
-      <option name="XML" value="false" />
-      <option name="JAVA_CODE" value="false" />
-      <option name="JAVA_DECLARATION" value="true" />
-      <option name="JAVA_COMMENT" value="false" />
-      <option name="JAVA_STRING" value="false" />
-      <option name="COMPLETION" value="false" />
-      <option name="OTHER" value="false" />
-    </context>
-  </template>
-  <template name="isp-event-decl" value="public static class $PropertyName$DomainEvent extends PropertyDomainEvent&lt;$ElementType$&gt;{}&#10;@org.apache.isis.applib.annotation.Property(&#10;        domainEvent = $PropertyName$DomainEvent.class&#10;)&#10;" description="Apache Isis Property (domain event declaration only)" toReformat="true" toShortenFQNames="true">
-    <variable name="ElementType" expression="classNameComplete()" defaultValue="" alwaysStopAt="true" />
-    <variable name="PropertyName" expression="" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="HTML" value="false" />
-      <option name="XML" value="false" />
-      <option name="JAVA_CODE" value="false" />
-      <option name="JAVA_DECLARATION" value="true" />
-      <option name="JAVA_COMMENT" value="false" />
-      <option name="JAVA_STRING" value="false" />
-      <option name="COMPLETION" value="false" />
-      <option name="OTHER" value="false" />
-    </context>
-  </template>
-</templateSet>
\ No newline at end of file

[8/8] isis-site git commit: ISIS-1335: improving docs for setting up file/live templates for IntelliJ, some small fixes. Also updated the cheat sheet PDF/docx

Posted by da...@apache.org.
ISIS-1335: improving docs for setting up file/live templates for IntelliJ, some small fixes.  Also updated the cheat sheet PDF/docx


Project: http://git-wip-us.apache.org/repos/asf/isis-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis-site/commit/ec1efb3c
Tree: http://git-wip-us.apache.org/repos/asf/isis-site/tree/ec1efb3c
Diff: http://git-wip-us.apache.org/repos/asf/isis-site/diff/ec1efb3c

Branch: refs/heads/asf-site
Commit: ec1efb3cedf258c8165ed3aa8fe72b2facfb62f0
Parents: 774a4eb
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Apr 25 19:15:45 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Apr 25 19:20:36 2016 +0100

----------------------------------------------------------------------
 content/guides/dg.html                          |   607 +-
 content/guides/dg.pdf                           | 12511 ++++++++---------
 .../030-import-settings/040-file-templates.png  |   Bin 0 -> 39841 bytes
 .../030-import-settings/050-live-templates.png  |   Bin 0 -> 38456 bytes
 .../intellij/isis-settings-code-style.jar       |   Bin 0 -> 3512 bytes
 .../intellij/isis-settings-file-templates.jar   |   Bin 0 -> 9315 bytes
 .../intellij/isis-settings-live-templates.jar   |   Bin 0 -> 7492 bytes
 .../intellij/other/dan-settings-keymaps.jar     |   Bin 0 -> 2200 bytes
 .../intellij/other/dan-settings-uisettings.jar  |   Bin 0 -> 861 bytes
 content/guides/ugfun.html                       |     2 +-
 content/guides/ugfun.pdf                        |  5188 +++----
 content/guides/ugtst.html                       |     2 +-
 content/guides/ugtst.pdf                        |  2853 ++--
 content/images/cheat-sheets/cover.png           |   Bin 147058 -> 151235 bytes
 .../resources/cheat-sheets/IsisCheatSheet.docx  |   Bin 32603 -> 33225 bytes
 .../resources/cheat-sheets/IsisCheatSheet.pdf   |   Bin 425434 -> 432718 bytes
 ...-settings-file-templates-for-apache-isis.jar |   Bin 9105 -> 0 bytes
 .../templates/isis-asciidoc-templates-idea.xml  |   331 -
 .../resources/templates/isis-templates-idea.xml |   522 -
 content/resources/templates/isis-templates.xml  |   465 -
 .../templates/jmock2-templates-idea.xml         |    91 -
 .../resources/templates/jmock2-templates.xml    |     9 -
 .../templates/junit4-templates-idea.xml         |    55 -
 .../resources/templates/junit4-templates.xml    |    13 -
 24 files changed, 9910 insertions(+), 12739 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis-site/blob/ec1efb3c/content/guides/dg.html
----------------------------------------------------------------------
diff --git a/content/guides/dg.html b/content/guides/dg.html
index a4352da..bd4bf1b 100644
--- a/content/guides/dg.html
+++ b/content/guides/dg.html
@@ -610,7 +610,7 @@ as Jenkins)</p>
 </td>
 <td class="content">
 <div class="paragraph">
-<p>This material does not constitute an endorsement; JetBrains is not affiliated to Apache Software Foundation in any way.</p>
+<p>This material does not constitute an endorsement; JetBrains is not affiliated to Apache Software Foundation in any way.  JetBrains does however provide complimentary copies of the IntelliJ IDE to Apache committers.</p>
 </div>
 </td>
 </tr>
@@ -622,8 +622,7 @@ as Jenkins)</p>
 <div class="sect3">
 <h4 id="_installing_and_setting_up">2.1.1. Installing and Setting up</h4>
 <div class="paragraph">
-<p>This section covers installation and setup. These notes relates to IntelliJ Community Edition 14.1.x, with
-screenshots taken for Windows.</p>
+<p>This section covers installation and setup. These notes/screenshots were prepared using IntelliJ Community Edition 14.1.x, but are believed to be compatible with more recent versions/other editions of the IDE.</p>
 </div>
 <div class="sect4">
 <h5 id="_download_and_install">Download and Install</h5>
@@ -713,28 +712,16 @@ screenshots taken for Windows.</p>
 </div>
 <div class="imageblock">
 <div class="content">
-<img src="images/appendices/dev-env/intellij-idea/020-create-new-project/020-java-project-setup-jdk.png" alt="020 java project setup jdk" width="600px">
+<img src="images/appendices/dev-env/intellij-idea/020-create-new-project/020-java-project-setup-jdk.png" alt="020 java project setup jdk" width="500px">
 </div>
 <div class="title">Figure 9. IntelliJ Create New Project - Create a Java project</div>
 </div>
 <div class="paragraph">
-<p>We therefore need to specify the JDK.</p>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-at the time of writing Apache Isis supports only Java 7; Java 8 is scheduled for support in Apache Isis v1.9.0
-</td>
-</tr>
-</table>
+<p>We therefore need to specify the JDK.  Apache Isis supports both Java 7 and Java 8.</p>
 </div>
 <div class="imageblock">
 <div class="content">
-<img src="images/appendices/dev-env/intellij-idea/020-create-new-project/030-java-project-select-jdk.png" alt="030 java project select jdk" width="300px">
+<img src="images/appendices/dev-env/intellij-idea/020-create-new-project/030-java-project-select-jdk.png" alt="030 java project select jdk" width="250px">
 </div>
 <div class="title">Figure 10. IntelliJ Create New Java Project - Select the JDK</div>
 </div>
@@ -752,42 +739,82 @@ at the time of writing Apache Isis supports only Java 7; Java 8 is scheduled for
 </div>
 <div class="imageblock">
 <div class="content">
-<img src="images/appendices/dev-env/intellij-idea/020-create-new-project/060-create-dir.png" alt="060 create dir" width="200px">
+<img src="images/appendices/dev-env/intellij-idea/020-create-new-project/060-create-dir.png" alt="060 create dir" width="250px">
 </div>
 <div class="title">Figure 12. IntelliJ Create New Project</div>
 </div>
 </div>
 <div class="sect4">
-<h5 id="_import_settings">Import Settings</h5>
+<h5 id="_dg_ide_intellij_file-templates">File templates</h5>
 <div class="paragraph">
-<p>Next we need to configure IntelliJ with ASF/Apache Isis' standard templates and coding conventions.  These are bundled as the <code>settings.jar</code> JAR file <a href="resources/appendices/dev-env/intellij/isis-settings.jar">download from the Apache Isis website</a>).</p>
+<p>Next we recommend you import a set of standard file templates.  These are used to create new classes or supporting files:</p>
+</div>
+<div class="imageblock">
+<div class="content">
+<img src="images/appendices/dev-env/intellij-idea/030-import-settings/040-file-templates.png" alt="040 file templates" width="400px">
+</div>
+<div class="title">Figure 13. File templates</div>
 </div>
 <div class="paragraph">
-<p>Import using: <code>File &gt; Import Settings</code>, and specify the directory that you have downloaded the file to:</p>
+<p>The file templates are provided as a settings JAR file, namely <strong><a href="resources/appendices/dev-env/intellij/isis-settings-file-templates.jar">isis-settings-file-templates.jar</a></strong>.  Download this file and import using <code>File &gt; Import Settings</code>, specifying the
+directory that you have downloaded the file to:</p>
 </div>
 <div class="imageblock">
 <div class="content">
 <img src="images/appendices/dev-env/intellij-idea/030-import-settings/010-settings-import-jar.png" alt="010 settings import jar" width="400px">
 </div>
-<div class="title">Figure 13. IntelliJ Import Settings - Specify JAR file</div>
+<div class="title">Figure 14. IntelliJ Import Settings - Specify JAR file</div>
 </div>
 <div class="paragraph">
-<p>Select all the (two) categories of settings available in the JAR file:</p>
+<p>Select all the categories (there should just be one), and hit OK.  then hit restart:</p>
 </div>
 <div class="imageblock">
 <div class="content">
-<img src="images/appendices/dev-env/intellij-idea/030-import-settings/020-select-all.png" alt="020 select all" width="300px">
+<img src="images/appendices/dev-env/intellij-idea/030-import-settings/030-restart.png" alt="030 restart" width="250px">
+</div>
+<div class="title">Figure 15. IntelliJ Import Settings - Restart</div>
 </div>
-<div class="title">Figure 14. IntelliJ Import Settings - Select all categories</div>
 </div>
+<div class="sect4">
+<h5 id="_dg_ide_intellij_live-templates">Live templates</h5>
 <div class="paragraph">
-<p>And then restart:</p>
+<p>We also recommend you import a set  of live templates.  These are used to add new methods to existing classes:</p>
 </div>
 <div class="imageblock">
 <div class="content">
-<img src="images/appendices/dev-env/intellij-idea/030-import-settings/030-restart.png" alt="030 restart" width="200px">
+<img src="images/appendices/dev-env/intellij-idea/030-import-settings/050-live-templates.png" alt="050 live templates" width="600px">
 </div>
-<div class="title">Figure 15. IntelliJ Import Settings - Restart</div>
+<div class="title">Figure 16. Live templates</div>
+</div>
+<div class="paragraph">
+<p>The live templates have a prefix of prefixed either:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><code>is</code> : for Apache Isis domain objects</p>
+</li>
+<li>
+<p><code>ju</code> : for JUnit tests</p>
+</li>
+<li>
+<p><code>jm</code> : for JMock mocks or libraries</p>
+</li>
+<li>
+<p><code>ad</code> : for Asciidoc documentation; a full list can be found in the <a href="#_dg_asciidoc-templates">appendix</a>.</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>The live templates are also provided as a settings JAR file, namely <strong><a href="resources/appendices/dev-env/intellij/isis-settings-live-templates.jar">isis-settings-live-templates.jar</a></strong>.
+Download and import (as for the previous settings JAR files).</p>
+</div>
+</div>
+<div class="sect4">
+<h5 id="_dg_ide_intellij_coding-standards">Coding Standards</h5>
+<div class="paragraph">
+<p>Next, we suggest you recommend you import settings for standard ASF/Apache Isis coding conventions.  This file is also
+provided as a settings file, namely <strong><a href="resources/appendices/dev-env/intellij/isis-settings-code-style.jar">isis-settings-code-style.jar</a></strong>.  Download and import (as for the above settings JAR files).</p>
 </div>
 </div>
 <div class="sect4">
@@ -800,18 +827,18 @@ at the time of writing Apache Isis supports only Java 7; Java 8 is scheduled for
 </div>
 <div class="imageblock">
 <div class="content">
-<img src="images/appendices/dev-env/intellij-idea/040-other-settings-compiler/010-build-automatically.png" alt="010 build automatically" width="600px">
+<img src="images/appendices/dev-env/intellij-idea/040-other-settings-compiler/010-build-automatically.png" alt="010 build automatically" width="700px">
 </div>
-<div class="title">Figure 16. IntelliJ Compiler Settings</div>
+<div class="title">Figure 17. IntelliJ Compiler Settings</div>
 </div>
 <div class="paragraph">
 <p>On the <strong>Annotation Processors</strong> page, enable and adjust for the 'default' setting:</p>
 </div>
 <div class="imageblock">
 <div class="content">
-<img src="images/appendices/dev-env/intellij-idea/040-other-settings-compiler/020-annotation-processor.png" alt="020 annotation processor" width="600px">
+<img src="images/appendices/dev-env/intellij-idea/040-other-settings-compiler/020-annotation-processor.png" alt="020 annotation processor" width="700px">
 </div>
-<div class="title">Figure 17. IntelliJ Annotation Processor Settings</div>
+<div class="title">Figure 18. IntelliJ Annotation Processor Settings</div>
 </div>
 <div class="paragraph">
 <p>This setting enables the generation of the <code>Q*</code> classes for DataNucleus type-safe queries, as well as being required
@@ -842,18 +869,18 @@ for frameworks such as <a href="#_cg_ide_project-lombok">Project Lombok</a>.</p>
 </div>
 <div class="imageblock">
 <div class="content">
-<img src="images/appendices/dev-env/intellij-idea/042-other-settings-maven/010-maven-installation.png" alt="010 maven installation" width="600px">
+<img src="images/appendices/dev-env/intellij-idea/042-other-settings-maven/010-maven-installation.png" alt="010 maven installation" width="700px">
 </div>
-<div class="title">Figure 18. IntelliJ Maven Settings - Installation</div>
+<div class="title">Figure 19. IntelliJ Maven Settings - Installation</div>
 </div>
 <div class="paragraph">
 <p>Still on the Maven settings page, configure as follows:</p>
 </div>
 <div class="imageblock">
 <div class="content">
-<img src="images/appendices/dev-env/intellij-idea/042-other-settings-maven/020-maven-configuration.png" alt="020 maven configuration" width="600px">
+<img src="images/appendices/dev-env/intellij-idea/042-other-settings-maven/020-maven-configuration.png" alt="020 maven configuration" width="700px">
 </div>
-<div class="title">Figure 19. IntelliJ Maven Settings - Configuration</div>
+<div class="title">Figure 20. IntelliJ Maven Settings - Configuration</div>
 </div>
 </div>
 <div class="sect4">
@@ -866,9 +893,9 @@ for frameworks such as <a href="#_cg_ide_project-lombok">Project Lombok</a>.</p>
 </div>
 <div class="imageblock">
 <div class="content">
-<img src="images/appendices/dev-env/intellij-idea/044-other-settings-misc/010-auto-import.png" alt="010 auto import" width="600px">
+<img src="images/appendices/dev-env/intellij-idea/044-other-settings-misc/010-auto-import.png" alt="010 auto import" width="700px">
 </div>
-<div class="title">Figure 20. IntelliJ Maven Settings - Auto Import</div>
+<div class="title">Figure 21. IntelliJ Maven Settings - Auto Import</div>
 </div>
 </div>
 </div>
@@ -884,7 +911,7 @@ for frameworks such as <a href="#_cg_ide_project-lombok">Project Lombok</a>.</p>
 <div class="content">
 <img src="images/appendices/dev-env/intellij-idea/100-maven-module-mgmt/010-maven-modules-view.png" alt="010 maven modules view" width="730px">
 </div>
-<div class="title">Figure 21. IntelliJ Maven Module Management - Importing Maven modules</div>
+<div class="title">Figure 22. IntelliJ Maven Module Management - Importing Maven modules</div>
 </div>
 <div class="paragraph">
 <p>We can then import another module (from some other directory).  For example, here we are importing the Isis Addons' todoapp example:</p>
@@ -893,7 +920,7 @@ for frameworks such as <a href="#_cg_ide_project-lombok">Project Lombok</a>.</p>
 <div class="content">
 <img src="images/appendices/dev-env/intellij-idea/100-maven-module-mgmt/020-adding-another-module.png" alt="020 adding another module" width="400px">
 </div>
-<div class="title">Figure 22. IntelliJ Maven Module Management - Importing another Module</div>
+<div class="title">Figure 23. IntelliJ Maven Module Management - Importing another Module</div>
 </div>
 <div class="paragraph">
 <p>You should then see the new Maven module loaded in the <em>Projects</em> window and also the <em>Maven Projects</em> window:</p>
@@ -902,7 +929,7 @@ for frameworks such as <a href="#_cg_ide_project-lombok">Project Lombok</a>.</p>
 <div class="content">
 <img src="images/appendices/dev-env/intellij-idea/100-maven-module-mgmt/030-other-module-added.png" alt="030 other module added" width="730px">
 </div>
-<div class="title">Figure 23. IntelliJ Maven Module Management -</div>
+<div class="title">Figure 24. IntelliJ Maven Module Management -</div>
 </div>
 <div class="paragraph">
 <p>If any dependencies are already loaded in the project, then IntelliJ will automatically update the CLASSPATH to resolve to locally held modules (rather from <code>.m2/repository</code> folder).  So, for example (assuming that the <code>&lt;version&gt;</code> is correct, of course), the Isis todoapp will have local dependencies on the Apache Isis core.</p>
@@ -917,7 +944,7 @@ for frameworks such as <a href="#_cg_ide_project-lombok">Project Lombok</a>.</p>
 <div class="content">
 <img src="images/appendices/dev-env/intellij-idea/100-maven-module-mgmt/040-ignoring-modules.png" alt="040 ignoring modules" width="730px">
 </div>
-<div class="title">Figure 24. IntelliJ Maven Module Management - Ignoring Modules</div>
+<div class="title">Figure 25. IntelliJ Maven Module Management - Ignoring Modules</div>
 </div>
 <div class="paragraph">
 <p>Confirm that it&#8217;s ok to ignore these modules:</p>
@@ -926,7 +953,7 @@ for frameworks such as <a href="#_cg_ide_project-lombok">Project Lombok</a>.</p>
 <div class="content">
 <img src="images/appendices/dev-env/intellij-idea/100-maven-module-mgmt/050-ignoring-modules-2.png" alt="050 ignoring modules 2" width="300px">
 </div>
-<div class="title">Figure 25. IntelliJ Maven Module Management - Ignoring Modules (ctd)</div>
+<div class="title">Figure 26. IntelliJ Maven Module Management - Ignoring Modules (ctd)</div>
 </div>
 <div class="paragraph">
 <p>All being well you should see that the <em>Projects</em> window now only contains the code you are working on.  Its classpath dependencies will be adjusted (eg to resolve to Apache Isis core from <code>.m2/repository</code>):</p>
@@ -935,7 +962,7 @@ for frameworks such as <a href="#_cg_ide_project-lombok">Project Lombok</a>.</p>
 <div class="content">
 <img src="images/appendices/dev-env/intellij-idea/100-maven-module-mgmt/060-ignored-modules.png" alt="060 ignored modules" width="730px">
 </div>
-<div class="title">Figure 26. IntelliJ Maven Module Management - Updated Projects Window</div>
+<div class="title">Figure 27. IntelliJ Maven Module Management - Updated Projects Window</div>
 </div>
 </div>
 <div class="sect3">
@@ -955,7 +982,7 @@ for frameworks such as <a href="#_cg_ide_project-lombok">Project Lombok</a>.</p>
 <div class="content">
 <img src="images/appendices/dev-env/intellij-idea/110-running-the-app/010-run-configuration.png" alt="010 run configuration" width="600px">
 </div>
-<div class="title">Figure 27. IntelliJ Running the App - Run Configuration</div>
+<div class="title">Figure 28. IntelliJ Running the App - Run Configuration</div>
 </div>
 <div class="paragraph">
 <p>We specify the <code>Main class</code> to be <code>org.apache.isis.WebServer</code>; this is a wrapper around Jetty.  It&#8217;s possible to pass program arguments to this (eg to automatically install fixtures), but for now leave this blank.</p>
@@ -970,7 +997,7 @@ for frameworks such as <a href="#_cg_ide_project-lombok">Project Lombok</a>.</p>
 <div class="content">
 <img src="images/appendices/dev-env/intellij-idea/110-running-the-app/020-datanucleus-enhancer-goal.png" alt="020 datanucleus enhancer goal" width="400px">
 </div>
-<div class="title">Figure 28. IntelliJ Running the App - Datanucleus Enhancer Goal</div>
+<div class="title">Figure 29. IntelliJ Running the App - Datanucleus Enhancer Goal</div>
 </div>
 <div class="paragraph">
 <p>The <code>-o</code> flag in the goal means run off-line; this will run faster.</p>
@@ -1000,7 +1027,7 @@ if you forget to set up the enhancer goal, or don&#8217;t run it on the correct
 <div class="content">
 <img src="images/appendices/dev-env/intellij-idea/110-running-the-app/030-running-unit-tests.png" alt="030 running unit tests" width="600px">
 </div>
-<div class="title">Figure 29. IntelliJ Running the App - Unit Tests Run Configuration</div>
+<div class="title">Figure 30. IntelliJ Running the App - Unit Tests Run Configuration</div>
 </div>
 <div class="paragraph">
 <p>As a side-effect, this will create a run configuration, very similar to the one we manually created for the main app:</p>
@@ -1009,7 +1036,7 @@ if you forget to set up the enhancer goal, or don&#8217;t run it on the correct
 <div class="content">
 <img src="images/appendices/dev-env/intellij-idea/110-running-the-app/040-running-unit-tests-run-configuration.png" alt="040 running unit tests run configuration" width="600px">
 </div>
-<div class="title">Figure 30. IntelliJ Running the App - Unit Tests Run Configuration</div>
+<div class="title">Figure 31. IntelliJ Running the App - Unit Tests Run Configuration</div>
 </div>
 <div class="paragraph">
 <p>Thereafter, you should run units by selecting this configuration (if you use the right click approach you&#8217;ll end up with lots of run configurations, all similar).</p>
@@ -1027,7 +1054,7 @@ if you forget to set up the enhancer goal, or don&#8217;t run it on the correct
 <div class="content">
 <img src="images/appendices/dev-env/intellij-idea/110-running-the-app/050-running-integration-tests-run-configuration.png" alt="050 running integration tests run configuration" width="600px">
 </div>
-<div class="title">Figure 31. IntelliJ Running the App - Integration Tests Run Configuration</div>
+<div class="title">Figure 32. IntelliJ Running the App - Integration Tests Run Configuration</div>
 </div>
 </div>
 </div>
@@ -1262,7 +1289,7 @@ if you forget to set up the enhancer goal, or don&#8217;t run it on the correct
 <div class="content">
 <img src="images/appendices/dev-env/intellij-idea/050-some-plugins/020-some-plugins-confirmation.png" alt="020 some plugins confirmation" width="600px">
 </div>
-<div class="title">Figure 32. IntelliJ Plugins</div>
+<div class="title">Figure 33. IntelliJ Plugins</div>
 </div>
 <div class="sect5">
 <h6 id="_maven_helper_plugin">Maven Helper Plugin</h6>
@@ -1480,20 +1507,42 @@ non-commercial free license (though note this comes with some usage conditions).
 </ul>
 </div>
 <div class="sect3">
-<h4 id="_screencast">2.2.1. Screencast</h4>
+<h4 id="_dg_ide_eclipse_screencast">2.2.1. Screencast</h4>
 <div class="paragraph">
 <p>This <a href="https://www.youtube.com/watch?v=RgcYfjQ8yJA">screencast</a> shows how to import an Apache Isis maven-based
 application into Eclipse and configure to use with the JDO Objectstore.</p>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_importing_the_project">2.2.2. Importing the Project</h4>
+<h4 id="_dg_ide_eclipse_editor-templates">2.2.2. Editor Templates</h4>
+<div class="paragraph">
+<p>We provide a set of editor templates.  These are used to add new methods to existing classes.  (These are equivalent to the <a href="#_dg_ide_intellij_live-templates">IntelliJ live templates</a>):</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><code>is</code> (Apache Isis domain objects).  <a href="../resources/templates/isis-templates.xml">Download</a></p>
+</li>
+<li>
+<p><code>ju</code> (for JUnit tests) <a href="../resources/templates/junit4-templates.xml">Download</a></p>
+</li>
+<li>
+<p><code>jm</code> (for JMock mocks or libraries) <a href="../resources/templates/jmock2-templates.xml">Download</a></p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>To install, download each XML file, then go to <code>Windows &gt; Preferences &gt; Java &gt; Editor &gt; Templates</code> and choose <code>Import</code>.</p>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_dg_ide_eclipse_importing-the-project">2.2.3. Importing the Project</h4>
 <div class="paragraph">
 <p>Use File &gt; Import, then Maven &gt; Existing Maven Projects.</p>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_add_datanucleus_support">2.2.3. Add DataNucleus support</h4>
+<h4 id="_add_datanucleus_support">2.2.4. Add DataNucleus support</h4>
 <div class="admonitionblock tip">
 <table>
 <tr>
@@ -1601,7 +1650,7 @@ application into Eclipse and configure to use with the JDO Objectstore.</p>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_running_the_app_2">2.2.4. Running the App</h4>
+<h4 id="_running_the_app_2">2.2.5. Running the App</h4>
 <div class="paragraph">
 <p>The simpleapp archetype automatically provides a <code>.launch</code> configurations in the <code>webapp</code> module. You can therefore very simply run the application by right-clicking on one of these files, and choosing "Run As…" or "Debug As…".</p>
 </div>
@@ -1621,7 +1670,7 @@ application into Eclipse and configure to use with the JDO Objectstore.</p>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_other_domain_projects">2.2.5. Other domain projects.</h4>
+<h4 id="_other_domain_projects">2.2.6. Other domain projects.</h4>
 <div class="paragraph">
 <p>There is nothing to prevent you having multiple domain projects. You might want to do such that each domain project corresponds to a <a href="http://www.methodsandtools.com/archive/archive.php?id=97p2">DDD module</a>, thus guaranteeing that there are no cyclic dependencies between your modules.</p>
 </div>
@@ -1633,7 +1682,7 @@ application into Eclipse and configure to use with the JDO Objectstore.</p>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_advanced">2.2.6. Advanced</h4>
+<h4 id="_advanced">2.2.7. Advanced</h4>
 <div class="paragraph">
 <p>In this section are a couple of options that will reduce the length of the change code/build/deploy/review feedback loop.</p>
 </div>
@@ -1661,176 +1710,15 @@ actions will work, but adding new properties or collections is much less likely
 </div>
 </div>
 <div class="sect1">
-<h2 id="_dg_ide-templates">3. Code and File Templates</h2>
+<h2 id="_dg_building-isis">3. Building Apache Isis</h2>
 <div class="sectionbody">
-<div class="paragraph">
-<p>We provide parameterized templates, for both IntelliJ and Eclipse, to help you write your domain applications.</p>
-</div>
-<div class="paragraph">
-<p>On IntelliJ we provide both file templates (<code>File &gt; Settings &gt; Editor &gt; File and Code Templates</code>) and also live templates (<code>File &gt; Settings &gt; Editor &gt; Live Templates</code>).  The former are used to create new classes or files (eg a new domain entity), while the latter are intended to modify an existing file (eg create a new property or add a <code>toString()</code> method etc).</p>
-</div>
-<div class="paragraph">
-<p>On Eclipse we provide only the latter sort of template (Windows &gt; Preferences &gt; Java &gt; Editor &gt; Templates).</p>
-</div>
-<div class="paragraph">
-<p>There are templates for writing Apache Isis domain objects, for writing unit tests (JUnit and JMock), and also for writing Asciidoc documentation (see also the <a href="#_dg_asciidoc-templates">appendix</a>).</p>
-</div>
 <div class="sect2">
-<h3 id="_download">3.1. Download</h3>
-<div class="paragraph">
-<p>The following table lists the templates available to download:</p>
-</div>
-<table class="tableblock frame-all grid-all spread">
-<colgroup>
-<col style="width: 22.2222%;">
-<col style="width: 22.2222%;">
-<col style="width: 11.1111%;">
-<col style="width: 22.2222%;">
-<col style="width: 22.2223%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">Purpose</th>
-<th class="tableblock halign-left valign-top">IntelliJ<br>
-file template</th>
-<th class="tableblock halign-left valign-top">Prefix</th>
-<th class="tableblock halign-left valign-top">IntelliJ<br>
-live template</th>
-<th class="tableblock halign-left valign-top">Eclipse<br>
-template</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Domain Objects</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="../resources/templates/intellij-settings-file-templates-for-apache-isis.jar">Download</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>is</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="../resources/templates/isis-templates-idea.xml">Download</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="../resources/templates/isis-templates.xml">Download</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>JUnit tests</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>(none)</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>ju</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="../resources/templates/junit4-templates-idea.xml">Download</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="../resources/templates/junit4-templates.xml">Download</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>JMock tests</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>(none)</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>jm</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="../resources/templates/jmock2-templates-idea.xml">Download</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="../resources/templates/jmock2-templates.xml">Download</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Asciidoc</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>(none)</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>ad</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="../resources/templates/isis-asciidoc-templates-idea.xml">Download</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>(none)</p>
-</div></div></td>
-</tr>
-</tbody>
-</table>
-<div class="paragraph">
-<p>The most commonly used domain objects (live) templates are also listed on the <a href="../cheat-sheet.html">Apache Isis cheat sheet</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_installation">3.2. Installation</h3>
-<div class="sect3">
-<h4 id="_intellij">3.2.1. IntelliJ</h4>
-<div class="paragraph">
-<p>To install in the live templates IntelliJ (Community edition 15), copy to the relevant <code>config/templates</code> directory, eg:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Windows <code>&lt;User home&gt;\.IdeaIC15\config\templates</code></p>
-</li>
-<li>
-<p>Linux <code>~/.IdeaIC15/config/templates</code></p>
-</li>
-<li>
-<p>Mac OS <code>~/Library/Preferences/IdeaIC15/templates</code></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>If using the Ultimate edition, the directory is <code>.IntelliJIdea15</code> rather than <code>IdeaIC15</code>.</p>
-</div>
-<div class="paragraph">
-<p>To install the file templates, use <code>File &gt; Import Settings</code>.</p>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_eclipse">3.2.2. Eclipse</h4>
-<div class="paragraph">
-<p>To install in Eclipse, go to <code>Windows &gt; Preferences &gt; Java &gt; Editor &gt; Templates</code> and choose <code>Import</code>.</p>
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_usage">3.3. Usage</h3>
-<div class="paragraph">
-<p>For the live templates, enter the prefix in the editor (<code>is</code>, <code>ju</code>, <code>jm</code>) and the IDE will list all available templates
-in that category.</p>
-</div>
-<div class="paragraph">
-<p>For the file templates (IntelliJ only), these are available from <code>File &gt; New</code>.</p>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_dg_building-isis">4. Building Apache Isis</h2>
-<div class="sectionbody">
-<div class="sect2">
-<h3 id="_dg_building-isis_git">4.1. Git</h3>
+<h3 id="_dg_building-isis_git">3.1. Git</h3>
 <div class="paragraph">
 <p>The Apache Isis source code lives in a git repo.</p>
 </div>
 <div class="sect3">
-<h4 id="_dg_building-isis_git_installation">4.1.1. Installation</h4>
+<h4 id="_dg_building-isis_git_installation">3.1.1. Installation</h4>
 <div class="paragraph">
 <p>The easiest place to get hold of command-line git is probably the <a href="http://git-scm.com/downloads">github download page</a>.</p>
 </div>
@@ -1946,7 +1834,7 @@ git config user.email &lt;i&gt;myusername@apache.org&lt;/i&gt;</code></pre>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_dg_building-isis_git_getting-help">4.1.2. Getting help</h4>
+<h4 id="_dg_building-isis_git_getting-help">3.1.2. Getting help</h4>
 <div class="paragraph">
 <p>Three commands of git that in particular worth knowing:</p>
 </div>
@@ -1994,7 +1882,7 @@ git config user.email &lt;i&gt;myusername@apache.org&lt;/i&gt;</code></pre>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_dg_building-isis_installing-java">4.2. Installing Java</h3>
+<h3 id="_dg_building-isis_installing-java">3.2. Installing Java</h3>
 <div class="paragraph">
 <p>Apache Isis is compatible with Java 7 and Java 8.  For every-day use, the framework is usually compiled against Java 8.</p>
 </div>
@@ -2021,7 +1909,7 @@ be sure not to use any Java 8 APIs.</p>
 </table>
 </div>
 <div class="sect3">
-<h4 id="_dg_building-isis_configure-maven-toolchains-plugin">4.2.1. Configure Maven toolchains plugin</h4>
+<h4 id="_dg_building-isis_configure-maven-toolchains-plugin">3.2.1. Configure Maven toolchains plugin</h4>
 <div class="paragraph">
 <p>If you are a committer that will be performing releases of Apache Isis, then you <em>must</em> configure the
 <a href="http://maven.apache.org/plugins/maven-toolchains-plugin/">toolchains</a> plugin so that releases can be built using
@@ -2078,7 +1966,7 @@ adjusting paths for your platform:</p>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_dg_building-isis_installing-maven">4.3. Installing Maven</h3>
+<h3 id="_dg_building-isis_installing-maven">3.3. Installing Maven</h3>
 <div class="paragraph">
 <p>Install Maven 3.0.x, downloadable <a href="http://maven.apache.org/download.html">here</a>.</p>
 </div>
@@ -2106,7 +1994,7 @@ adjusting paths for your platform:</p>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_dg_building-isis_building-all-of-apache-isis">4.4. Building all of Apache Isis</h3>
+<h3 id="_dg_building-isis_building-all-of-apache-isis">3.4. Building all of Apache Isis</h3>
 <div class="paragraph">
 <p>To build the source code from the command line, simply go to the root directory and type:</p>
 </div>
@@ -2135,7 +2023,7 @@ mvn clean install -o -T1C</code></pre>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_dg_building-isis_checking-for-vulnerabilities">4.5. Checking for Vulnerabilities</h3>
+<h3 id="_dg_building-isis_checking-for-vulnerabilities">3.5. Checking for Vulnerabilities</h3>
 <div class="paragraph">
 <p>Apache Isis configures the <a href="https://www.owasp.org/index.php/Main_Page">OWASP</a> <a href="https://www.owasp.org/index.php/OWASP_Dependency_Check">dependency check</a> <a href="http://jeremylong.github.io/DependencyCheck/dependency-check-maven/index.html">Maven plugin</a> to determine whether the framework uses libraries that are known to have security vulnerabilities.</p>
 </div>
@@ -2169,7 +2057,7 @@ mvn clean install -o -T1C</code></pre>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_dg_building-isis_checking-for-use-of-internal-jdk-apis">4.6. Checking for use of internal JDK APIs</h3>
+<h3 id="_dg_building-isis_checking-for-use-of-internal-jdk-apis">3.6. Checking for use of internal JDK APIs</h3>
 <div class="paragraph">
 <p>Apache Isis configures the <a href="https://maven.apache.org/plugins-archives/maven-jdeps-plugin-3.0.0/">jdeps maven plugin</a> to check for any usage of internal JDK APIs.  This is in preparation for Java 9 module system (Jigsaw) which will prevent such usage of APIs.</p>
 </div>
@@ -2202,7 +2090,7 @@ mvn clean install -o -T1C</code></pre>
 </div>
 </div>
 <div class="sect1">
-<h2 id="_dg_asciidoc">5. AsciiDoc Documentation</h2>
+<h2 id="_dg_asciidoc">4. AsciiDoc Documentation</h2>
 <div class="sectionbody">
 <div class="paragraph">
 <p>Apache Isis' documentation (meaning the website and the users' guide, the reference guide and this contributors' guide) is written using <a href="http://www.methods.co.nz/asciidoc/">Asciidoc</a>, specifically the <a href="asciidoctor.org/">Asciidoctor</a> implementation.</p>
@@ -2217,13 +2105,13 @@ mvn clean install -o -T1C</code></pre>
 <p>And to help write the Asciidoc text itself, we provide some <a href="#_dg__cg_ide-templates">templates</a>.</p>
 </div>
 <div class="sect2">
-<h3 id="_where_to_find_the_docs">5.1. Where to find the Docs</h3>
+<h3 id="_where_to_find_the_docs">4.1. Where to find the Docs</h3>
 <div class="paragraph">
 <p>The (Asciidoc) source code can be found at <code>adocs/documentation</code> (relative to root).  Online you&#8217;ll find it <a href="https://github.com/apache/isis/tree/master/adocs/documentation">cloned to github here</a>.</p>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_naming_conventions">5.2. Naming Conventions</h3>
+<h3 id="_naming_conventions">4.2. Naming Conventions</h3>
 <div class="paragraph">
 <p>For documents with inclusions, use '_' to separate out the logical hierarchy:</p>
 </div>
@@ -2262,16 +2150,16 @@ mvn clean install -o -T1C</code></pre>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_writing_the_docs">5.3. Writing the docs</h3>
+<h3 id="_writing_the_docs">4.3. Writing the docs</h3>
 <div class="paragraph">
-<p>We highly recommend that you install the (IntelliJ) live templates for Asciidoctor, as described in <a href="#_dg_ide-templates">IDE templates</a>.  These provide a large number of helper templates.</p>
+<p>We highly recommend that you install the (IntelliJ) live templates for Asciidoctor, as described in <a href="#_dg_ide_intellij_live-templates">IDE templates</a>.  These provide a large number of helper templates.</p>
 </div>
 <div class="paragraph">
 <p>An <a href="#_dg_appendix_asciidoc-templates">appendix</a> lists all the templates available, demonstrating their intended usage and output.</p>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_build_and_review_using_maven">5.4. Build and Review (using Maven)</h3>
+<h3 id="_build_and_review_using_maven">4.4. Build and Review (using Maven)</h3>
 <div class="paragraph">
 <p>To (re)build the documentation locally prior to release, change into the <code>adocs/documentation</code> directory and use:</p>
 </div>
@@ -2288,12 +2176,12 @@ mvn clean install -o -T1C</code></pre>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_instant_rebuild_using_ruby">5.5. Instant Rebuild (using Ruby)</h3>
+<h3 id="_instant_rebuild_using_ruby">4.5. Instant Rebuild (using Ruby)</h3>
 <div class="paragraph">
 <p>The ruby script, <code>monitor.rb</code> emulates the <code>mvn compile</code> command, regenerating any changed Asciidoctor files to the relevant <code>target/site</code> directory.  Moreover if any included files are changed then it rebuilds the parent (per the above naming convention).</p>
 </div>
 <div class="sect3">
-<h4 id="_one_time_setup">5.5.1. One-time setup</h4>
+<h4 id="_one_time_setup">4.5.1. One-time setup</h4>
 <div class="paragraph">
 <p>To setup:</p>
 </div>
@@ -2332,7 +2220,7 @@ bundle install</code></pre>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_instant_rebuild">5.5.2. Instant Rebuild</h4>
+<h4 id="_instant_rebuild">4.5.2. Instant Rebuild</h4>
 <div class="paragraph">
 <p>To run, we typically just use:</p>
 </div>
@@ -2369,12 +2257,12 @@ bundle install</code></pre>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_publish_procedure">5.6. Publish procedure</h3>
+<h3 id="_publish_procedure">4.6. Publish procedure</h3>
 <div class="paragraph">
 <p>Only Apache Isis committers can publish to <a href="http://isis.apache.org">isis.apache.org</a>.  We&#8217;ve decided to include these procedures here here (rather than put them in the <a href="cgcom.html">Committers' Guide</a>), just to keep things together.</p>
 </div>
 <div class="sect3">
-<h4 id="_one_time_setup_2">5.6.1. One-time setup</h4>
+<h4 id="_one_time_setup_2">4.6.1. One-time setup</h4>
 <div class="paragraph">
 <p>The generated site is published by copying into the <code>content/</code> directory of the <a href="https://git-wip-us.apache.org/repos/asf/isis-site.git">isis-site git repo</a>. You therefore need to check this out this repo.</p>
 </div>
@@ -2406,7 +2294,7 @@ bundle install</code></pre>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_publishing_full_build">5.6.2. Publishing (full build)</h4>
+<h4 id="_publishing_full_build">4.6.2. Publishing (full build)</h4>
 <div class="paragraph">
 <p>Back in the <code>adocs/documentation</code> directory of the main <code>isis-git.repo</code>, to copy the generated documents to the <code>isis-site.git</code> repo, run:</p>
 </div>
@@ -2459,7 +2347,7 @@ bundle install</code></pre>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_publishing_partial_build">5.6.3. Publishing (partial build)</h4>
+<h4 id="_publishing_partial_build">4.6.3. Publishing (partial build)</h4>
 <div class="paragraph">
 <p>If none of the guides have been changed, and if you have run the full rebuild recently, then you can skip the generation of PDFs using:</p>
 </div>
@@ -2476,7 +2364,7 @@ bundle install</code></pre>
 </div>
 </div>
 <div class="sect1">
-<h2 id="_dg_contributing">6. Contributing</h2>
+<h2 id="_dg_contributing">5. Contributing</h2>
 <div class="sectionbody">
 <div class="paragraph">
 <p>This page explains how you can contribute to Apache Isis. You&#8217;ll probably also want <a href="#_dg_ide">set up your IDE</a> and learn <a href="#_dg_building-isis">how to build Apache Isis</a>.</p>
@@ -2485,7 +2373,7 @@ bundle install</code></pre>
 <p>Thanks for considering to help out, your contributions are appreciated!</p>
 </div>
 <div class="sect2">
-<h3 id="_recommended_workflow_github">6.1. Recommended Workflow (github)</h3>
+<h3 id="_recommended_workflow_github">5.1. Recommended Workflow (github)</h3>
 <div class="paragraph">
 <p>Apache Isis' source code is hosted in an Apache git repo (<a href="https://git-wip-us.apache.org/repos/asf/isis.git">https</a>, <a href="http://git-wip-us.apache.org/repos/asf/isis.git">http</a>), with a clone on github (<a href="https://github.com/apache/isis.git">https</a>, or ssh: <code>git@github.com:apache/isis.git</code>.</p>
 </div>
@@ -2537,7 +2425,7 @@ bundle install</code></pre>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_alternative_workflow_jira_patches">6.2. Alternative Workflow (JIRA patches)</h3>
+<h3 id="_alternative_workflow_jira_patches">5.2. Alternative Workflow (JIRA patches)</h3>
 <div class="paragraph">
 <p>As an alternative, you may decide to clone directly from <a href="https://github.com/apache/isis.git">github.com/apache/isis</a> rather than create your own fork:</p>
 </div>
@@ -2554,7 +2442,7 @@ bundle install</code></pre>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_setting_up_your_fork_clone">6.3. Setting up your fork/clone</h3>
+<h3 id="_setting_up_your_fork_clone">5.3. Setting up your fork/clone</h3>
 <div class="paragraph">
 <p>If you choose to create your own fork then you&#8217;ll need an account on <a href="https://github.com">github.com</a>. You then fork simply by pressing the "Fork" button:</p>
 </div>
@@ -2603,7 +2491,7 @@ bundle install</code></pre>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_commit_messages">6.4. Commit messages</h3>
+<h3 id="_commit_messages">5.4. Commit messages</h3>
 <div class="paragraph">
 <p>Although with git your commits are always performed on your local repo, those commit messages become public when the patch is applied by an Apache Isis committer. You should take time to write a meaningful commit message that helps explain what the patch refers to; if you don&#8217;t then there&#8217;s a chance that your patch may be rejected and not applied. No-one likes hard work to go to waste!</p>
 </div>
@@ -2630,7 +2518,7 @@ why this is a problem, and how the patch fixes the problem when applied.</code><
 </div>
 </div>
 <div class="sect2">
-<h3 id="_creating_the_patch_file">6.5. Creating the patch file</h3>
+<h3 id="_creating_the_patch_file">5.5. Creating the patch file</h3>
 <div class="paragraph">
 <p>If you are working without a github fork of Apache Isis, then you can create the patches from your own local git repository.</p>
 </div>
@@ -2647,12 +2535,12 @@ why this is a problem, and how the patch fixes the problem when applied.</code><
 </div>
 </div>
 <div class="sect2">
-<h3 id="_sample_contribution_workflow">6.6. Sample Contribution Workflow</h3>
+<h3 id="_sample_contribution_workflow">5.6. Sample Contribution Workflow</h3>
 <div class="paragraph">
 <p>Assuming you&#8217;re development environment is all setup, let&#8217;s walk through how you might make contribute a patch. In this example, suppose that you&#8217;ve decided to work on JIRA ticket #123, an enhancement to support Blob/Clob datatypes.</p>
 </div>
 <div class="sect3">
-<h4 id="_update_your_master_branch">6.6.1. Update your master branch</h4>
+<h4 id="_update_your_master_branch">5.6.1. Update your master branch</h4>
 <div class="paragraph">
 <p>The first thing to do is to make sure your local clone is up-to-date. We do this by retrieving new commits from upstream repo and then merging them as a fast-forward into your local branch.</p>
 </div>
@@ -2671,7 +2559,7 @@ git pull –ff-only
 </div>
 </div>
 <div class="sect3">
-<h4 id="_create_a_topic_branch">6.6.2. Create a topic branch</h4>
+<h4 id="_create_a_topic_branch">5.6.2. Create a topic branch</h4>
 <div class="paragraph">
 <p>We recommend you name topic branches by the JIRA ticket, ie &lt;tt&gt;ISIS-nnn-description&lt;/tt&gt;. So let&#8217;s create a new branch based off <code>master</code> and call it "ISIS-123-blobs"</p>
 </div>
@@ -2688,7 +2576,7 @@ git pull –ff-only
 </div>
 </div>
 <div class="sect3">
-<h4 id="_make_file_changes_and_commit">6.6.3. Make File Changes and Commit</h4>
+<h4 id="_make_file_changes_and_commit">5.6.3. Make File Changes and Commit</h4>
 <div class="paragraph">
 <p>Next, make changes to your files using the usual commands (see also our <a href="#_dg_git-cookbook">git cookbook</a> section):</p>
 </div>
@@ -2719,7 +2607,7 @@ git pull –ff-only
 </div>
 </div>
 <div class="sect3">
-<h4 id="_rebasing_with_code_master_code">6.6.4. Rebasing with <code>master</code></h4>
+<h4 id="_rebasing_with_code_master_code">5.6.4. Rebasing with <code>master</code></h4>
 <div class="paragraph">
 <p>Before you can share your change, you should rebase (in other words replay) your changes on top of the <code>master</code> branch.</p>
 </div>
@@ -2747,7 +2635,7 @@ git rebase master
 </div>
 </div>
 <div class="sect3">
-<h4 id="_raising_a_pull_request">6.6.5. Raising a pull request</h4>
+<h4 id="_raising_a_pull_request">5.6.5. Raising a pull request</h4>
 <div class="paragraph">
 <p>If you have your own fork, you can now simply push the changes you&#8217;ve made locally to your fork:</p>
 </div>
@@ -2779,7 +2667,7 @@ git rebase master
 </div>
 </div>
 <div class="sect2">
-<h3 id="_if_your_pull_request_is_accepted">6.7. If your pull request is accepted</h3>
+<h3 id="_if_your_pull_request_is_accepted">5.7. If your pull request is accepted</h3>
 <div class="paragraph">
 <p>To double check that your pull request is accepted, update your <code>master</code> branch from the <code>upstream</code> remote:</p>
 </div>
@@ -2793,7 +2681,7 @@ git rebase master
 <p>Finally, you might want to push the latest changes in master back up to your github fork. If so, use:</p>
 </div>
 <div class="sect3">
-<h4 id="_if_your_pull_request_is_rejected">6.7.1. If your pull request is rejected</h4>
+<h4 id="_if_your_pull_request_is_rejected">5.7.1. If your pull request is rejected</h4>
 <div class="paragraph">
 <p>If your pull request is rejected, then you&#8217;ll need to update your branch from the main repository and then address the rejection reason.</p>
 </div>
@@ -2816,7 +2704,7 @@ git rebase master
 </div>
 </div>
 <div class="sect1">
-<h2 id="_dg_git-cookbook">7. Appendix: Git Cookbook</h2>
+<h2 id="_dg_git-cookbook">6. Appendix: Git Cookbook</h2>
 <div class="sectionbody">
 <div class="paragraph">
 <p>This appendix describes the commands often used while working with git.  In addition to these basic commands, please make sure you have read:</p>
@@ -2835,7 +2723,7 @@ git rebase master
 </ul>
 </div>
 <div class="sect2">
-<h3 id="_modifying_existing_files">7.1. Modifying existing files</h3>
+<h3 id="_modifying_existing_files">6.1. Modifying existing files</h3>
 <div class="paragraph">
 <p>To modify existing files:</p>
 </div>
@@ -2861,7 +2749,7 @@ git commit -m &quot;ISIS-nnn: yada yada&quot;</code></pre>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_adding_new_files">7.2. Adding new files</h3>
+<h3 id="_adding_new_files">6.2. Adding new files</h3>
 <div class="paragraph">
 <p>To add a new file:</p>
 </div>
@@ -2876,7 +2764,7 @@ git commit -m &quot;ISIS-nnn: yada yada&quot;</code></pre>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_deleting_files">7.3. Deleting files</h3>
+<h3 id="_deleting_files">6.3. Deleting files</h3>
 <div class="paragraph">
 <p>To delete a file:</p>
 </div>
@@ -2888,7 +2776,7 @@ git commit -m &quot;ISIS-nnn: yada yada&quot;</code></pre>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_renaming_or_moving_files">7.4. Renaming or moving files</h3>
+<h3 id="_renaming_or_moving_files">6.4. Renaming or moving files</h3>
 <div class="paragraph">
 <p>To rename or move a file:</p>
 </div>
@@ -2900,13 +2788,13 @@ git commit -m &quot;ISIS-nnn: yada yada&quot;</code></pre>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_common_workflows">7.5. Common Workflows</h3>
+<h3 id="_common_workflows">6.5. Common Workflows</h3>
 <div class="paragraph">
 <p>The <a href="#_dg_contributing">contributing</a> page describes the workflow for non-committers.  The <a href="cgcom.html#_cgcom_policies_git-policy">Git policy</a> page describes a workflow for Apache Isis <strong>committers</strong>.</p>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_backing_up_a_local_branch">7.6. Backing up a local branch</h3>
+<h3 id="_backing_up_a_local_branch">6.6. Backing up a local branch</h3>
 <div class="paragraph">
 <p>If committing to a local branch, the changes are still just that: local, and run risk of a disk failure or other disaster.</p>
 </div>
@@ -2945,7 +2833,7 @@ git commit -m &quot;ISIS-nnn: yada yada&quot;</code></pre>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_quick_change_stashing_changes">7.7. Quick change: stashing changes</h3>
+<h3 id="_quick_change_stashing_changes">6.7. Quick change: stashing changes</h3>
 <div class="paragraph">
 <p>If you are working on something but are not ready to commit, then use:</p>
 </div>
@@ -2973,7 +2861,7 @@ git commit -m &quot;ISIS-nnn: yada yada&quot;</code></pre>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_ignoring_files">7.8. Ignoring files</h3>
+<h3 id="_ignoring_files">6.8. Ignoring files</h3>
 <div class="paragraph">
 <p>Put file patterns into <code>.gitignore</code>.  There is one at the root of the git repo, but they can additionally appear in subdirectories (the results are cumulative).</p>
 </div>
@@ -2992,9 +2880,9 @@ git commit -m &quot;ISIS-nnn: yada yada&quot;</code></pre>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_more_advanced_use_cases">7.9. More advanced use cases</h3>
+<h3 id="_more_advanced_use_cases">6.9. More advanced use cases</h3>
 <div class="sect3">
-<h4 id="_if_accidentally_push_to_remote">7.9.1. If accidentally push to remote</h4>
+<h4 id="_if_accidentally_push_to_remote">6.9.1. If accidentally push to remote</h4>
 <div class="paragraph">
 <p>Suppose you committed to <code>master</code>, and then pushed the change, and then decided that you didn&#8217;t intend to do that:</p>
 </div>
@@ -3044,7 +2932,7 @@ git commit -m &quot;ISIS-nnn: yada yada&quot;</code></pre>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_if_you_ve_accidentally_worked_on_code_master_code_branch">7.10. If you&#8217;ve accidentally worked on <code>master</code> branch</h3>
+<h3 id="_if_you_ve_accidentally_worked_on_code_master_code_branch">6.10. If you&#8217;ve accidentally worked on <code>master</code> branch</h3>
 <div class="paragraph">
 <p>If at any time the <code>git pull</code> from your upstream fails, it most likely means that you must have made commits on the <code>master</code> branch.  You can use <code>gitk --all</code> to confirm; at some point in time both <code>master</code> and <code>origin\master</code> will have a common ancestor.</p>
 </div>
@@ -3078,7 +2966,7 @@ git reset --hard &lt;i&gt;shaId&lt;/i&gt;      # move master branch shaId of com
 </div>
 </div>
 <div class="sect2">
-<h3 id="_if_you_ve_forgotten_to_prefix_your_commits_but_not_pushed">7.11. If you&#8217;ve forgotten to prefix your commits (but not pushed)</h3>
+<h3 id="_if_you_ve_forgotten_to_prefix_your_commits_but_not_pushed">6.11. If you&#8217;ve forgotten to prefix your commits (but not pushed)</h3>
 <div class="paragraph">
 <p>One of our committers, Alexander Krasnukhin, has put together some git scripts to help his workflow.  Using one of these, <code>git prefix</code>, you can just commit with proper message without bothering about prefix and add prefix only in the end <strong>before</strong> the final push.</p>
 </div>
@@ -3097,16 +2985,16 @@ git reset --hard &lt;i&gt;shaId&lt;/i&gt;      # move master branch shaId of com
 </div>
 </div>
 <div class="sect1">
-<h2 id="_dg_asciidoc-templates">8. Appendix: Asciidoc Templates</h2>
+<h2 id="_dg_asciidoc-templates">7. Appendix: Asciidoc Templates</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>This appendix lists the (IntelliJ) live templates available for <a href="#_dg_asciidoc">writing documentation</a> using Asciidoc.  Instructions for installing the templates can be found <a href="#_dg_ide-templates">here</a>.</p>
+<p>This appendix lists the (IntelliJ) live templates available for <a href="#_dg_asciidoc">writing documentation</a> using Asciidoc.  Instructions for installing the templates can be found <a href="#_dg_ide_intellij_live-templates">here</a>.</p>
 </div>
 <div class="paragraph">
 <p>In the examples below the text <code>xxx</code>, <code>yyy</code>, <code>zzz</code> are correspond to template variables (ie placeholders).</p>
 </div>
 <div class="sect2">
-<h3 id="_callouts">8.1. Callouts</h3>
+<h3 id="_callouts">7.1. Callouts</h3>
 <div class="paragraph">
 <p>The Asciidoctor terminology is an "admonition".</p>
 </div>
@@ -3212,7 +3100,7 @@ xxx<br>
 </table>
 </div>
 <div class="sect2">
-<h3 id="_todo_notes">8.2. TODO notes</h3>
+<h3 id="_todo_notes">7.2. TODO notes</h3>
 <div class="paragraph">
 <p>Add as a placeholder for documentation still to be written or which is work-in-progress.</p>
 </div>
@@ -3280,7 +3168,7 @@ WIP - cool new feature
 </table>
 </div>
 <div class="sect2">
-<h3 id="_xref_to_guides">8.3. Xref to Guides</h3>
+<h3 id="_xref_to_guides">7.3. Xref to Guides</h3>
 <div class="paragraph">
 <p>Cross-references (links) to the various guides</p>
 </div>
@@ -3537,7 +3425,7 @@ WIP - cool new feature
 </table>
 </div>
 <div class="sect2">
-<h3 id="_link_to_isis_addons">8.4. Link to Isis Addons</h3>
+<h3 id="_link_to_isis_addons">7.4. Link to Isis Addons</h3>
 <div class="paragraph">
 <p>Links to (non-ASF) <a href="http://isisaddons.org">Isis Addons</a></p>
 </div>
@@ -3646,7 +3534,7 @@ WIP - cool new feature
 </table>
 </div>
 <div class="sect2">
-<h3 id="_source_code">8.5. Source code</h3>
+<h3 id="_source_code">7.5. Source code</h3>
 <table class="tableblock frame-all grid-all spread">
 <colgroup>
 <col style="width: 14.2857%;">
@@ -3796,7 +3684,7 @@ xxx<br>
 </table>
 </div>
 <div class="sect2">
-<h3 id="_images">8.6. Images</h3>
+<h3 id="_images">7.6. Images</h3>
 <table class="tableblock frame-all grid-all spread">
 <colgroup>
 <col style="width: 14.2857%;">
@@ -3882,7 +3770,7 @@ xxx<br>
 </table>
 </div>
 <div class="sect2">
-<h3 id="_youtube_screencasts">8.7. YouTube (screencasts)</h3>
+<h3 id="_youtube_screencasts">7.7. YouTube (screencasts)</h3>
 <div class="paragraph">
 <p>Embedded youtube screencasts.  (Don&#8217;t use these in guides, as they cannot be rendered as PDF).</p>
 </div>
@@ -3944,7 +3832,7 @@ xxx<br>
 </table>
 </div>
 <div class="sect2">
-<h3 id="_tables">8.8. Tables</h3>
+<h3 id="_tables">7.8. Tables</h3>
 <table class="tableblock frame-all grid-all spread">
 <colgroup>
 <col style="width: 14.2857%;">
@@ -3970,7 +3858,7 @@ xxx<br>
 </table>
 </div>
 <div class="sect2">
-<h3 id="_misc">8.9. Misc.</h3>
+<h3 id="_misc">7.9. Misc.</h3>
 <table class="tableblock frame-all grid-all spread">
 <colgroup>
 <col style="width: 14.2857%;">
@@ -4088,7 +3976,7 @@ xxx<br>
 </div>
 </div>
 <div class="sect1">
-<h2 id="_dg_project-lombok">9. Appendix: Project Lombok</h2>
+<h2 id="_dg_project-lombok">8. Appendix: Project Lombok</h2>
 <div class="sectionbody">
 <div class="paragraph">
 <p><a href="https://projectlombok.org/">Project Lombok</a> is an open source project to reduce the amount of boilerplate in
@@ -4130,7 +4018,7 @@ within your IDE (eg so that its compiler "knows" that there is, actually, a gett
 Lombok plugin appropriate to that IDE.  See the <a href="https://projectlombok.org/download.html">Lombok download page</a> for more information.</p>
 </div>
 <div class="sect2">
-<h3 id="_future_thoughts">9.1. Future thoughts</h3>
+<h3 id="_future_thoughts">8.1. Future thoughts</h3>
 <div class="paragraph">
 <p>In the future we might extend/fork Lombok so that it understands Isis' own annotations (ie <a href="rgant.html#_rgant-Property"><code>@Property</code></a> and <a href="rgant.html#_rgant-Collection"><code>@Collection</code></a>)
 rather than Lombok&#8217;s own <code>@Getter</code> and `@Setter.</p>
@@ -4142,7 +4030,7 @@ rather than Lombok&#8217;s own <code>@Getter</code> and `@Setter.</p>
 </div>
 </div>
 <div class="sect1">
-<h2 id="_dg_agilej">10. Appendix: AgileJ</h2>
+<h2 id="_dg_agilej">9. Appendix: AgileJ</h2>
 <div class="sectionbody">
 <div class="admonitionblock note">
 <table>
@@ -4152,7 +4040,7 @@ rather than Lombok&#8217;s own <code>@Getter</code> and `@Setter.</p>
 </td>
 <td class="content">
 <div class="paragraph">
-<p>This material does not constitute an endorsement; AgileJ Structure Views is not affiliated to Apache Software Foundation in any way.</p>
+<p>This material does not constitute an endorsement; AgileJ Structure Views is not affiliated to Apache Software Foundation in any way.  AgileJ has however provided a complimentary copy of its software to Apache Isis committers.</p>
 </div>
 </td>
 </tr>
@@ -4234,7 +4122,9 @@ hide method lines</code></pre>
 <ul class="sectlevel4">
 <li><a href="#_download_and_install">Download and Install</a></li>
 <li><a href="#_new_project">New Project</a></li>
-<li><a href="#_import_settings">Import Settings</a></li>
+<li><a href="#_dg_ide_intellij_file-templates">File templates</a></li>
+<li><a href="#_dg_ide_intellij_live-templates">Live templates</a></li>
+<li><a href="#_dg_ide_intellij_coding-standards">Coding Standards</a></li>
 <li><a href="#_dg_ide_intellij_other-settings-compiler">Other Settings (Compiler)</a></li>
 <li><a href="#_dg_ide_intellij_other-settings-maven">Other Settings (Maven)</a></li>
 <li><a href="#_other_settings_misc">Other Settings (Misc)</a></li>
@@ -4271,18 +4161,19 @@ hide method lines</code></pre>
 </li>
 <li><a href="#_dg_ide_eclipse">2.2. Developing using Eclipse</a>
 <ul class="sectlevel3">
-<li><a href="#_screencast">2.2.1. Screencast</a></li>
-<li><a href="#_importing_the_project">2.2.2. Importing the Project</a></li>
-<li><a href="#_add_datanucleus_support">2.2.3. Add DataNucleus support</a>
+<li><a href="#_dg_ide_eclipse_screencast">2.2.1. Screencast</a></li>
+<li><a href="#_dg_ide_eclipse_editor-templates">2.2.2. Editor Templates</a></li>
+<li><a href="#_dg_ide_eclipse_importing-the-project">2.2.3. Importing the Project</a></li>
+<li><a href="#_add_datanucleus_support">2.2.4. Add DataNucleus support</a>
 <ul class="sectlevel4">
 <li><a href="#_update_the_classpath">Update the classpath</a></li>
 <li><a href="#_workaround_for_path_limits_the_dn_plugin_to_use_the_persistence_xml">Workaround for path limits (the DN plugin to use the persistence.xml)</a></li>
 <li><a href="#_workaround_if_the_enhancer_fails">Workaround: If the enhancer fails</a></li>
 </ul>
 </li>
-<li><a href="#_running_the_app_2">2.2.4. Running the App</a></li>
-<li><a href="#_other_domain_projects">2.2.5. Other domain projects.</a></li>
-<li><a href="#_advanced">2.2.6. Advanced</a>
+<li><a href="#_running_the_app_2">2.2.5. Running the App</a></li>
+<li><a href="#_other_domain_projects">2.2.6. Other domain projects.</a></li>
+<li><a href="#_advanced">2.2.7. Advanced</a>
 <ul class="sectlevel4">
 <li><a href="#_setting_up_dynamic_reloading">Setting up Dynamic Reloading</a></li>
 </ul>
@@ -4291,124 +4182,112 @@ hide method lines</code></pre>
 </li>
 </ul>
 </li>
-<li><a href="#_dg_ide-templates">3. Code and File Templates</a>
-<ul class="sectlevel2">
-<li><a href="#_download">3.1. Download</a></li>
-<li><a href="#_installation">3.2. Installation</a>
-<ul class="sectlevel3">
-<li><a href="#_intellij">3.2.1. IntelliJ</a></li>
-<li><a href="#_eclipse">3.2.2. Eclipse</a></li>
-</ul>
-</li>
-<li><a href="#_usage">3.3. Usage</a></li>
-</ul>
-</li>
-<li><a href="#_dg_building-isis">4. Building Apache Isis</a>
+<li><a href="#_dg_building-isis">3. Building Apache Isis</a>
 <ul class="sectlevel2">
-<li><a href="#_dg_building-isis_git">4.1. Git</a>
+<li><a href="#_dg_building-isis_git">3.1. Git</a>
 <ul class="sectlevel3">
-<li><a href="#_dg_building-isis_git_installation">4.1.1. Installation</a>
+<li><a href="#_dg_building-isis_git_installation">3.1.1. Installation</a>
 <ul class="sectlevel4">
 <li><a href="#_dg_building-isis_git_installation_cloning-the-apache-isis-repo">Cloning the Apache Isis repo</a></li>
 <li><a href="#_dg_building-isis_git_installation_configuring-git">Configuring Git</a></li>
 </ul>
 </li>
-<li><a href="#_dg_building-isis_git_getting-help">4.1.2. Getting help</a></li>
+<li><a href="#_dg_building-isis_git_getting-help">3.1.2. Getting help</a></li>
 </ul>
 </li>
-<li><a href="#_dg_building-isis_installing-java">4.2. Installing Java</a>
+<li><a href="#_dg_building-isis_installing-java">3.2. Installing Java</a>
 <ul class="sectlevel3">
-<li><a href="#_dg_building-isis_configure-maven-toolchains-plugin">4.2.1. Configure Maven toolchains plugin</a></li>
+<li><a href="#_dg_building-isis_configure-maven-toolchains-plugin">3.2.1. Configure Maven toolchains plugin</a></li>
 </ul>
 </li>
-<li><a href="#_dg_building-isis_installing-maven">4.3. Installing Maven</a></li>
-<li><a href="#_dg_building-isis_building-all-of-apache-isis">4.4. Building all of Apache Isis</a></li>
-<li><a href="#_dg_building-isis_checking-for-vulnerabilities">4.5. Checking for Vulnerabilities</a></li>
-<li><a href="#_dg_building-isis_checking-for-use-of-internal-jdk-apis">4.6. Checking for use of internal JDK APIs</a></li>
+<li><a href="#_dg_building-isis_installing-maven">3.3. Installing Maven</a></li>
+<li><a href="#_dg_building-isis_building-all-of-apache-isis">3.4. Building all of Apache Isis</a></li>
+<li><a href="#_dg_building-isis_checking-for-vulnerabilities">3.5. Checking for Vulnerabilities</a></li>
+<li><a href="#_dg_building-isis_checking-for-use-of-internal-jdk-apis">3.6. Checking for use of internal JDK APIs</a></li>
 </ul>
 </li>
-<li><a href="#_dg_asciidoc">5. AsciiDoc Documentation</a>
+<li><a href="#_dg_asciidoc">4. AsciiDoc Documentation</a>
 <ul class="sectlevel2">
-<li><a href="#_where_to_find_the_docs">5.1. Where to find the Docs</a></li>
-<li><a href="#_naming_conventions">5.2. Naming Conventions</a></li>
-<li><a href="#_writing_the_docs">5.3. Writing the docs</a></li>
-<li><a href="#_build_and_review_using_maven">5.4. Build and Review (using Maven)</a></li>
-<li><a href="#_instant_rebuild_using_ruby">5.5. Instant Rebuild (using Ruby)</a>
+<li><a href="#_where_to_find_the_docs">4.1. Where to find the Docs</a></li>
+<li><a href="#_naming_conventions">4.2. Naming Conventions</a></li>
+<li><a href="#_writing_the_docs">4.3. Writing the docs</a></li>
+<li><a href="#_build_and_review_using_maven">4.4. Build and Review (using Maven)</a></li>
+<li><a href="#_instant_rebuild_using_ruby">4.5. Instant Rebuild (using Ruby)</a>
 <ul class="sectlevel3">
-<li><a href="#_one_time_setup">5.5.1. One-time setup</a></li>
-<li><a href="#_instant_rebuild">5.5.2. Instant Rebuild</a></li>
+<li><a href="#_one_time_setup">4.5.1. One-time setup</a></li>
+<li><a href="#_instant_rebuild">4.5.2. Instant Rebuild</a></li>
 </ul>
 </li>
-<li><a href="#_publish_procedure">5.6. Publish procedure</a>
+<li><a href="#_publish_procedure">4.6. Publish procedure</a>
 <ul class="sectlevel3">
-<li><a href="#_one_time_setup_2">5.6.1. One-time setup</a></li>
-<li><a href="#_publishing_full_build">5.6.2. Publishing (full build)</a></li>
-<li><a href="#_publishing_partial_build">5.6.3. Publishing (partial build)</a></li>
+<li><a href="#_one_time_setup_2">4.6.1. One-time setup</a></li>
+<li><a href="#_publishing_full_build">4.6.2. Publishing (full build)</a></li>
+<li><a href="#_publishing_partial_build">4.6.3. Publishing (partial build)</a></li>
 </ul>
 </li>
 </ul>
 </li>
-<li><a href="#_dg_contributing">6. Contributing</a>
+<li><a href="#_dg_contributing">5. Contributing</a>
 <ul class="sectlevel2">
-<li><a href="#_recommended_workflow_github">6.1. Recommended Workflow (github)</a></li>
-<li><a href="#_alternative_workflow_jira_patches">6.2. Alternative Workflow (JIRA patches)</a></li>
-<li><a href="#_setting_up_your_fork_clone">6.3. Setting up your fork/clone</a></li>
-<li><a href="#_commit_messages">6.4. Commit messages</a></li>
-<li><a href="#_creating_the_patch_file">6.5. Creating the patch file</a></li>
-<li><a href="#_sample_contribution_workflow">6.6. Sample Contribution Workflow</a>
+<li><a href="#_recommended_workflow_github">5.1. Recommended Workflow (github)</a></li>
+<li><a href="#_alternative_workflow_jira_patches">5.2. Alternative Workflow (JIRA patches)</a></li>
+<li><a href="#_setting_up_your_fork_clone">5.3. Setting up your fork/clone</a></li>
+<li><a href="#_commit_messages">5.4. Commit messages</a></li>
+<li><a href="#_creating_the_patch_file">5.5. Creating the patch file</a></li>
+<li><a href="#_sample_contribution_workflow">5.6. Sample Contribution Workflow</a>
 <ul class="sectlevel3">
-<li><a href="#_update_your_master_branch">6.6.1. Update your master branch</a></li>
-<li><a href="#_create_a_topic_branch">6.6.2. Create a topic branch</a></li>
-<li><a href="#_make_file_changes_and_commit">6.6.3. Make File Changes and Commit</a></li>
-<li><a href="#_rebasing_with_code_master_code">6.6.4. Rebasing with <code>master</code></a></li>
-<li><a href="#_raising_a_pull_request">6.6.5. Raising a pull request</a></li>
+<li><a href="#_update_your_master_branch">5.6.1. Update your master branch</a></li>
+<li><a href="#_create_a_topic_branch">5.6.2. Create a topic branch</a></li>
+<li><a href="#_make_file_changes_and_commit">5.6.3. Make File Changes and Commit</a></li>
+<li><a href="#_rebasing_with_code_master_code">5.6.4. Rebasing with <code>master</code></a></li>
+<li><a href="#_raising_a_pull_request">5.6.5. Raising a pull request</a></li>
 </ul>
 </li>
-<li><a href="#_if_your_pull_request_is_accepted">6.7. If your pull request is accepted</a>
+<li><a href="#_if_your_pull_request_is_accepted">5.7. If your pull request is accepted</a>
 <ul class="sectlevel3">
-<li><a href="#_if_your_pull_request_is_rejected">6.7.1. If your pull request is rejected</a></li>
+<li><a href="#_if_your_pull_request_is_rejected">5.7.1. If your pull request is rejected</a></li>
 </ul>
 </li>
 </ul>
 </li>
-<li><a href="#_dg_git-cookbook">7. Appendix: Git Cookbook</a>
+<li><a href="#_dg_git-cookbook">6. Appendix: Git Cookbook</a>
 <ul class="sectlevel2">
-<li><a href="#_modifying_existing_files">7.1. Modifying existing files</a></li>
-<li><a href="#_adding_new_files">7.2. Adding new files</a></li>
-<li><a href="#_deleting_files">7.3. Deleting files</a></li>
-<li><a href="#_renaming_or_moving_files">7.4. Renaming or moving files</a></li>
-<li><a href="#_common_workflows">7.5. Common Workflows</a></li>
-<li><a href="#_backing_up_a_local_branch">7.6. Backing up a local branch</a></li>
-<li><a href="#_quick_change_stashing_changes">7.7. Quick change: stashing changes</a></li>
-<li><a href="#_ignoring_files">7.8. Ignoring files</a></li>
-<li><a href="#_more_advanced_use_cases">7.9. More advanced use cases</a>
+<li><a href="#_modifying_existing_files">6.1. Modifying existing files</a></li>
+<li><a href="#_adding_new_files">6.2. Adding new files</a></li>
+<li><a href="#_deleting_files">6.3. Deleting files</a></li>
+<li><a href="#_renaming_or_moving_files">6.4. Renaming or moving files</a></li>
+<li><a href="#_common_workflows">6.5. Common Workflows</a></li>
+<li><a href="#_backing_up_a_local_branch">6.6. Backing up a local branch</a></li>
+<li><a href="#_quick_change_stashing_changes">6.7. Quick change: stashing changes</a></li>
+<li><a href="#_ignoring_files">6.8. Ignoring files</a></li>
+<li><a href="#_more_advanced_use_cases">6.9. More advanced use cases</a>
 <ul class="sectlevel3">
-<li><a href="#_if_accidentally_push_to_remote">7.9.1. If accidentally push to remote</a></li>
+<li><a href="#_if_accidentally_push_to_remote">6.9.1. If accidentally push to remote</a></li>
 </ul>
 </li>
-<li><a href="#_if_you_ve_accidentally_worked_on_code_master_code_branch">7.10. If you&#8217;ve accidentally worked on <code>master</code> branch</a></li>
-<li><a href="#_if_you_ve_forgotten_to_prefix_your_commits_but_not_pushed">7.11. If you&#8217;ve forgotten to prefix your commits (but not pushed)</a></li>
+<li><a href="#_if_you_ve_accidentally_worked_on_code_master_code_branch">6.10. If you&#8217;ve accidentally worked on <code>master</code> branch</a></li>
+<li><a href="#_if_you_ve_forgotten_to_prefix_your_commits_but_not_pushed">6.11. If you&#8217;ve forgotten to prefix your commits (but not pushed)</a></li>
 </ul>
 </li>
-<li><a href="#_dg_asciidoc-templates">8. Appendix: Asciidoc Templates</a>
+<li><a href="#_dg_asciidoc-templates">7. Appendix: Asciidoc Templates</a>
 <ul class="sectlevel2">
-<li><a href="#_callouts">8.1. Callouts</a></li>
-<li><a href="#_todo_notes">8.2. TODO notes</a></li>
-<li><a href="#_xref_to_guides">8.3. Xref to Guides</a></li>
-<li><a href="#_link_to_isis_addons">8.4. Link to Isis Addons</a></li>
-<li><a href="#_source_code">8.5. Source code</a></li>
-<li><a href="#_images">8.6. Images</a></li>
-<li><a href="#_youtube_screencasts">8.7. YouTube (screencasts)</a></li>
-<li><a href="#_tables">8.8. Tables</a></li>
-<li><a href="#_misc">8.9. Misc.</a></li>
+<li><a href="#_callouts">7.1. Callouts</a></li>
+<li><a href="#_todo_notes">7.2. TODO notes</a></li>
+<li><a href="#_xref_to_guides">7.3. Xref to Guides</a></li>
+<li><a href="#_link_to_isis_addons">7.4. Link to Isis Addons</a></li>
+<li><a href="#_source_code">7.5. Source code</a></li>
+<li><a href="#_images">7.6. Images</a></li>
+<li><a href="#_youtube_screencasts">7.7. YouTube (screencasts)</a></li>
+<li><a href="#_tables">7.8. Tables</a></li>
+<li><a href="#_misc">7.9. Misc.</a></li>
 </ul>
 </li>
-<li><a href="#_dg_project-lombok">9. Appendix: Project Lombok</a>
+<li><a href="#_dg_project-lombok">8. Appendix: Project Lombok</a>
 <ul class="sectlevel2">
-<li><a href="#_future_thoughts">9.1. Future thoughts</a></li>
+<li><a href="#_future_thoughts">8.1. Future thoughts</a></li>
 </ul>
 </li>
-<li><a href="#_dg_agilej">10. Appendix: AgileJ</a></li>
+<li><a href="#_dg_agilej">9. Appendix: AgileJ</a></li>
 </ul>
             </div>
         </div>

[7/8] isis-site git commit: ISIS-1335: improving docs for setting up file/live templates for IntelliJ, some small fixes. Also updated the cheat sheet PDF/docx

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/ec1efb3c/content/guides/dg.pdf
----------------------------------------------------------------------
diff --git a/content/guides/dg.pdf b/content/guides/dg.pdf
index 08eb585..17edd9e 100644
--- a/content/guides/dg.pdf
+++ b/content/guides/dg.pdf
@@ -4,16 +4,16 @@
 << /Title (Developers' Guide)
 /Creator (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0)
 /Producer (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0)
-/CreationDate (D:20160409075515+01'00')
-/ModDate (D:20160409075515+01'00')
+/CreationDate (D:20160425191101+01'00')
+/ModDate (D:20160425191101+01'00')
 >>
 endobj
 2 0 obj
 << /Type /Catalog
 /Pages 3 0 R
 /Names 16 0 R
-/Outlines 660 0 R
-/PageLabels 719 0 R
+/Outlines 645 0 R
+/PageLabels 700 0 R
 /PageMode /UseOutlines
 /OpenAction [7 0 R /FitH 842.89]
 /ViewerPreferences << /DisplayDocTitle true
@@ -23,7 +23,7 @@ endobj
 3 0 obj
 << /Type /Pages
 /Count 86
-/Kids [7 0 R 10 0 R 12 0 R 14 0 R 34 0 R 45 0 R 49 0 R 54 0 R 59 0 R 62 0 R 67 0 R 75 0 R 80 0 R 85 0 R 88 0 R 92 0 R 96 0 R 99 0 R 103 0 R 107 0 R 112 0 R 115 0 R 120 0 R 124 0 R 131 0 R 138 0 R 145 0 R 149 0 R 154 0 R 159 0 R 164 0 R 171 0 R 178 0 R 184 0 R 191 0 R 202 0 R 207 0 R 218 0 R 226 0 R 231 0 R 240 0 R 257 0 R 261 0 R 276 0 R 282 0 R 294 0 R 299 0 R 309 0 R 311 0 R 322 0 R 334 0 R 342 0 R 349 0 R 351 0 R 367 0 R 377 0 R 390 0 R 397 0 R 404 0 R 413 0 R 415 0 R 424 0 R 435 0 R 443 0 R 448 0 R 451 0 R 459 0 R 462 0 R 465 0 R 468 0 R 471 0 R 475 0 R 478 0 R 481 0 R 484 0 R 487 0 R 490 0 R 493 0 R 496 0 R 499 0 R 502 0 R 510 0 R 518 0 R 523 0 R 526 0 R 541 0 R]
+/Kids [7 0 R 10 0 R 12 0 R 14 0 R 34 0 R 44 0 R 49 0 R 54 0 R 59 0 R 63 0 R 67 0 R 73 0 R 78 0 R 87 0 R 92 0 R 95 0 R 99 0 R 103 0 R 106 0 R 110 0 R 114 0 R 119 0 R 122 0 R 127 0 R 131 0 R 140 0 R 145 0 R 152 0 R 156 0 R 161 0 R 166 0 R 171 0 R 178 0 R 185 0 R 191 0 R 198 0 R 213 0 R 218 0 R 225 0 R 233 0 R 240 0 R 245 0 R 254 0 R 269 0 R 275 0 R 287 0 R 292 0 R 302 0 R 304 0 R 316 0 R 328 0 R 336 0 R 342 0 R 344 0 R 359 0 R 369 0 R 383 0 R 390 0 R 397 0 R 406 0 R 408 0 R 417 0 R 427 0 R 435 0 R 440 0 R 443 0 R 452 0 R 455 0 R 458 0 R 461 0 R 464 0 R 468 0 R 471 0 R 474 0 R 477 0 R 480 0 R 483 0 R 486 0 R 489 0 R 492 0 R 495 0 R 503 0 R 511 0 R 516 0 R 519 0 R 534 0 R]
 >>
 endobj
 4 0 obj
@@ -80,15 +80,15 @@ endobj
 << /Type /Font
 /BaseFont /AAAAAI+NotoSerif
 /Subtype /TrueType
-/FontDescriptor 721 0 R
+/FontDescriptor 702 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 723 0 R
-/ToUnicode 722 0 R
+/Widths 704 0 R
+/ToUnicode 703 0 R
 >>
 endobj
 9 0 obj
-<< /Length 31789
+<< /Length 31987
 >>
 stream
 q
@@ -300,7 +300,7 @@ ET
 BT
 535.3009999999999 677.9359999999999 Td
 /F1.0 10.5 Tf
-<3332> Tj
+<3333> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -311,7 +311,7 @@ ET
 BT
 48.24 659.4559999999999 Td
 /F1.0 10.5 Tf
-[<332e20436f646520616e642046696c652054> 29.78515625 <656d706c61746573>] TJ
+<332e204275696c64696e67204170616368652049736973> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -320,9 +320,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-186.54874999999993 659.4559999999999 Td
+165.17074999999994 659.4559999999999 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -340,7 +340,7 @@ ET
 BT
 535.3009999999999 659.4559999999999 Td
 /F1.0 10.5 Tf
-<3338> Tj
+<3430> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -351,7 +351,7 @@ ET
 BT
 60.24 640.9759999999999 Td
 /F1.0 10.5 Tf
-<332e312e20446f776e6c6f6164> Tj
+<332e312e20476974> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -360,9 +360,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-133.10374999999993 640.9759999999999 Td
+95.69224999999994 640.9759999999999 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -380,7 +380,7 @@ ET
 BT
 535.3009999999999 640.9759999999999 Td
 /F1.0 10.5 Tf
-<3338> Tj
+<3430> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -391,7 +391,7 @@ ET
 BT
 60.24 622.4959999999999 Td
 /F1.0 10.5 Tf
-<332e322e20496e7374616c6c6174696f6e> Tj
+<332e322e20496e7374616c6c696e67204a617661> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -400,9 +400,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-138.44824999999992 622.4959999999999 Td
+154.48174999999992 622.4959999999999 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -420,7 +420,7 @@ ET
 BT
 535.3009999999999 622.4959999999999 Td
 /F1.0 10.5 Tf
-<3338> Tj
+<3432> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -431,7 +431,7 @@ ET
 BT
 60.24 604.0159999999998 Td
 /F1.0 10.5 Tf
-<332e332e205573616765> Tj
+<332e332e20496e7374616c6c696e67204d6176656e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -440,9 +440,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-111.72574999999995 604.0159999999998 Td
+165.17074999999994 604.0159999999998 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -460,7 +460,7 @@ ET
 BT
 535.3009999999999 604.0159999999998 Td
 /F1.0 10.5 Tf
-<3339> Tj
+<3433> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -469,9 +469,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 585.5359999999998 Td
+60.24 585.5359999999998 Td
 /F1.0 10.5 Tf
-<342e204275696c64696e67204170616368652049736973> Tj
+<332e342e204275696c64696e6720616c6c206f66204170616368652049736973> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -480,9 +480,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-165.17074999999994 585.5359999999998 Td
+213.27124999999995 585.5359999999998 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -500,7 +500,7 @@ ET
 BT
 535.3009999999999 585.5359999999998 Td
 /F1.0 10.5 Tf
-<3430> Tj
+<3434> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -511,7 +511,7 @@ ET
 BT
 60.24 567.0559999999998 Td
 /F1.0 10.5 Tf
-<342e312e20476974> Tj
+[<332e352e20436865636b696e6720666f722056756c6e6572> 20.01953125 <6162696c6974696573>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -520,9 +520,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-95.69224999999994 567.0559999999998 Td
+223.96024999999997 567.0559999999998 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -540,7 +540,7 @@ ET
 BT
 535.3009999999999 567.0559999999998 Td
 /F1.0 10.5 Tf
-<3430> Tj
+<3434> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -551,7 +551,7 @@ ET
 BT
 60.24 548.5759999999998 Td
 /F1.0 10.5 Tf
-<342e322e20496e7374616c6c696e67204a617661> Tj
+<332e362e20436865636b696e6720666f7220757365206f6620696e7465726e616c204a444b2041504973> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -560,9 +560,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-154.48174999999992 548.5759999999998 Td
+266.71624999999995 548.5759999999998 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -580,7 +580,7 @@ ET
 BT
 535.3009999999999 548.5759999999998 Td
 /F1.0 10.5 Tf
-<3432> Tj
+<3434> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -589,9 +589,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24 530.0959999999998 Td
+48.24 530.0959999999998 Td
 /F1.0 10.5 Tf
-<342e332e20496e7374616c6c696e67204d6176656e> Tj
+<342e204173636969446f6320446f63756d656e746174696f6e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -600,9 +600,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-165.17074999999994 530.0959999999998 Td
+186.54874999999993 530.0959999999998 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -620,7 +620,7 @@ ET
 BT
 535.3009999999999 530.0959999999998 Td
 /F1.0 10.5 Tf
-<3433> Tj
+<3436> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -631,7 +631,7 @@ ET
 BT
 60.24 511.6159999999998 Td
 /F1.0 10.5 Tf
-<342e342e204275696c64696e6720616c6c206f66204170616368652049736973> Tj
+<342e312e20576865726520746f2066696e642074686520446f6373> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -640,9 +640,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-213.27124999999995 511.6159999999998 Td
+197.23774999999995 511.6159999999998 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -660,7 +660,7 @@ ET
 BT
 535.3009999999999 511.6159999999998 Td
 /F1.0 10.5 Tf
-<3434> Tj
+<3436> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -671,7 +671,7 @@ ET
 BT
 60.24 493.1359999999998 Td
 /F1.0 10.5 Tf
-[<342e352e20436865636b696e6720666f722056756c6e6572> 20.01953125 <6162696c6974696573>] TJ
+<342e322e204e616d696e6720436f6e76656e74696f6e73> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -680,9 +680,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-223.96024999999997 493.1359999999998 Td
+186.54874999999993 493.1359999999998 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -700,7 +700,7 @@ ET
 BT
 535.3009999999999 493.1359999999998 Td
 /F1.0 10.5 Tf
-<3434> Tj
+<3436> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -711,7 +711,7 @@ ET
 BT
 60.24 474.6559999999998 Td
 /F1.0 10.5 Tf
-<342e362e20436865636b696e6720666f7220757365206f6620696e7465726e616c204a444b2041504973> Tj
+<342e332e2057726974696e672074686520646f6373> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -720,9 +720,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-266.71624999999995 474.6559999999998 Td
+165.17074999999994 474.6559999999998 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -740,7 +740,7 @@ ET
 BT
 535.3009999999999 474.6559999999998 Td
 /F1.0 10.5 Tf
-<3434> Tj
+<3437> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -749,9 +749,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 456.17599999999976 Td
+60.24 456.17599999999976 Td
 /F1.0 10.5 Tf
-<352e204173636969446f6320446f63756d656e746174696f6e> Tj
+<342e342e204275696c6420616e642052657669657720287573696e67204d6176656e29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -760,9 +760,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-186.54874999999993 456.17599999999976 Td
+245.33824999999996 456.17599999999976 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -780,7 +780,7 @@ ET
 BT
 535.3009999999999 456.17599999999976 Td
 /F1.0 10.5 Tf
-<3436> Tj
+<3437> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -791,7 +791,7 @@ ET
 BT
 60.24 437.69599999999974 Td
 /F1.0 10.5 Tf
-<352e312e20576865726520746f2066696e642074686520446f6373> Tj
+[<342e352e20496e7374616e742052656275696c6420287573696e6720527562> 20.01953125 <7929>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -800,9 +800,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-197.23774999999995 437.69599999999974 Td
+223.96024999999997 437.69599999999974 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -820,7 +820,7 @@ ET
 BT
 535.3009999999999 437.69599999999974 Td
 /F1.0 10.5 Tf
-<3436> Tj
+<3437> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -831,7 +831,7 @@ ET
 BT
 60.24 419.2159999999997 Td
 /F1.0 10.5 Tf
-<352e322e204e616d696e6720436f6e76656e74696f6e73> Tj
+<342e362e205075626c6973682070726f636564757265> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -840,9 +840,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-186.54874999999993 419.2159999999997 Td
+175.85974999999996 419.2159999999997 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -860,7 +860,7 @@ ET
 BT
 535.3009999999999 419.2159999999997 Td
 /F1.0 10.5 Tf
-<3436> Tj
+<3438> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -869,9 +869,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24 400.7359999999997 Td
+48.24 400.7359999999997 Td
 /F1.0 10.5 Tf
-<352e332e2057726974696e672074686520646f6373> Tj
+<352e20436f6e747269627574696e67> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -880,9 +880,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-165.17074999999994 400.7359999999997 Td
+127.75924999999995 400.7359999999997 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -900,7 +900,7 @@ ET
 BT
 535.3009999999999 400.7359999999997 Td
 /F1.0 10.5 Tf
-<3437> Tj
+<3531> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -911,7 +911,7 @@ ET
 BT
 60.24 382.2559999999997 Td
 /F1.0 10.5 Tf
-<352e342e204275696c6420616e642052657669657720287573696e67204d6176656e29> Tj
+[<352e312e205265636f6d6d656e6465642057> 60.05859375 <6f726b666c6f77202867697468756229>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -920,9 +920,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-245.33824999999996 382.2559999999997 Td
+250.68274999999994 382.2559999999997 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -940,7 +940,7 @@ ET
 BT
 535.3009999999999 382.2559999999997 Td
 /F1.0 10.5 Tf
-<3437> Tj
+<3531> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -951,7 +951,7 @@ ET
 BT
 60.24 363.77599999999967 Td
 /F1.0 10.5 Tf
-[<352e352e20496e7374616e742052656275696c6420287573696e6720527562> 20.01953125 <7929>] TJ
+[<352e322e20416c7465726e61746976652057> 60.05859375 <6f726b666c6f7720284a495241207061746368657329>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -960,9 +960,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-223.96024999999997 363.77599999999967 Td
+266.71624999999995 363.77599999999967 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -980,7 +980,7 @@ ET
 BT
 535.3009999999999 363.77599999999967 Td
 /F1.0 10.5 Tf
-<3437> Tj
+<3532> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -991,7 +991,7 @@ ET
 BT
 60.24 345.29599999999965 Td
 /F1.0 10.5 Tf
-<352e362e205075626c6973682070726f636564757265> Tj
+<352e332e2053657474696e6720757020796f757220666f726b2f636c6f6e65> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1000,9 +1000,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-175.85974999999996 345.29599999999965 Td
+213.27124999999995 345.29599999999965 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1020,7 +1020,7 @@ ET
 BT
 535.3009999999999 345.29599999999965 Td
 /F1.0 10.5 Tf
-<3438> Tj
+<3533> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1029,9 +1029,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 326.81599999999963 Td
+60.24 326.81599999999963 Td
 /F1.0 10.5 Tf
-<362e20436f6e747269627574696e67> Tj
+<352e342e20436f6d6d6974206d65737361676573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1040,9 +1040,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-127.75924999999995 326.81599999999963 Td
+170.51524999999992 326.81599999999963 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1060,7 +1060,7 @@ ET
 BT
 535.3009999999999 326.81599999999963 Td
 /F1.0 10.5 Tf
-<3531> Tj
+<3533> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1071,7 +1071,7 @@ ET
 BT
 60.24 308.3359999999996 Td
 /F1.0 10.5 Tf
-[<362e312e205265636f6d6d656e6465642057> 60.05859375 <6f726b666c6f77202867697468756229>] TJ
+<352e352e204372656174696e67207468652070617463682066696c65> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1080,9 +1080,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-250.68274999999994 308.3359999999996 Td
+191.89324999999997 308.3359999999996 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1100,7 +1100,7 @@ ET
 BT
 535.3009999999999 308.3359999999996 Td
 /F1.0 10.5 Tf
-<3531> Tj
+<3534> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1111,7 +1111,7 @@ ET
 BT
 60.24 289.8559999999996 Td
 /F1.0 10.5 Tf
-[<362e322e20416c7465726e61746976652057> 60.05859375 <6f726b666c6f7720284a495241207061746368657329>] TJ
+[<352e362e2053616d706c6520436f6e747269627574696f6e2057> 60.05859375 <6f726b666c6f77>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -1120,9 +1120,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-266.71624999999995 289.8559999999996 Td
+239.99374999999998 289.8559999999996 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1140,7 +1140,7 @@ ET
 BT
 535.3009999999999 289.8559999999996 Td
 /F1.0 10.5 Tf
-<3532> Tj
+<3534> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1151,7 +1151,7 @@ ET
 BT
 60.24 271.3759999999996 Td
 /F1.0 10.5 Tf
-<362e332e2053657474696e6720757020796f757220666f726b2f636c6f6e65> Tj
+<352e372e20496620796f75722070756c6c2072657175657374206973206163636570746564> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1160,9 +1160,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-213.27124999999995 271.3759999999996 Td
+239.99374999999998 271.3759999999996 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1180,7 +1180,7 @@ ET
 BT
 535.3009999999999 271.3759999999996 Td
 /F1.0 10.5 Tf
-<3533> Tj
+<3536> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1189,9 +1189,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24 252.89599999999956 Td
+48.24 252.89599999999956 Td
 /F1.0 10.5 Tf
-<362e342e20436f6d6d6974206d65737361676573> Tj
+<362e20417070656e6469783a2047697420436f6f6b626f6f6b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1200,9 +1200,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-170.51524999999992 252.89599999999956 Td
+181.20424999999994 252.89599999999956 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1220,7 +1220,7 @@ ET
 BT
 535.3009999999999 252.89599999999956 Td
 /F1.0 10.5 Tf
-<3533> Tj
+<3538> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1231,7 +1231,7 @@ ET
 BT
 60.24 234.41599999999957 Td
 /F1.0 10.5 Tf
-<362e352e204372656174696e67207468652070617463682066696c65> Tj
+<362e312e204d6f64696679696e67206578697374696e672066696c6573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1240,9 +1240,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-191.89324999999997 234.41599999999957 Td
+202.58224999999993 234.41599999999957 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1260,7 +1260,7 @@ ET
 BT
 535.3009999999999 234.41599999999957 Td
 /F1.0 10.5 Tf
-<3534> Tj
+<3538> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1271,7 +1271,7 @@ ET
 BT
 60.24 215.93599999999958 Td
 /F1.0 10.5 Tf
-[<362e362e2053616d706c6520436f6e747269627574696f6e2057> 60.05859375 <6f726b666c6f77>] TJ
+[<362e322e2041> 20.01953125 <6464696e67206e65772066696c6573>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -1280,9 +1280,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-239.99374999999998 215.93599999999958 Td
+165.17074999999994 215.93599999999958 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1300,7 +1300,7 @@ ET
 BT
 535.3009999999999 215.93599999999958 Td
 /F1.0 10.5 Tf
-<3534> Tj
+<3538> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1311,7 +1311,7 @@ ET
 BT
 60.24 197.4559999999996 Td
 /F1.0 10.5 Tf
-<362e372e20496620796f75722070756c6c2072657175657374206973206163636570746564> Tj
+<362e332e2044656c6574696e672066696c6573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1320,9 +1320,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-239.99374999999998 197.4559999999996 Td
+149.13724999999994 197.4559999999996 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1340,7 +1340,7 @@ ET
 BT
 535.3009999999999 197.4559999999996 Td
 /F1.0 10.5 Tf
-<3536> Tj
+<3538> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1349,9 +1349,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 178.9759999999996 Td
+60.24 178.9759999999996 Td
 /F1.0 10.5 Tf
-<372e20417070656e6469783a2047697420436f6f6b626f6f6b> Tj
+<362e342e2052656e616d696e67206f72206d6f76696e672066696c6573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1360,9 +1360,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-181.20424999999994 178.9759999999996 Td
+213.27124999999995 178.9759999999996 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1380,7 +1380,7 @@ ET
 BT
 535.3009999999999 178.9759999999996 Td
 /F1.0 10.5 Tf
-<3538> Tj
+<3539> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1391,7 +1391,7 @@ ET
 BT
 60.24 160.4959999999996 Td
 /F1.0 10.5 Tf
-<372e312e204d6f64696679696e67206578697374696e672066696c6573> Tj
+[<362e352e20436f6d6d6f6e2057> 60.05859375 <6f726b666c6f7773>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -1400,9 +1400,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-202.58224999999993 160.4959999999996 Td
+186.54874999999993 160.4959999999996 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1420,7 +1420,7 @@ ET
 BT
 535.3009999999999 160.4959999999996 Td
 /F1.0 10.5 Tf
-<3538> Tj
+<3539> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1431,7 +1431,7 @@ ET
 BT
 60.24 142.01599999999962 Td
 /F1.0 10.5 Tf
-[<372e322e2041> 20.01953125 <6464696e67206e65772066696c6573>] TJ
+[<362e362e204261636b696e672075702061206c6f63616c206272> 20.01953125 <616e6368>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -1440,9 +1440,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-165.17074999999994 142.01599999999962 Td
+213.27124999999995 142.01599999999962 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1460,7 +1460,7 @@ ET
 BT
 535.3009999999999 142.01599999999962 Td
 /F1.0 10.5 Tf
-<3538> Tj
+<3539> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1471,7 +1471,7 @@ ET
 BT
 60.24 123.53599999999963 Td
 /F1.0 10.5 Tf
-<372e332e2044656c6574696e672066696c6573> Tj
+<362e372e20517569636b206368616e67653a207374617368696e67206368616e676573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1480,9 +1480,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-149.13724999999994 123.53599999999963 Td
+239.99374999999998 123.53599999999963 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1500,7 +1500,7 @@ ET
 BT
 535.3009999999999 123.53599999999963 Td
 /F1.0 10.5 Tf
-<3538> Tj
+<3539> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1511,7 +1511,7 @@ ET
 BT
 60.24 105.05599999999964 Td
 /F1.0 10.5 Tf
-<372e342e2052656e616d696e67206f72206d6f76696e672066696c6573> Tj
+<362e382e2049676e6f72696e672066696c6573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1520,9 +1520,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-213.27124999999995 105.05599999999964 Td
+149.13724999999994 105.05599999999964 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1540,7 +1540,7 @@ ET
 BT
 535.3009999999999 105.05599999999964 Td
 /F1.0 10.5 Tf
-<3539> Tj
+<3630> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1551,7 +1551,7 @@ ET
 BT
 60.24 86.57599999999965 Td
 /F1.0 10.5 Tf
-[<372e352e20436f6d6d6f6e2057> 60.05859375 <6f726b666c6f7773>] TJ
+<362e392e204d6f726520616476616e63656420757365206361736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1560,9 +1560,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-186.54874999999993 86.57599999999965 Td
+207.92674999999997 86.57599999999965 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1580,150 +1580,6 @@ ET
 BT
 535.3009999999999 86.57599999999965 Td
 /F1.0 10.5 Tf
-<3539> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-60.24 68.09599999999966 Td
-/F1.0 10.5 Tf
-[<372e362e204261636b696e672075702061206c6f63616c206272> 20.01953125 <616e6368>] TJ
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-213.27124999999995 68.09599999999966 Td
-/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-
-BT
-533.94125 68.09599999999966 Td
-/F1.0 5.25 Tf
-<ca> Tj
-ET
-
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-535.3009999999999 68.09599999999966 Td
-/F1.0 10.5 Tf
-<3539> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-Q
-
-endstream
-endobj
-10 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 595.28 841.89]
-/Contents 9 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 18 0 R
-/F1.0 8 0 R
->>
->>
-/Annots [545 0 R 546 0 R 547 0 R 548 0 R 549 0 R 550 0 R 551 0 R 552 0 R 553 0 R 554 0 R 555 0 R 556 0 R 557 0 R 558 0 R 559 0 R 560 0 R 561 0 R 562 0 R 563 0 R 564 0 R 565 0 R 566 0 R 567 0 R 568 0 R 569 0 R 570 0 R 571 0 R 572 0 R 573 0 R 574 0 R 575 0 R 576 0 R 577 0 R 578 0 R 579 0 R 580 0 R 581 0 R 582 0 R 583 0 R 584 0 R 585 0 R 586 0 R 587 0 R 588 0 R 589 0 R 590 0 R 591 0 R 592 0 R 593 0 R 594 0 R 595 0 R 596 0 R 597 0 R 598 0 R 599 0 R 600 0 R 601 0 R 602 0 R 603 0 R 604 0 R 605 0 R 606 0 R 607 0 R 608 0 R 609 0 R 610 0 R 611 0 R 612 0 R 613 0 R 614 0 R 615 0 R 616 0 R 617 0 R 618 0 R 619 0 R 620 0 R]
->>
-endobj
-11 0 obj
-<< /Length 15415
->>
-stream
-q
-/DeviceRGB cs
-0.200 0.200 0.200 scn
-/DeviceRGB CS
-0.200 0.200 0.200 SCN
-
-BT
-60.24 794.6759999999999 Td
-/F1.0 10.5 Tf
-<372e372e20517569636b206368616e67653a207374617368696e67206368616e676573> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-239.99374999999998 794.6759999999999 Td
-/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-
-BT
-533.94125 794.6759999999999 Td
-/F1.0 5.25 Tf
-<ca> Tj
-ET
-
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-535.3009999999999 794.6759999999999 Td
-/F1.0 10.5 Tf
-<3539> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-60.24 776.1959999999999 Td
-/F1.0 10.5 Tf
-<372e382e2049676e6f72696e672066696c6573> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-149.13724999999994 776.1959999999999 Td
-/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-
-BT
-533.94125 776.1959999999999 Td
-/F1.0 5.25 Tf
-<ca> Tj
-ET
-
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-535.3009999999999 776.1959999999999 Td
-/F1.0 10.5 Tf
 <3630> Tj
 ET
 
@@ -1733,49 +1589,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24 757.7159999999999 Td
-/F1.0 10.5 Tf
-<372e392e204d6f726520616476616e63656420757365206361736573> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-207.92674999999997 757.7159999999999 Td
-/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-
-BT
-533.94125 757.7159999999999 Td
-/F1.0 5.25 Tf
-<ca> Tj
-ET
-
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-535.3009999999999 757.7159999999999 Td
-/F1.0 10.5 Tf
-<3630> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-60.24 739.2359999999999 Td
+60.24 68.09599999999966 Td
 /F1.0 10.5 Tf
-[<372e31302e20496620796f75d57665206163636964656e74616c6c7920776f726b> 20.01953125 <6564206f6e20>] TJ
+[<362e31302e20496620796f75d57665206163636964656e74616c6c7920776f726b> 20.01953125 <6564206f6e20>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -1784,7 +1600,7 @@ ET
 0.694 0.129 0.275 SCN
 
 BT
-251.39229492187502 739.2359999999999 Td
+251.39229492187502 68.09599999999966 Td
 /F5.0 10.5 Tf
 <6d6173746572> Tj
 ET
@@ -1795,7 +1611,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-282.892294921875 739.2359999999999 Td
+282.892294921875 68.09599999999966 Td
 /F1.0 10.5 Tf
 [<206272> 20.01953125 <616e6368>] TJ
 ET
@@ -1806,7 +1622,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-325.5057499999999 739.2359999999999 Td
+325.5057499999999 68.09599999999966 Td
 /F1.0 10.5 Tf
 <2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
@@ -1815,7 +1631,7 @@ ET
 0.000 0.000 0.000 scn
 
 BT
-533.94125 739.2359999999999 Td
+533.94125 68.09599999999966 Td
 /F1.0 5.25 Tf
 <ca> Tj
 ET
@@ -1824,20 +1640,45 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-535.3009999999999 739.2359999999999 Td
+535.3009999999999 68.09599999999966 Td
 /F1.0 10.5 Tf
 <3631> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
+Q
+
+endstream
+endobj
+10 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 595.28 841.89]
+/Contents 9 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 18 0 R
+/F1.0 8 0 R
+/F5.0 51 0 R
+>>
+>>
+/Annots [538 0 R 539 0 R 540 0 R 541 0 R 542 0 R 543 0 R 544 0 R 545 0 R 546 0 R 547 0 R 548 0 R 549 0 R 550 0 R 551 0 R 552 0 R 553 0 R 554 0 R 555 0 R 556 0 R 557 0 R 558 0 R 559 0 R 560 0 R 561 0 R 562 0 R 563 0 R 564 0 R 565 0 R 566 0 R 567 0 R 568 0 R 569 0 R 570 0 R 571 0 R 572 0 R 573 0 R 574 0 R 575 0 R 576 0 R 577 0 R 578 0 R 579 0 R 580 0 R 581 0 R 582 0 R 583 0 R 584 0 R 585 0 R 586 0 R 587 0 R 588 0 R 589 0 R 590 0 R 591 0 R 592 0 R 593 0 R 594 0 R 595 0 R 596 0 R 597 0 R 598 0 R 599 0 R 600 0 R 601 0 R 602 0 R 603 0 R 604 0 R 605 0 R 606 0 R 607 0 R 608 0 R 609 0 R 610 0 R 611 0 R 612 0 R 613 0 R 614 0 R 615 0 R]
+>>
+endobj
+11 0 obj
+<< /Length 11826
+>>
+stream
+q
+/DeviceRGB cs
 0.200 0.200 0.200 scn
+/DeviceRGB CS
 0.200 0.200 0.200 SCN
 
 BT
-60.24 720.7559999999999 Td
+60.24 794.6759999999999 Td
 /F1.0 10.5 Tf
-<372e31312e20496620796f75d5766520666f72676f7474656e20746f2070726566697820796f757220636f6d6d6974732028627574206e6f742070757368656429> Tj
+<362e31312e20496620796f75d5766520666f72676f7474656e20746f2070726566697820796f757220636f6d6d6974732028627574206e6f742070757368656429> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1846,7 +1687,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-384.29524999999995 720.7559999999999 Td
+384.29524999999995 794.6759999999999 Td
 /F1.0 10.5 Tf
 <2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
@@ -1855,7 +1696,7 @@ ET
 0.000 0.000 0.000 scn
 
 BT
-533.94125 720.7559999999999 Td
+533.94125 794.6759999999999 Td
 /F1.0 5.25 Tf
 <ca> Tj
 ET
@@ -1864,7 +1705,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-535.3009999999999 720.7559999999999 Td
+535.3009999999999 794.6759999999999 Td
 /F1.0 10.5 Tf
 <3631> Tj
 ET
@@ -1875,9 +1716,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 702.2759999999998 Td
+48.24 776.1959999999999 Td
 /F1.0 10.5 Tf
-[<382e20417070656e6469783a204173636969646f632054> 29.78515625 <656d706c61746573>] TJ
+[<372e20417070656e6469783a204173636969646f632054> 29.78515625 <656d706c61746573>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -1886,7 +1727,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-213.27124999999995 702.2759999999998 Td
+213.27124999999995 776.1959999999999 Td
 /F1.0 10.5 Tf
 <2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
@@ -1895,7 +1736,7 @@ ET
 0.000 0.000 0.000 scn
 
 BT
-533.94125 702.2759999999998 Td
+533.94125 776.1959999999999 Td
 /F1.0 5.25 Tf
 <ca> Tj
 ET
@@ -1904,7 +1745,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-535.3009999999999 702.2759999999998 Td
+535.3009999999999 776.1959999999999 Td
 /F1.0 10.5 Tf
 <3633> Tj
 ET
@@ -1915,9 +1756,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24 683.7959999999998 Td
+60.24 757.7159999999999 Td
 /F1.0 10.5 Tf
-<382e312e2043616c6c6f757473> Tj
+<372e312e2043616c6c6f757473> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1926,7 +1767,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-122.41474999999997 683.7959999999998 Td
+122.41474999999997 757.7159999999999 Td
 /F1.0 10.5 Tf
 <2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
@@ -1935,7 +1776,7 @@ ET
 0.000 0.000 0.000 scn
 
 BT
-533.94125 683.7959999999998 Td
+533.94125 757.7159999999999 Td
 /F1.0 5.25 Tf
 <ca> Tj
 ET
@@ -1944,7 +1785,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-535.3009999999999 683.7959999999998 Td
+535.3009999999999 757.7159999999999 Td
 /F1.0 10.5 Tf
 <3633> Tj
 ET
@@ -1955,9 +1796,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24 665.3159999999998 Td
+60.24 739.2359999999999 Td
 /F1.0 10.5 Tf
-[<382e322e2054> 20.01953125 <4f444f206e6f746573>] TJ
+[<372e322e2054> 20.01953125 <4f444f206e6f746573>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -1966,7 +1807,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-143.79274999999996 665.3159999999998 Td
+143.79274999999996 739.2359999999999 Td
 /F1.0 10.5 Tf
 <2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
@@ -1975,7 +1816,7 @@ ET
 0.000 0.000 0.000 scn
 
 BT
-533.94125 665.3159999999998 Td
+533.94125 739.2359999999999 Td
 /F1.0 5.25 Tf
 <ca> Tj
 ET
@@ -1984,7 +1825,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-535.3009999999999 665.3159999999998 Td
+535.3009999999999 739.2359999999999 Td
 /F1.0 10.5 Tf
 <3633> Tj
 ET
@@ -1995,9 +1836,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24 646.8359999999998 Td
+60.24 720.7559999999999 Td
 /F1.0 10.5 Tf
-<382e332e205872656620746f20477569646573> Tj
+<372e332e205872656620746f20477569646573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2006,7 +1847,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-154.48174999999992 646.8359999999998 Td
+154.48174999999992 720.7559999999999 Td
 /F1.0 10.5 Tf
 <2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
@@ -2015,7 +1856,7 @@ ET
 0.000 0.000 0.000 scn
 
 BT
-533.94125 646.8359999999998 Td
+533.94125 720.7559999999999 Td
 /F1.0 5.25 Tf
 <ca> Tj
 ET
@@ -2024,7 +1865,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-535.3009999999999 646.8359999999998 Td
+535.3009999999999 720.7559999999999 Td
 /F1.0 10.5 Tf
 <3633> Tj
 ET
@@ -2035,9 +1876,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24 628.3559999999998 Td
+60.24 702.2759999999998 Td
 /F1.0 10.5 Tf
-[<382e342e204c696e6b20746f20497369732041> 20.01953125 <64646f6e73>] TJ
+[<372e342e204c696e6b20746f20497369732041> 20.01953125 <64646f6e73>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -2046,7 +1887,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-175.85974999999996 628.3559999999998 Td
+175.85974999999996 702.2759999999998 Td
 /F1.0 10.5 Tf
 <2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
@@ -2055,7 +1896,7 @@ ET
 0.000 0.000 0.000 scn
 
 BT
-533.94125 628.3559999999998 Td
+533.94125 702.2759999999998 Td
 /F1.0 5.25 Tf
 <ca> Tj
 ET
@@ -2064,7 +1905,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-535.3009999999999 628.3559999999998 Td
+535.3009999999999 702.2759999999998 Td
 /F1.0 10.5 Tf
 <3738> Tj
 ET
@@ -2075,9 +1916,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24 609.8759999999997 Td
+60.24 683.7959999999998 Td
 /F1.0 10.5 Tf
-<382e352e20536f7572636520636f6465> Tj
+<372e352e20536f7572636520636f6465> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2086,7 +1927,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-143.79274999999996 609.8759999999997 Td
+143.79274999999996 683.7959999999998 Td
 /F1.0 10.5 Tf
 <2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
@@ -2095,7 +1936,7 @@ ET
 0.000 0.000 0.000 scn
 
 BT
-533.94125 609.8759999999997 Td
+533.94125 683.7959999999998 Td
 /F1.0 5.25 Tf
 <ca> Tj
 ET
@@ -2104,7 +1945,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-535.3009999999999 609.8759999999997 Td
+535.3009999999999 683.7959999999998 Td
 /F1.0 10.5 Tf
 <3739> Tj
 ET
@@ -2115,9 +1956,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24 591.3959999999997 Td
+60.24 665.3159999999998 Td
 /F1.0 10.5 Tf
-<382e362e20496d61676573> Tj
+<372e362e20496d61676573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2126,7 +1967,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-117.07024999999993 591.3959999999997 Td
+117.07024999999993 665.3159999999998 Td
 /F1.0 10.5 Tf
 <2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
@@ -2135,7 +1976,7 @@ ET
 0.000 0.000 0.000 scn
 
 BT
-533.94125 591.3959999999997 Td
+533.94125 665.3159999999998 Td
 /F1.0 5.25 Tf
 <ca> Tj
 ET
@@ -2144,7 +1985,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-535.3009999999999 591.3959999999997 Td
+535.3009999999999 665.3159999999998 Td
 /F1.0 10.5 Tf
 <3739> Tj
 ET
@@ -2155,9 +1996,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24 572.9159999999997 Td
+60.24 646.8359999999998 Td
 /F1.0 10.5 Tf
-[<382e372e2059> 69.82421875 <6f7554756265202873637265656e636173747329>] TJ
+[<372e372e2059> 69.82421875 <6f7554756265202873637265656e636173747329>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -2166,7 +2007,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-197.23774999999995 572.9159999999997 Td
+197.23774999999995 646.8359999999998 Td
 /F1.0 10.5 Tf
 <2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
@@ -2175,7 +2016,7 @@ ET
 0.000 0.000 0.000 scn
 
 BT
-533.94125 572.9159999999997 Td
+533.94125 646.8359999999998 Td
 /F1.0 5.25 Tf
 <ca> Tj
 ET
@@ -2184,7 +2025,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-535.3009999999999 572.9159999999997 Td
+535.3009999999999 646.8359999999998 Td
 /F1.0 10.5 Tf
 <3830> Tj
 ET
@@ -2195,9 +2036,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24 554.4359999999997 Td
+60.24 628.3559999999998 Td
 /F1.0 10.5 Tf
-[<382e382e2054> 29.78515625 <61626c6573>] TJ
+[<372e382e2054> 29.78515625 <61626c6573>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -2206,7 +2047,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-117.07024999999993 554.4359999999997 Td
+117.07024999999993 628.3559999999998 Td
 /F1.0 10.5 Tf
 <2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
@@ -2215,7 +2056,7 @@ ET
 0.000 0.000 0.000 scn
 
 BT
-533.94125 554.4359999999997 Td
+533.94125 628.3559999999998 Td
 /F1.0 5.25 Tf
 <ca> Tj
 ET
@@ -2224,7 +2065,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-535.3009999999999 554.4359999999997 Td
+535.3009999999999 628.3559999999998 Td
 /F1.0 10.5 Tf
 <3830> Tj
 ET
@@ -2235,9 +2076,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24 535.9559999999997 Td
+60.24 609.8759999999997 Td
 /F1.0 10.5 Tf
-<382e392e204d6973632e> Tj
+<372e392e204d6973632e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2246,7 +2087,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-106.38124999999997 535.9559999999997 Td
+106.38124999999997 609.8759999999997 Td
 /F1.0 10.5 Tf
 <2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
@@ -2255,7 +2096,7 @@ ET
 0.000 0.000 0.000 scn
 
 BT
-533.94125 535.9559999999997 Td
+533.94125 609.8759999999997 Td
 /F1.0 5.25 Tf
 <ca> Tj
 ET
@@ -2264,7 +2105,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-535.3009999999999 535.9559999999997 Td
+535.3009999999999 609.8759999999997 Td
 /F1.0 10.5 Tf
 <3830> Tj
 ET
@@ -2275,9 +2116,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 517.4759999999997 Td
+48.24 591.3959999999997 Td
 /F1.0 10.5 Tf
-<392e20417070656e6469783a2050726f6a656374204c6f6d626f6b> Tj
+<382e20417070656e6469783a2050726f6a656374204c6f6d626f6b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2286,7 +2127,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-197.23774999999995 517.4759999999997 Td
+197.23774999999995 591.3959999999997 Td
 /F1.0 10.5 Tf
 <2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
@@ -2295,7 +2136,7 @@ ET
 0.000 0.000 0.000 scn
 
 BT
-533.94125 517.4759999999997 Td
+533.94125 591.3959999999997 Td
 /F1.0 5.25 Tf
 <ca> Tj
 ET
@@ -2304,7 +2145,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-535.3009999999999 517.4759999999997 Td
+535.3009999999999 591.3959999999997 Td
 /F1.0 10.5 Tf
 <3832> Tj
 ET
@@ -2315,9 +2156,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24 498.9959999999997 Td
+60.24 572.9159999999997 Td
 /F1.0 10.5 Tf
-<392e312e204675747572652074686f7567687473> Tj
+<382e312e204675747572652074686f7567687473> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2326,7 +2167,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-165.17074999999994 498.9959999999997 Td
+165.17074999999994 572.9159999999997 Td
 /F1.0 10.5 Tf
 <2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
@@ -2335,7 +2176,7 @@ ET
 0.000 0.000 0.000 scn
 
 BT
-533.94125 498.9959999999997 Td
+533.94125 572.9159999999997 Td
 /F1.0 5.25 Tf
 <ca> Tj
 ET
@@ -2344,7 +2185,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-535.3009999999999 498.9959999999997 Td
+535.3009999999999 572.9159999999997 Td
 /F1.0 10.5 Tf
 <3832> Tj
 ET
@@ -2355,9 +2196,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 480.5159999999997 Td
+48.24 554.4359999999997 Td
 /F1.0 10.5 Tf
-[<31302e20417070656e6469783a2041> 20.01953125 <67696c654a>] TJ
+[<392e20417070656e6469783a2041> 20.01953125 <67696c654a>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -2366,16 +2207,16 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-154.48174999999992 480.5159999999997 Td
+143.79274999999996 554.4359999999997 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 
 BT
-533.94125 480.5159999999997 Td
+533.94125 554.4359999999997 Td
 /F1.0 5.25 Tf
 <ca> Tj
 ET
@@ -2384,7 +2225,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-535.3009999999999 480.5159999999997 Td
+535.3009999999999 554.4359999999997 Td
 /F1.0 10.5 Tf
 <3833> Tj
 ET
@@ -2402,10 +2243,9 @@ endobj
 /Contents 11 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
-/F5.0 51 0 R
 >>
 >>
-/Annots [621 0 R 622 0 R 623 0 R 624 0 R 625 0 R 626 0 R 627 0 R 628 0 R 629 0 R 630 0 R 631 0 R 632 0 R 633 0 R 634 0 R 635 0 R 636 0 R 637 0 R 638 0 R 639 0 R 640 0 R 641 0 R 642 0 R 643 0 R 644 0 R 645 0 R 646 0 R 647 0 R 648 0 R 649 0 R 650 0 R 651 0 R 652 0 R 653 0 R 654 0 R 655 0 R 656 0 R 657 0 R 658 0 R]
+/Annots [616 0 R 617 0 R 618 0 R 619 0 R 620 0 R 621 0 R 622 0 R 623 0 R 624 0 R 625 0 R 626 0 R 627 0 R 628 0 R 629 0 R 630 0 R 631 0 R 632 0 R 633 0 R 634 0 R 635 0 R 636 0 R 637 0 R 638 0 R 639 0 R 640 0 R 641 0 R 642 0 R 643 0 R]
 >>
 endobj
 13 0 obj
@@ -3038,7 +2878,7 @@ endobj
 /Font << /F2.0 18 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 659 0 R
+/XObject << /Stamp1 644 0 R
 >>
 >>
 /Annots [20 0 R 21 0 R 22 0 R 23 0 R 24 0 R 25 0 R 26 0 R 27 0 R 28 0 R 29 0 R 30 0 R 31 0 R 32 0 R]
@@ -3053,18 +2893,18 @@ endobj
 >>
 endobj
 17 0 obj
-<< /Kids [134 0 R 353 0 R 265 0 R 427 0 R 135 0 R 440 0 R 209 0 R 347 0 R]
+<< /Kids [137 0 R 306 0 R 257 0 R 448 0 R 138 0 R 429 0 R 230 0 R 371 0 R]
 >>
 endobj
 18 0 obj
 << /Type /Font
 /BaseFont /AAAAAJ+NotoSerif-Bold
 /Subtype /TrueType
-/FontDescriptor 725 0 R
+/FontDescriptor 706 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 727 0 R
-/ToUnicode 726 0 R
+/Widths 708 0 R
+/ToUnicode 707 0 R
 >>
 endobj
 19 0 obj
@@ -3211,7 +3051,7 @@ endobj
 >>
 endobj
 33 0 obj
-<< /Length 5817
+<< /Length 6494
 >>
 stream
 q
@@ -3294,7 +3134,7 @@ ET
 q
 0.5 w
 0.933 0.933 0.933 SCN
-113.807 598.410 m
+113.807 582.630 m
 113.807 637.970 l
 S
 Q
@@ -3306,7 +3146,7 @@ Q
 0.098 0.251 0.486 SCN
 
 BT
-76.73933333333333 609.6100000000001 Td
+76.73933333333333 601.7200000000001 Td
 /F3.1 24 Tf
 <21> Tj
 ET
@@ -3331,10 +3171,25 @@ ET
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
+4.053 Tw
+
 BT
 125.80666666666667 606.2260000000001 Td
 /F1.0 10.5 Tf
-[<41706163686520536f6674776172652046> 40.0390625 <6f756e646174696f6e20696e20616e> 20.01953125 <79207761> 20.01953125 <79> 89.84375 <2e>] TJ
+[<41706163686520536f6674776172652046> 40.0390625 <6f756e646174696f6e20696e20616e> 20.01953125 <79207761> 20.01953125 <79> 89.84375 <2e20204a65744272> 20.01953125 <61696e7320646f657320686f77657665722070726f76696465>] TJ
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+125.80666666666667 590.4460000000001 Td
+/F1.0 10.5 Tf
+<636f6d706c696d656e7461727920636f70696573206f662074686520496e74656c6c694a2049444520746f2041706163686520636f6d6d6974746572732e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3345,7 +3200,7 @@ ET
 2.336 Tw
 
 BT
-48.24000000000001 574.4460000000001 Td
+48.24000000000001 558.6660000000002 Td
 /F1.0 10.5 Tf
 [<546869732073656374696f6e2064657363726962657320686f7720746f20696e7374616c6c20616e64207365747570204a65744272> 20.01953125 <61696e732720496e74656c6c694a20494445412c207468656e20686f7720746f20696d706f727420616e>] TJ
 ET
@@ -3358,7 +3213,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 558.6660000000002 Td
+48.24000000000001 542.8860000000001 Td
 /F1.0 10.5 Tf
 <6170706c69636174696f6e20696e746f20496e74656c6c694a20616e642072756e2069742e> Tj
 ET
@@ -3369,7 +3224,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 524.1660000000003 Td
+48.24000000000001 508.3860000000002 Td
 /F2.0 13 Tf
 <322e312e312e20496e7374616c6c696e6720616e642053657474696e67207570> Tj
 ET
@@ -3379,12 +3234,27 @@ ET
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
-0.707 Tw
+2.195 Tw
+
+BT
+48.24000000000001 481.8260000000002 Td
+/F1.0 10.5 Tf
+<546869732073656374696f6e20636f7665727320696e7374616c6c6174696f6e20616e642073657475702e205468657365206e6f7465732f73637265656e73686f74732077657265207072657061726564207573696e6720496e74656c6c694a> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+2.751 Tw
 
 BT
-48.24000000000001 497.60600000000034 Td
+48.24000000000001 466.04600000000016 Td
 /F1.0 10.5 Tf
-<546869732073656374696f6e20636f7665727320696e7374616c6c6174696f6e20616e642073657475702e205468657365206e6f7465732072656c6174657320746f20496e74656c6c694a20436f6d6d756e6974792045646974696f6e2031342e312e782c> Tj
+<436f6d6d756e6974792045646974696f6e2031342e312e782c20627574206172652062656c696576656420746f20626520636f6d70617469626c652077697468206d6f726520726563656e742076657273696f6e732f6f74686572> Tj
 ET
 
 
@@ -3395,9 +3265,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 481.82600000000036 Td
+48.24000000000001 450.2660000000002 Td
 /F1.0 10.5 Tf
-[<776974682073637265656e73686f74732074616b> 20.01953125 <656e20666f722057696e646f77732e>] TJ
+<65646974696f6e73206f6620746865204944452e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3406,7 +3276,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 449.9960000000003 Td
+48.24000000000001 418.43600000000015 Td
 /F2.0 10.5 Tf
 <446f776e6c6f616420616e6420496e7374616c6c> Tj
 ET
@@ -3417,7 +3287,7 @@ ET
 0.259 0.545 0.792 SCN
 
 BT
-48.24000000000001 424.1660000000003 Td
+48.24000000000001 392.6060000000001 Td
 /F1.0 10.5 Tf
 <446f776e6c6f6164> Tj
 ET
@@ -3428,7 +3298,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-99.39600000000002 424.1660000000003 Td
+99.39600000000002 392.6060000000001 Td
 /F1.0 10.5 Tf
 <206c61746573742076657273696f6e206f6620496e74656c6c694a20436f6d6d756e6974792045646974696f6e2c20616e6420696e7374616c6c3a> Tj
 ET
@@ -3439,7 +3309,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 396.38600000000025 Td
+48.24000000000001 364.8260000000001 Td
 /F1.0 10.5 Tf
 <5374617274207468652077697a6172642c20636c69636b207468726f756768207468652077656c636f6d6520706167653a> Tj
 ET
@@ -3448,14 +3318,14 @@ ET
 0.000 0.000 0.000 scn
 
 q
-300.000 0 0 246.734 48.240 133.836 cm
+300.000 0 0 246.734 48.240 102.276 cm
 /I1 Do
 Q
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 117.87233165829176 Td
+48.24000000000001 86.31233165829158 Td
 /F4.0 10.5 Tf
 [<46696775726520312e20496e74656c6c694a20496e7374616c6c6174696f6e2057697a617264202d2057> 60.05859375 <656c636f6d652070616765>] TJ
 ET
@@ -3466,7 +3336,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 90.09233165829176 Td
+48.24000000000001 58.53233165829158 Td
 /F1.0 10.5 Tf
 <43686f6f736520746865206c6f636174696f6e20746f20696e7374616c6c20746865204944453a> Tj
 ET
@@ -3509,7 +3379,7 @@ endobj
 /F4.0 42 0 R
 >>
 /XObject << /I1 41 0 R
-/Stamp1 659 0 R
+/Stamp1 644 0 R
 >>
 >>
 /Annots [40 0 R]
@@ -3525,18 +3395,18 @@ endobj
 << /Type /Font
 /BaseFont /AAAAAK+FontAwesome
 /Subtype /TrueType
-/FontDescriptor 729 0 R
+/FontDescriptor 710 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 731 0 R
-/ToUnicode 730 0 R
+/Widths 712 0 R
+/ToUnicode 711 0 R
 >>
 endobj
 38 0 obj
-[34 0 R /XYZ 0 542.8500000000003 null]
+[34 0 R /XYZ 0 527.0700000000002 null]
 endobj
 39 0 obj
-[34 0 R /XYZ 0 466.01000000000033 null]
+[34 0 R /XYZ 0 434.45000000000016 null]
 endobj
 40 0 obj
 << /Border [0 0 0]
@@ -3545,7 +3415,7 @@ endobj
 /URI (https://www.jetbrains.com/idea/download/)
 >>
 /Subtype /Link
-/Rect [48.24000000000001 421.1000000000003 99.39600000000002 435.3800000000003]
+/Rect [48.24000000000001 389.54000000000013 99.39600000000002 403.8200000000001]
 /Type /Annot
 >>
 endobj
@@ -3627,92 +3497,14 @@ endobj
 << /Type /Font
 /BaseFont /AAAAAL+NotoSerif-Italic
 /Subtype /TrueType
-/FontDescriptor 733 0 R
+/FontDescriptor 714 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 735 0 R
-/ToUnicode 734 0 R
+/Widths 716 0 R
+/ToUnicode 715 0 R
 >>
 endobj
 43 0 obj
-<< /Type /XObject
-/Subtype /Image
-/Height 491
-/Width 597
-/BitsPerComponent 8
-/ColorSpace /DeviceRGB
-/Length 20968
-/Filter [/FlateDecode]
-/DecodeParms [<< /Predictor 15
-/Colors 3
-/BitsPerComponent 8
-/Columns 597
->>]
->>
-stream
-x���׾���s�9;���M�>���{or�-[�%K�d˽��+�W���`p�%���6I6Iv �7z1��fT<�F3�,Y&��σ��S֬������f�O��E`0�j��w��(���]6�%2�)��`0����4���`�#
���`#��H���`0�6:Ҁ`06���4���`�#
���`M�����wet���`0��7��%��ˍÿ��C~a�LQ�:�-�H�,���Ƌ�2�2za��`0X��?R��~k�_@DRU�xE����8;v���X�[�7ַpth�$'2��
��`�i����z�x���Z�NjI;rzh�;g7��-�~k�0�?qz������N_��4zao,��ML\�P|4�;�`u6f��ML<��4M	�%�oL��g���em5C�GN=ꭡC'���;uQ�Edd�-�8x��ٷC��^��Y�Vk��X_�Q'I��GeŖ*ou �Su5f��ٙ���C�&Di��ƶrYhY���±��O%%����<�B�W�G�5�x�ް�3\��!���
 �����5�0x�X��������D�;ѷ���'L���o���?�D�?�J���
����䋙��`S�ʁ�&��?%k[�k�V�zL��]�Ձd���[�Ԃ	ް����3+����;0={�My�7z�D���g���㿗��q2�k�l��=jp�mU#H��㢎ԯ.��ȏ*Z5X����ɿ�>�w�T_���5p����ff+ђ����}��sG*zǧ�87v��)N�Z|�k��ܩ��\��vV�Id�KN��bs@X_�͢��T��>�'��Ӥ���w%�y��71g�x9R�/!�JL��%f���+g�b����V�^���#����E@<:(yR��C��@�����y�9�,�䩥-�
-�}Au���K0��.��}����\k�_Ł�{��PBA^þi����щ�3���e\�^�9y^��c����j���K4���X�4�+�5[|$M}�ɛ-��L�a-��,�����5�sF%3�6��H��<��-�dy�uZ���ŭ��J٨ZR�LS$�Ȅ�"��M�&�d>���T'�ҿ�x��j�?WO�r�u�F���q�_���u��m�k�N��H����$��
Mw�.�=zz��/,-�oa�mjq��9qF��[;��O��������x��� �?��O�����A�GJ�A���J�&�T�5�O�?�⦡�r>�Qݶty��6-�G����NZ�&�{h�:�O)1k�ݨ6�X:b��o�Lz
-��:��_����g�<���#9��y��fZ'��-�ǯ��w�m�X�<~:6�e�����I�v$�
�w����$�~Zj^�4�d���*b������
-M���W���6�t٢����~P�PeRi�G����NfY��!�o���R�&]��{}��Ѯ	�מeyo�����g���.���&w.��E�Y>{��>�ZlNN��R���ı�I�%F�Oڙ'����7�tR;���?��k�Z4ʦ�zj!gT�!���g�ɠ�6�k�?���q�?(�F��?
2����[FA�_W�+h�?�HZ��c`C��H[?�!:�u`�Q�����މ�Ŝ���ɃU��,�1?�~n����Ǘ
-꫌^B�Y��"�q���choH�nz�=Q��c�4��Z
n\���������FGں�O��V� Q�ܑ�������'�s�����p,�}��1�O��6�����G�e�#���5�ݰ%���J���=Q�1"}��A�G=��Z�t˰G7i����J��H��O��_3��u��[�	��W}��+v���ё���$�s�Q����ش��ܖ������å�c�L��|��NG�l�M��2t����Z�Gw������k�?�����U�Qy��U����O5s�gU���E��.Ѳh����/�󯭩O���C�|�g�*�/�lO�f]�
j�#m���YQ]ڒXݕ�6Z�7[�;�V�Q3>�0���8��o9��lDh���9�m��]r��腤���j!�P���V��tCk�	VM�:��%O�@$�%oI�௶�矶����
-���]�A�0u����Lʤ��D����%��	�4}��[@�g��Qb��<�>6:�֏��MC̓��]	�͉-uӋ5���:&Z�
-�3�K���86��K/�P��G�WjgI��4��:_�y%j.X$�t@4�����~�k3!�|�P��g�]�J'.�v~
�#-}�![�" Y�9]R�R��\�d����JW��V3���|�,�{@���ё�~��ǧ4-,K\;����_�?wbP���q�],������N��O�+��ƥ K_i�ǿ�7�"���fx|pBZnm��
-�G\v�z����-�G������1z	���k����51�l �~�k%;���N��|�`#�yQ��
��z��*[u�X�y����?0�����`0�U4������`0~
���`�h��_E��`0�*��}Su`0��օ�n�U����6�E��b�Yx�,�E����L1��o��_�=+�> �! �1 ։���%2xIn���Tϐ4oa��(�W�͊�	�����qK��e!�Œ�������������IJ��ʮ��=Yu�9�CyM��Z�J;&+zf���j4�,6�-�M-w��?������G/N�4s�o�g/����N����+�������~�����֕��\�����㯿���_~�Ӎ�~���ow~���������O�?�����<������O>y����Ϟ=}��le������L���C�_ ����K���2v�@ ]dt�����L�������B^B� �,$�B�V��Wg��
 � c�a�E��fK/��W��O��O�
3G`����?B`�#;�90ޕ�����O��z���әᙬ���\vL~`\!7��/�(s�8�.:�1��%��=��3��;��/�a0�i��e���2v�@ ]�W�I�S��3�矕�(��D�(
-t�rd�8s�P芢@n"
-=)^!8�2X��9����n|QpbiHr�0�R�Q-Ϊ��k�-lN,i��/��W¿BĿ���������D�uC��ad�:�@�H�s�I,�*�B-�B�<EV�a��r���X�8��8��A�q�I�dO���T��t?q�Dv@t.'� (���P"H.M��W�g�F�6�6'��%�w�Tue��d���Kʿ�}�F�Ze����2v�@ ]����_�
-�b���X�_��l���E���G�+�H���QƮ� ����?�7�)�o��?Y/�g��g�����Kd�%� І�B@����(ǀhgv���u�&y�Q��#Lc�2X(�f��sb�	��I���2az�t
-LAS|QKRY�_��������������)���� ��L��?���u�t�Z�������?E
-b ���g� 
-��#E�v�(�C�s`��Zw��(��a�`�"�81�A�E�DY�Q-Ω��o�æ��%Wt�Uwe���6��W�3[30_?��4rX�?�3��]�A H��?)���c��X/��/��]`恱��C�Zy	��E�>"��b�D�F9q���\��n���Dϐ,��F#s91�Y0��Ґ�raZUxvMd^=�ښ\ޞZٙQۗS?�ߴ��m��sR¿���}����;ѷ�ӿ�]�A H��(��B�;�j�&0�AD��X (��"
-�2��sA#Q ȉEt���������,66&�W�B���������Uq��XhEGzMoV�@^�pQ�hi�DE��������Ŀ�#3Ǻ�N�� c�a�E��̿=J��|���]���E�!V^��V��"�X���!c\cݸ��|,�Me���⣀�h�X��W��/�6:�!��9���_wVm?�_a+6��n2v�@ ]�#��vc���L�
���q6u��E�q(��q
-
-,<8��P�Ȏf'� >����΋��'z	�}��LQ&K��ˉ��/�%�˄i��Y5�yu��M�%-��i{�2k�r�
-�GK�)�{���"�
/��/uL�ѵ�x����C�����0�"��/X�cC������_����#�-<��X h�-�������p�t
-�rfG3�0� ������
��GN,	M)˨���C��䲶ԪΌ�ޜ�|�S�7�M��׎��giP�����(�ᛒ�7����9�
X�5�$����jg�<Y��6���?	�x�]y8yRbo���q��`M����x
-Z��(P`�b��!�Gd'�u
-�t�D3�q��	�$���(�/���W�K(I.�W��j�r�c��J[S*;ҫ{�k����[��:'�zgk��6�/�M/���)��ESŤ���y�}���?�4�v������e��_y��\�Ȼ]�$��^�V�v�� �_��Oe�����9�����LnT&7:���+����M,%�SK��e���YU��{#2*�
-91yAq��Ē���ւ����}U]�5�S5=S���-#�-��|p�`��ᶩU����ӣ�k�j;+m�E�?�d4�\	�va����9��s�̅w?��/������Ͽ����ߒ�K�o�����n����;�׿�s��7_ܸu��;�u=��ܠ�~bqrI��≛�﮼x!�/��;}�j���b��i��:���Q7��`pU�;R�)�j���?�6�!O!��Fv�2|s��p���4OVwJ��+�D�Q�
-z�+���%�Í>��v�J������7�pQ����?y��)��*�)B˓'W����m�?"��+L)�<��7џ�
��~����ˍ��m��}��4����DT��&�Q�%�„Q�˔�Ot;��B-����mCX������n5��G�'Rb)^���?��<�^V��a����#����9h�s�.'d�NdG�.Gvm�য়_��}S�^ϟ�|p���A�����†so_����jqsx�8
-�;�+{gkG�&�t��?5p��ȑ7�zU�Ҍ
-`[m]W7��O�LX�&�m�*�T��T< �k
��"O�I���g�J��@/�t�$�s���'_��|��v8�w: =�毿�[c#����+~R�������
}�|v�ŋ�k~���N\,l)똪왩�G�k���3��wQV0��?��ou+���/B��'B3��H�#yZ)�z�>V�.D��O�<Q�L�P���i����‡���C���~��wسv��_�z�ɓ�kld�={v�ÏK껽CSX�ͽ�׿�C��/��;��{����C�
#�-G:��u
�|�˚�?��j�W��HA��i��O��@�z���a��~;���nO�I�g�͞���o������8J������Zqm�� �?<�ol��7ߑ�y��3��4����wO�훫����9�F��Ɂ�3�?����)u�����A��?�Q>���PA.z��?�z�����O�<!��%%���?�F��=�k���6;_Ŀ3޹�2P��0�]�VT���
-��߃G�Ͼ+���o�A5���w�&U�\N�Rw�MH�A��?u��/GKTgJ�Q� ҍSB�'��?է�������
-���HG�I����~8�������ݎ���w�-s�
����7߮��}�󯠺�-(�74�gdN�>~r����)0]������;��{������Oo2v�@ ]����s����?{��x��V�?���>¸�ţ������*
-�����_���D3����ߺC�ԇ���}�j.ƿ��Ή��ٺ�����SR��[:?����?}��u�t�^�(�[�?;?[_�?+oSgvlz�́�^����_����M�7F�߼����cRP ����W��Ž�	N����ߥ���E-��:ƫzf����O-w���/c�a�E��o��8;p�mw�n���Ll�&��&��[,�v��zr"��K�j�������ۥFK�6�N��q����F�ߕ��*����^����������Kϩ�/l.��잩��w�}�(��2v�@ ]�N��b���k��ԑe�ʶt� [18�r�r,\9��w޿Jz�����N�0Onl'=����#c�a�E㟍�����6#�{l2��l���}��;z5�p�*�%�jb������eҋ%��v壜�FG_�7���]���ߕ�ނ���1�ۦ�v� c�a�Ez�g����,���X1<���X�6�[-��[��t��0�����
 �10��m��;���,Ŀơ��������y��d�:�@�� ��&��k/	��ظ��8���ZC��F���U�1��Y�8o1gl6�m�Ƌ�����J��|B����I
-��~�J��������QĿ���F��d�:�@�HW��h�?+�;��y��#�>������c�_~(�˭��Z���cmn���u�)�@�8��u��WvD{��&�+n�蚪�k]l������0�O�2v�@ ]���c8���]����? ���߈�ô�f�b@�u�+c�a�Ez���?�����3?-<��->���{��+�px����;\6�26i¿�Z[/�K���o�&�޺�YՓW����N�d�:�@��p�c���?f�7���?9�$oyZm1u�d�Jÿ��f��x;�����ݼ�
is,�_w^����G�M�=�ӻ�]�A H���\���;n�o�"�������l�֟��B�?��26e��o7s�l��
Oz�����s���_%	��������c>W\ף+<�^���LuH��L-y��NC����#����\���!�m��f�z�]�ܔ�6�i��G�����}�jF!�?�������r�[�!��
 �Rk�����=#a��u;:v��B�/��Eڦ���Z%L����jJJ������1�q��AH��S���\B�.�/���r�V0�l|M�}6[y��y�L��c�_I�����Ki��|-LL�7����2����ɓ�o�{99�R���x9c����;|��G�^��o�B+ }j�K�?��`��p2���?�=n�d*pM���jH	#�m��Si=����F��߽�ח����n���_�p���I����ɓ�މH��m4�Z���웁a�s����%}�a!�Ǵ�j�~<�?�9�{ M�bU����<�s��S�Ԓ�01�p�ts5IU��V���Y(��J1��|R=�J�Օ�M�i�?���"��?�����~K�JH<��dEO�qo�)�+1W1�1������~3u�ϥ�]���_�{֦� SK+�M�.[��F&��~��2P<|����a�8��4�_=�o=�c�S��%��Uh �,S�P�͗=���w��!�_y�Z�,��e*�	��񔐷Ħ��F��
 �a�x�x�q�$YM�ӓn~s8G���6���Y����&S!�4�j�)�B +��o5_�m(�:R~�H�/
-�/&��H�G���&�U߸Z�9�;W��.�n�[��_���[�뿖��c�_�f�wK�n������Vw����߽���#�F���~��_b�k2�����UO��wL��} ]Hl�IDzTu����Z�4U仢�?EAڞ��O\1�bt�S��C�����g�Z�d���X��ą4%b�)h]����u_"�J��T��q��dm����?'�m6wwvp��X,�n+m���M�el>�dR����o���5���1p���+d�������?n����o���?��/�?�JǪG�ӕ���*��)/��Bc"�$Y�B}D��k��T�9����?Y*�[c5��l�H��%�HKG�P*G��T��?�є�:�j�H��M�J������Xx`O~0s�l��h��e��6OcYz:���n��Ō�ǁ)�I����3?��|p�����-H���%������!]�&�]u�P�)�I:�zN�&��x�?�I�?�������'2F�쓄YZ�o-�Ҋ�Y�����
 ���Q�~���(��/u%T>���O�ix��o�����u���N�&f����~�:�F%�]��޳g��!���'K'Bb2Q����
-��Hҽ�����I�ɖ*�*��ߤ��B!�TN���{M�@��4p�c��H���O:�xz�ޔ'�p�*���#J54>�r$�Ei(Io�����D(x��qi�*�NM_��/E%���V�@H>-��G�G�p���#	������J����ʕ��ǔ׵�����߻O��o����}Љ%����0h��)��K=\��ZS���O�� ��[x�zv%i%ۍb��B5�{Pl�������C���Oy �<r��'�l4��jIj5��$�9B���W���
-�B~"
-��*�7�k���J�]e%�ϫvjGH�������VSJ��hv���j~I�������H�@���� �#J
-O�I+�j�=p��k�>x�y]YY9{���R+
-��}B�8���?R��g�������?���u�,��SĺJ�������x��m�>.�¤����щ�řG��O�}��Ͼ�w�>m���?5t��b�=xv^��o��W�#y�����2v�@/�6����[������մ���R�y�B�x����so�s��y��(�u�y�tNk��#��o�����0z9��:?��>��(����+++������Mɯv�����z	왈a��C���"c�a�E柕B�����E�V�����ܭk�	����x	�|B}E.�bo^|��̭;ߒn�������m��k�ȿ��3��z���0�"���W�?K��߽���c��ԧO�~u���ļh��O�-�P{�Љ�Ž��ƵLݼE~����?<q���ނ����1Ŀ���&�]�?��u�t�~��ގH�5ƿ+|���vR=|���Ͼ�> �ɴ��#?�P_��_���؅����i���-������g�ɩ�+l.m�
 �잩Z�N���@ �Z��a�@��ʿ�R�1M��M,�/^��P�]=����r�����i��4/*��#��V�I���A�˭l���W^�P���o��\nmQ˾Ҏq��O��@��=�k�n��@q]��I����-��*�v:���_a��o���d�������ŋ����{g/�[X��ŋ���)��9�œĮ�(��hwn�'/!2���[�=x�Hi���ǟ��^ʭD�+뜨ꙭ��w�}j�{?�O�ҵ��Lu`қփ���^����'�ЧO�ݹ��ًk�O�s
�zaݞ��!(�s�w�;�#]9�nA��8/ARPdNc���ϾR�ʷ?��x�by�hn=�o��kݣ�I�RL(Y��A}��5y�)J��O��wAc���n'��V�Vk�#SXR�~��ůn�����~�w�C�׷�^���7/�?w�Xs׾��Ra�3E~֞|[o����/��?��/P?~�Oh�xFLv����+}z��Q���Ͽ~~���So5������J/~������<~�cj��g
 �Z�H�G��0�oۨp�C��@ �Z���t��8��D!��6��v~�qlzIUSO{�X��T��d[�X]��bj~�0>���g�γt����x���E~��~�^�d�0��ɍ�O*�o��_�?zf����٥���ھ욾�����������Z&wLK�7r�͉c�����uOy�OvWG
��z�dmnu�@R�ȿ=���[��������^����@�������Wn��E�w�����a�����1`�3�ԙc�h�2w�Yx�<~v>BGV��4�apc�y��Do?Q�_XF@DNPL^p|aHR�(�<"�::�>��)��=��+����q��}��{jo�\��b��R��=�'���w��7�Z��ݤX{�)<)��4��'�E�s�f���#v-�=k�z��a�ځ^1�v9 c�sᘺ�#�1�n<K��'6�g��c~~Q��7n�Gp�� �;$�W������ˍ+$S��3+#sjbJZR*�3����6���OVtO��k��w�s���ҵ�a	�?�^Z;�
 ��! 	��w8��s�����1`���.������Μ=.Af���-�V^�6����a�,�3;ʕ��ƸᑟWh��(�7,�%�dG����B�JEi�Y�Q��q��I%���Y{{1����vH�7�3�t�{�XṚx���B�u��( �Jk����r�((��SP�@'�N<�G{�������$!_��+׌�3w�[��<C�1��l}�|�X�Q.��n�87I���D����/:�_(H,���eTE��ɯK(nI.oO��ή��o.j-뜪왩Xh�<�a�g�Z��\�G�x<�g�i0�S�=��JW�1�p����YN�@ܜ���}aPD����9y�k�~�|K�~ޡ�>B[�p;?1���'���sN����#J�
�`��"�9�yA�����2Qz�8koT^mlaCbikJEGFuON�@A㾒ֱ���ٺ��ƱCmS˝3�{�O��.c�a�Ek�d�r����%PjgD>	����`6E�cH"�`O��g��7���vL��=+�! ʙ���K��'z�$�S�a~�Y������
 ��|n|� �44�",�:"�6:�>��)��-��3��(h�W�6^�=]ݷ�n�@��a���{N
:7r��O�2v�@ ]�3����81�푿�p��F����5u�Jc>���o�
�Yy�l|�l|��n�H'v�3�6�%�K��O��'��G��
���/�%�����2���5QyuX�WҒ\ёV՝Uۗ�0T�2Z�>Y�=S�?W7|�i|�mz�k?�� 2v�@ ]�w��d���A��<S��f�`sd~��!V�1?~�~�QN�h��3(��^!X�'3,�%���A�_P\7�H�T*�ٵQy��E�X�geGzuOvm^�PQ�hi�de�L����2v�@ ]�V��ȇ��_%op2xX���F6s�#c���O�"?;f6�����Ȏq�ĺŹq�ݱ	�)��4���_6;��b�_)��U�g�̭�)h�+nN*kO��̨�ͩ�o.n+뜬ꛭ��>�<��N���ы�?=��u�t�Z�����c�Q���
{5c�e�Xx� �ݞBko�-�}؄��(ǀh'N�K`<������?oa����‡�8~qE�	�
 ����,��+����{q��,�8~�%C��[���%�$"��ݭ�X��"�e^��B`e�p�&�V.[�Y ��T�7d�"��%&1�rҗ����o_�g�g���ڝ����o���y�g�\}�%�ܾ����pן���+o�磷}��w>p�ڗn��+7ޛ��c�?p������|�s�~���ݼ�a袗�Kn��Mi9����7�����&ɗ�ߛw�����v�[ޑ^���w��o��~;��+}���3.�񇗼���o;{Ϯ����w>�O��|��W���s����s�{Gם{��������W�|��n�?�y�'?�������^}�_\s���+��{�7�w��/>~'�75�>�����w�����qyoy�������y��_ݕ�7�:�ͧ��k������}������sH�﷒1_{�8�C;�sq�|�g�M/�����.{g:��]L�/��K~献��ˮ��<�#7^p�-y��M��w}�Sw_yӽ���k���?�n��#7�w�/�
 �>~ࡿ���߸��??�w�?�~�ɇ��ۏ�}��9]t̿��Ԥ�~�I��~���/�w�wf�g|��U�3/y����:kwRN;{��3���.}��.����p������]xՙ}���;g�5�����]v��������7^�������^���?[��>}�����Mw_}��������w}铟{�S�<r�}_�����|��/���_������O����8�ȑ�|�o���?�������ѧ�5	�om����O|�_�{��N>��7N��}+�^?������������?/�������4�~��y�%����3bo�GP����:�߼c��t̿M�Ј�hD�4"����?�F�@#���Ј�hD�4"����?�F�@#���Ј�hD�4"��룕յ
��Bonƻ���k�6�VWR���q�5�d���5�1`�ɿ�F��9�z,�����J�����h��
 /o]E�v�cdT�>v�Z�5��Un����N��#��u�+��nU�	7���a�۝�A�W�Ǎ�'s�dh^�I��[B�?�d]Ŏ��[���&<Yk�0��KZ��t2["R�,5���+
g�K4y�M~��@���d�+0�M�@�0�/�Z�zY��a��J&�O����(��+]���h;�l��ּj�#����o�i����;j��-�ے�]i��m��
-���{�iQo�ם6o6C��%�lU;ƅ=���3�Wn��M�]�Jӓ�ݨ0������ɘ���Я�5�rv�U%�c$6B��z����)��A����l���猳ၼCӏa�_�]2�IRed��y8�p�k�m��������\�j��m=��]t��Iy[���p���U�,�/������NYs����!z�D��YYi��F�ӪOݾ�]P|wB�t�)�b��[�T[O���<
�=�;-*)�*�j�V�T+��"��R��3�ʗ�@�o�~�f�f,ۺ��$��S�d�8Z�Xz�6���:d{coW{[�_�k�H�M#�,Փ||+�	=���&�l���p����E�J��`�`����ws��F��ܖO��jjݩ�O��
-����x��{�Z��r5�Efӥ4?gĕ/���_�:�n�ҡ=��O���t�j��G�ٕ���pX�|��
-L#���h����u~��{�w���M��麞�ž�[�8��'������T��ah�
�/RI���<����!.2�.��9#��b�NM���m��W�}��|� �7��g\�<n�-6�bh���'˿j+��1�����m���_~oMn&�q�'�<�5��6�Sm�����_��_}�SKʿI�Ό=t)m7ס�n����NW9na�4�!)��}A�iK,IX]5�Mz��c��5��\q�-��f�ڭ�so�����yx�s]���Q9e��_��"7�]=y$hsq�@�Hg]�}���dN�n+y'OhO㵍�Tۧa����U%�UşA�d��@"��M�����W����f�0t�v.��#5^����s����I��Y�j�G�F�3֗�d�W�Y�v�W5g(���ɚ�mp��?�"~���{�/t��Ve�j����d�@�+w_[4�ws�
�/�Q/0�O {�?�YMl�4��Ѱ�*ZU�$�>Z�`5�Efҥt9gB������!0����ے�����?�1�o0�o�x��
 �h*��'f�zc~ޕ��Z����Ј�h4���}n8}��=5[���_MV�ܗ?'ٻ�LOU�)�|�<�e��g}!����Զ���\�/����C��[�̿���e�>E�op�t�V��u�f��e�o��'N�ޙ��	�X�?�k����_|��g�i��C���uu�sC
*�0P��?���'����
������<5������9���q�W��?�a�-(�>�n:?�R�v~��O�CG<rh"
XYp�r�����}��5�Z�X�~�Ι�����|�u��ˈ�cg/n�m��P����5�����{��(�~&�^*�]�y��9�G�����z{{1���`)�����<������{M�n��Z���d�?#��h�����[ӭ�J��;�<~��KU3�=g�w���]o'j�g/�]6����Ogw��:���O��h8g���F�u�3��R�/�4�G܊�����ĽhR�X�8�y�
�3�~r=<v���n�[����
 �S��G*>����l��֣%��]k?a�Mt>g�{��]s/'jц��:���k���NOgg�앴8��Ml�������Y�,��������<>O���G���ĽhR�F���<O�
�������C��,k�s�w��l�	��=(�֞����D�sf~�h��_�5?��-�R{�Է�SA{Z�:����z0���6��^�I���e��}qݤ���%P��<�!�Y�
����د��[�g�?gk^�����b[��Xkw�y��q7�����)����$'jz�����d�;����˿ٌ�j�>��0��<��k����{����cn�Q`��X�ୡ��I%�7�ɭ���&��/f������Я�	?N&s���ڧf[��{4z�g��K'���s�z��oZ�h���|���g'j�lݱ+�ȹ!T�h|�<7ȧD�yM]ӕ9������@�o�,�����z��t�K�y���g����b��H,з˚WA�.O��|:I+]��w�{�y��W�E��
 �T�~�AÊ;հ�ź9-:%��\jIc��s�ɉm��,N�`�[m�l�^NTc���ǩ���gv���Y���������؈��A!�z6���,�� �`}�k:�1���Ј�hD�4"����?�F�@#���Ј�hD�4"����?�F�@#���Ј�hD�4"����?�F�@#���Ј�hD�4"����?�F�@#���Ј�hD�4"����?�F�@#���Ј�hD�4"����?�F�@#���Ј�hD�4"����?�F�@#���Ј�hD�4"����?�F�@#���Ј�hD�4"����?�F�@#���Ј�hD�4"����?�F�@#���Ј�hD�4"����?�F�@#���Ј�hD�4"����?�F�@#���Ј�hD�4"����?�F�@#���
 Ј�hD�4"����?�F�@#�o��G+;l4��h�������z�����!.��\�S��W��vFR�v�	�>��"�`�*��{� �QU�Bs�5:�f5K���Ɓ�=�����G�ѡ���B��n�FdzE��U�$�>��U��1~ ��NK�L��o`f���D����\|�Lu�n��Q���|Ns��V=[�@�A�߳���@�YS���Rv���`K���fwj�z���!edU�>��;��V�ET�#%���OJ��qsJ��K��[���j$&P�x�U��XN�w�����W�+;�������O���R����;N�XZ���O�Z�ƁQ�
�h*�c�E4՜km��>q�(\��l�5�r���'�,/�����?dd�3��|���O/��Ob�F��f��l�u�*wȨR`��?�Im�T#����?�F�@#���Ј�hD�4"����?�F�@#����w�M�����佹6�_�
 `Q$��h����og��<�B��R��<�_[�_L������Ϳ���C��#�o�ȿ�����S(J�B���C�Q(��I��5�A�Ő
-eƅ���/f��wl{�����hZ�cG'������>���{��2�z��c��B����L���
�/f��w�Y�������,~p�d�Yk��Ve�9�����Yy�
i%ᚘ��*�۵�Sϣ��]�\��F���w�40�;]������˝�J�s8������hu�mqz7�a�wx�Je���:<�_��o��U�$��5����t�2ގ����D�%=�_��;R�l����s�֮��k�W3d�U6ip�Y���T������K��k�"�V^[�3\~S��7\*:�0�o��7�7ɿ���P�A�s��5�Q�v��|����[�Qg����x1�����9��1��Z�T��i'n7�xt�����f1[8�~=#kp*)6x|�����Z��w!�^nRm�!ip_{f6��{#��Q�UO�a,/�#�W2�1~^��{ C��+�S&οW�q(ɿ�Og7�޿se�r��n:&<4~(�Ϝ�/3Wa��WzŞ4�0C�_Lo�?�+�Q�<4n�c���Wus�zZÂcN�y�+�P��
 W��̑b>()�'�@=*�m����_�	��&\���[Ul
���5ؕ��E?�g�Ђ�6��s6'����S6~f6�A̿Ȝ��4+��|;!�zf�7|��ɾ��up�P�N��܏C{��zʹ��Z)'�w��n>��\5i��=�:�����q&��������$BQg9!=��g��9�M^��#*�+�7E�y��Qg^��ޜL�,s$��ۑ`U\�_w�Vh�@k8���7�����ȿm�Y��(��C]�}�Ĕ�i�63�'�.z.�'��p3
-+o��#���e�/c�U�P2B�e+��;�,Y�=�Oq'��&�qV��!ɿ���5�Dj�9:[���	���h�u>s�P�^��(���y��}����`��������p�ٴS�ۋٌ��KGc������~w1�*d��7�Io~ʍ����;G�`��*?�;����Fh^�U��������Y��Q��VΚY;#�_��_�s"���߱�t1�w�YYzk1P�H�С���]�V�ً~����?x��$_���/���7?�F������&��3L�?�Gn���I,9����,���{�b���J����-��w��?��K�q���D��Cҷʎ�}���2�
Y���!���5v_��=�tbF�%űi]�j�c�ԙXV2�5�{�������
-C~4���jH�n�W�!?=��M��\��9/�ܜ�|ߛ�����ו�0��K#*�m�񀙅Ǔ��Νe�e�w��A�Η�9��.���d7�����A���v���4�FǑ2?3R�W�~�Ӽ��G�ŏ���5�3��f3>2�]t|f�C����ņ
u�������5��5�X���6���S����v��G�"~�/������Dh��Ӫ�E5��w�j@�Lp�+�E�}7ϓJ��I\�vS��{���6ޓ��X9q�Ǎ��߱c<�1=�X,����g��\Ę8�f�"t��_�ܿ�7�R���VE���t�q�eQꩣ�`�� �� �b�8�NipY�i	ycz�^����_��=�S���U���Y"�b�;����?)��%�槪2I���6ȿ~���Ϳ��C��#�o�ȿ���SE�Ő�m�=�6ȿ���G�P(���=���3�}��D{�9�Ј�hD�4"����?�F�@#���Ј�hD�4"����?�FK�
 ��:�A�3F�4"����?�F�@#���Ј�hD�4"����?�F�@#���Ј�hD�4"����?�F�@#���7w룕յ�y��N�%1`�OaS�9ƚ,�����5O���j��ϒ߷=��?l��;2 H����ѱ������<��dZ1)}X\qg�rㄫ��c�̿bE²����b���z޵�=�	
G����i�����>\��ܜ��m�F�ՎSG�j���\�Z��Q�����`)#��_�d!Q��7G��ѱ�6Jf4�?r�m��W���o���'v^mM�y�/N�vOh�l˫��R��ξH���J�b ���p�$��_�3�o�Y��lD�V�<������.R�W
-�Ģ)�՚/#��a\��^:�Nt��X.�ɿ�1
-2��
��n�ץ���H�<��rP��?q�Vm���Kp����;E������ �e0��'M8<�^�'5��/�M6��v��'fU�/.�G�0����b�ꍽ7�kg�����$�<���D{[�U�h�ɫ5R�͆��9��,����>��l5.<V���7��α��UXX@��?��l�t�EAc��:khb���"�ƙ*�_n��V1��!�f�-���
~��l�q⟉q��~�/0���e6����
U�Dȿ�U�Dȿ�U�D�L�Ј�hD�4"����?�F�߄�_
-��]1��'��
-�_����Oq�ډM�?�h�9�`�����[���^��H�9?_T����0��|��>��Џ#Y[����F��?Ϟʺ㵑=t	�Qb��P��
-�/���7'��_`6���oVT5�
-��b��+��(M
����S����5��3Gϒ�C�u������ڮ����U���Z���/	԰A�U[u��v�y�48��3
-������[�_�~�����
-���j#�"��=0�Y�7뛎��fߥ�"�|��U!� ��,���_E�]�*!��ɭ��y�7��Sn%������۞����_N��_�9^ðrk�n@�\��|�
-�#�e0�������(屔5{l#��)_��lލ����3��2�j��Y1f6��m�
-�F��lLU���qD��]���$w��z�f�0H��'%�0��&��?�����#�����?��X�Ⱦ�*�x���0���*��~�wQ����H���}�S���q{~i6!0��5\2��(���j$���3��v��
-|��fɿ>��
-����h���T���?�F�@#���Ј�hD�4"����?�F�@#���Ј�hD�4"����?�F�@#���Ј�hD�4"����?�F�@#����h��w?3���=���`V��Ј�hD�4"����?�F�@#���Ј�hD�4"����?�F�0h�K�����N�暷�Z����9X�߫?�R[���Ԏ� ���<��P�̿W~����Ϳy�y"���Aw�����?�R[ȿ��?`y$���#�:�߼�<���;�����?�R[ȿ��?`yНm��_c��<���k�����O�Ԗ��7�6O��<�����ޕ�w>��J��{�[jK����L]�g�,��vgIOT�{���Ͽ#��{�=�X��u��Z-�j��Ͽg�����h�� �V�%}�Й=Q�������?�꣤�c5Ͱ�nq�����/]ٽ�K
�2���^'����W�
 ?����J��ޟ���{Hz�P����-��5(<d�lN-��6P�fBe�=���>ʑKVvݶ~ώK�Tw�W>4v�zr���VWVV��v���+�+�V���=����Gÿ�G�0��Cv���1�rNk��l/�Kq�4D���<�_��SY����Tp�C{ʇ����*ו�Ln�I�/ .�Y�?��꣤�w���#�����6��uu�Եg�y6�9u�G6͉i4&�f�,���)�S���6��i�������|H��qj�Nc�ֲ��2��<���������z�¸�r�gk:Ǵ۳gg�������G�xnt��[e�8���M�umW6s���R0;f��&[��3N�w>XV��Ok�������_�k����EOTu^ft3�Ӝ���)���ͭ>ʑ��;��\r��뾽�r��x�o'�E��x���r�Y�%&������ ��X��ʓ�� I��?�W����v�?^͗�U�o�p<{�.,+<0�2��㍭>J`�|7��D2�b|7��r�����M�'�6:�.��{�
 ��L���N��\���S���;Y<�3'p�X˚S��tC��#y>�4
��^���4u�Nj����w��'fS�5�cw2�X֜be�=��V��E+�n�n~�ٛW�T�醴O]{6��ɵ+ʉ=�/��pK~�����#�[���_?M�R~�����Ɂ���̩n�'�ur��e'E��cZ�'�:�B��e�X>i��͙�V�X6?=�4�o�t�W�M�ml��'�t1�L����Е|��p�e�u�����K汯N	�|��%�$����"�Hf��S�߿�����̿<ۮa���h�?`y$��geE2�����;����E��D/+�lt��v�m�o��l��?`yНm��s)~���@�9�X���������[Z���#����߼�<���;�����׶���/��&k ��#���<��Wl��a�Ϳy�y"���Aw����^�Z�Ͽ<�k ��#���qP��,����_��p�4׼��?��&��G�k��S���oޕՅ��)r���� �`�V�
 ������k��S�R���y����ȿ�G�S�'�7��8���7��8w���7w���e��?�F�@#��Q���P(
-e�K���P(
-eY�G�P(����P(��B�Q(
-Ec!�(
-����
-�B�X�?
-�B�h,���P(
-E[�*8Ny
-endstream
-endobj
-44 0 obj
 << /Length 1324
 >>
 stream
@@ -3797,15 +3589,15 @@ Q
 
 endstream
 endobj
-45 0 obj
+44 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 44 0 R
+/Contents 43 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/XObject << /I2 43 0 R
+/XObject << /I2 45 0 R
 /I3 46 0 R
-/Stamp1 659 0 R
+/Stamp1 644 0 R
 >>
 /Font << /F4.0 42 0 R
 /F1.0 8 0 R
@@ -3813,6 +3605,84 @@ endobj
 >>
 >>
 endobj
+45 0 obj
+<< /Type /XObject
+/Subtype /Image
+/Height 491
+/Width 597
+/BitsPerComponent 8
+/ColorSpace /DeviceRGB
+/Length 20968
+/Filter [/FlateDecode]
+/DecodeParms [<< /Predictor 15
+/Colors 3
+/BitsPerComponent 8
+/Columns 597
+>>]
+>>
+stream
+x���׾���s�9;���M�>���{or�-[�%K�d˽��+�W���`p�%���6I6Iv �7z1��fT<�F3�,Y&��σ��S֬������f�O��E`0�j��w��(���]6�%2�)��`0����4���`�#
���`#��H���`0�6:Ҁ`06���4���`�#
���`M�����wet���`0��7��%��ˍÿ��C~a�LQ�:�-�H�,���Ƌ�2�2za��`0X��?R��~k�_@DRU�xE����8;v���X�[�7ַpth�$'2��
��`�i����z�x���Z�NjI;rzh�;g7��-�~k�0�?qz������N_��4zao,��ML\�P|4�;�`u6f��ML<��4M	�%�oL��g���em5C�GN=ꭡC'���;uQ�Edd�-�8x��ٷC��^��Y�Vk��X_�Q'I��GeŖ*ou �Su5f��ٙ���C�&Di��ƶrYhY���±��O%%����<�B�W�G�5�x�ް�3\��!���
 �����5�0x�X��������D�;ѷ���'L���o���?�D�?�J���
����䋙��`S�ʁ�&��?%k[�k�V�zL��]�Ձd���[�Ԃ	ް����3+����;0={�My�7z�D���g���㿗��q2�k�l��=jp�mU#H��㢎ԯ.��ȏ*Z5X����ɿ�>�w�T_���5p����ff+ђ����}��sG*zǧ�87v��)N�Z|�k��ܩ��\��vV�Id�KN��bs@X_�͢��T��>�'��Ӥ���w%�y��71g�x9R�/!�JL��%f���+g�b����V�^���#����E@<:(yR��C��@�����y�9�,�䩥-�
+�}Au���K0��.��}����\k�_Ł�{��PBA^þi����щ�3���e\�^�9y^��c����j���K4���X�4�+�5[|$M}�ɛ-��L�a-��,�����5�sF%3�6��H��<��-�dy�uZ���ŭ��J٨ZR�LS$�Ȅ�"��M�&�d>���T'�ҿ�x��j�?WO�r�u�F���q�_���u��m�k�N��H����$��
Mw�.�=zz��/,-�oa�mjq��9qF��[;��O��������x��� �?��O�����A�GJ�A���J�&�T�5�O�?�⦡�r>�Qݶty��6-�G����NZ�&�{h�:�O)1k�ݨ6�X:b��o�Lz
+��:��_����g�<���#9��y��fZ'��-�ǯ��w�m�X�<~:6�e�����I�v$�
�w����$�~Zj^�4�d���*b������
+M���W���6�t٢����~P�PeRi�G����NfY��!�o���R�&]��{}��Ѯ	�מeyo�����g���.���&w.��E�Y>{��>�ZlNN��R���ı�I�%F�Oڙ'����7�tR;���?��k�Z4ʦ�zj!gT�!���g�ɠ�6�k�?���q�?(�F��?
2����[FA�_W�+h�?�HZ��c`C��H[?�!:�u`�Q�����މ�Ŝ���ɃU��,�1?�~n����Ǘ
+꫌^B�Y��"�q���choH�nz�=Q��c�4��Z
n\���������FGں�O��V� Q�ܑ�������'�s�����p,�}��1�O��6�����G�e�#���5�ݰ%���J���=Q�1"}��A�G=��Z�t˰G7i����J��H��O��_3��u��[�	��W}��+v���ё���$�s�Q����ش��ܖ������å�c�L��|��NG�l�M��2t����Z�Gw������k�?�����U�Qy��U����O5s�gU���E��.Ѳh����/�󯭩O���C�|�g�*�/�lO�f]�
j�#m���YQ]ڒXݕ�6Z�7[�;�V�Q3>�0���8��o9��lDh���9�m��]r��腤���j!�P���V��tCk�	VM�:��%O�@$�%oI�௶�矶����
+���]�A�0u����Lʤ��D����%��	�4}��[@�g��Qb��<�>6:�֏��MC̓��]	�͉-uӋ5���:&Z�
+�3�K���86��K/�P��G�WjgI��4��:_�y%j.X$�t@4�����~�k3!�|�P��g�]�J'.�v~
�#-}�![�" Y�9]R�R��\�d����JW��V3���|�,�{@���ё�~��ǧ4-,K\;����_�?wbP���q�],������N��O�+��ƥ K_i�ǿ�7�"���fx|pBZnm��
+�G\v�z����-�G������1z	���k����51�l �~�k%;���N��|�`#�yQ��
��z��*[u�X�y����?0�����`0�U4������`0~
���`�h��_E��`0�*��}Su`0��օ�n�U����6�E��b�Yx�,�E����L1��o��_�=+�> �! �1 ։���%2xIn���Tϐ4oa��(�W�͊�	�����qK��e!�Œ�������������IJ��ʮ��=Yu�9�CyM��Z�J;&+zf���j4�,6�-�M-w��?������G/N�4s�o�g/����N����+�������~�����֕��\�����㯿���_~�Ӎ�~���ow~���

<TRUNCATED>

[6/8] isis-site git commit: ISIS-1335: improving docs for setting up file/live templates for IntelliJ, some small fixes. Also updated the cheat sheet PDF/docx

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/ec1efb3c/content/guides/images/appendices/dev-env/intellij-idea/030-import-settings/040-file-templates.png
----------------------------------------------------------------------
diff --git a/content/guides/images/appendices/dev-env/intellij-idea/030-import-settings/040-file-templates.png b/content/guides/images/appendices/dev-env/intellij-idea/030-import-settings/040-file-templates.png
new file mode 100644
index 0000000..c238509
Binary files /dev/null and b/content/guides/images/appendices/dev-env/intellij-idea/030-import-settings/040-file-templates.png differ

http://git-wip-us.apache.org/repos/asf/isis-site/blob/ec1efb3c/content/guides/images/appendices/dev-env/intellij-idea/030-import-settings/050-live-templates.png
----------------------------------------------------------------------
diff --git a/content/guides/images/appendices/dev-env/intellij-idea/030-import-settings/050-live-templates.png b/content/guides/images/appendices/dev-env/intellij-idea/030-import-settings/050-live-templates.png
new file mode 100644
index 0000000..6fc56ba
Binary files /dev/null and b/content/guides/images/appendices/dev-env/intellij-idea/030-import-settings/050-live-templates.png differ

http://git-wip-us.apache.org/repos/asf/isis-site/blob/ec1efb3c/content/guides/resources/appendices/dev-env/intellij/isis-settings-code-style.jar
----------------------------------------------------------------------
diff --git a/content/guides/resources/appendices/dev-env/intellij/isis-settings-code-style.jar b/content/guides/resources/appendices/dev-env/intellij/isis-settings-code-style.jar
new file mode 100644
index 0000000..b2ad298
Binary files /dev/null and b/content/guides/resources/appendices/dev-env/intellij/isis-settings-code-style.jar differ

http://git-wip-us.apache.org/repos/asf/isis-site/blob/ec1efb3c/content/guides/resources/appendices/dev-env/intellij/isis-settings-file-templates.jar
----------------------------------------------------------------------
diff --git a/content/guides/resources/appendices/dev-env/intellij/isis-settings-file-templates.jar b/content/guides/resources/appendices/dev-env/intellij/isis-settings-file-templates.jar
new file mode 100644
index 0000000..fffc44f
Binary files /dev/null and b/content/guides/resources/appendices/dev-env/intellij/isis-settings-file-templates.jar differ

http://git-wip-us.apache.org/repos/asf/isis-site/blob/ec1efb3c/content/guides/resources/appendices/dev-env/intellij/isis-settings-live-templates.jar
----------------------------------------------------------------------
diff --git a/content/guides/resources/appendices/dev-env/intellij/isis-settings-live-templates.jar b/content/guides/resources/appendices/dev-env/intellij/isis-settings-live-templates.jar
new file mode 100644
index 0000000..69ff3e4
Binary files /dev/null and b/content/guides/resources/appendices/dev-env/intellij/isis-settings-live-templates.jar differ

http://git-wip-us.apache.org/repos/asf/isis-site/blob/ec1efb3c/content/guides/resources/appendices/dev-env/intellij/other/dan-settings-keymaps.jar
----------------------------------------------------------------------
diff --git a/content/guides/resources/appendices/dev-env/intellij/other/dan-settings-keymaps.jar b/content/guides/resources/appendices/dev-env/intellij/other/dan-settings-keymaps.jar
new file mode 100644
index 0000000..75d09be
Binary files /dev/null and b/content/guides/resources/appendices/dev-env/intellij/other/dan-settings-keymaps.jar differ

http://git-wip-us.apache.org/repos/asf/isis-site/blob/ec1efb3c/content/guides/resources/appendices/dev-env/intellij/other/dan-settings-uisettings.jar
----------------------------------------------------------------------
diff --git a/content/guides/resources/appendices/dev-env/intellij/other/dan-settings-uisettings.jar b/content/guides/resources/appendices/dev-env/intellij/other/dan-settings-uisettings.jar
new file mode 100644
index 0000000..0787a69
Binary files /dev/null and b/content/guides/resources/appendices/dev-env/intellij/other/dan-settings-uisettings.jar differ

http://git-wip-us.apache.org/repos/asf/isis-site/blob/ec1efb3c/content/guides/ugfun.html
----------------------------------------------------------------------
diff --git a/content/guides/ugfun.html b/content/guides/ugfun.html
index 2de365f..6861178 100644
--- a/content/guides/ugfun.html
+++ b/content/guides/ugfun.html
@@ -2404,7 +2404,7 @@ mvn jetty:run -D jetty.port=9090</code></pre>
 <p>Once you are familiar with the generated app, you&#8217;ll want to start modifying it.  There is plenty of guidance on this site; check out the 'programming model how-tos' section on the main <a href="../documentation.html">documentation</a> page first).</p>
 </div>
 <div class="paragraph">
-<p>If you use Eclipse or IntelliJ IDEA, do also install the <a href="dg.html#_dg_ide-templates">IDE templates</a>; these will help you follow the Apache Isis naming conventions.</p>
+<p>If you use IntelliJ IDEA or Eclipse, do also install the <a href="dg.html#_dg_ide_intellij_live-templates">live templates (for IntelliJ)</a> / <a href="dg.html#_dg_ide_eclipse_editor-templates">editor templates (for Eclipse)</a>; these will help you follow the Apache Isis naming conventions.</p>
 </div>
 </div>
 <div class="sect3">

[4/8] isis-site git commit: ISIS-1335: improving docs for setting up file/live templates for IntelliJ, some small fixes. Also updated the cheat sheet PDF/docx

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/ec1efb3c/content/guides/ugtst.html
----------------------------------------------------------------------
diff --git a/content/guides/ugtst.html b/content/guides/ugtst.html
index b2195f4..d6cb74a 100644
--- a/content/guides/ugtst.html
+++ b/content/guides/ugtst.html
@@ -901,7 +901,7 @@ CustomerRepository customers;</code></pre>
 </td>
 <td class="content">
 <div class="paragraph">
-<p>(If using the JDO objectstore, then) there is generally no need to programmatically maintain 1:m relationships (indeed it may introduce subtle errors). For more details, see <a href="ugfun.html#_ugfun_how-tos_entity-relationships_managed-1-to-m-bidirectional-relationships">here</a>.  Also check out the <a href="dg.html#_dg_ide-templates">IDE templates</a> for further guidance.</p>
+<p>(If using the JDO objectstore, then) there is generally no need to programmatically maintain 1:m relationships (indeed it may introduce subtle errors). For more details, see <a href="ugfun.html#_ugfun_how-tos_entity-relationships_managed-1-to-m-bidirectional-relationships">here</a>.  Also check out the templates in the developers' guide (<a href="dg.html#_dg_ide_intellij_live-templates">live templates for IntelliJ</a> / <a href="dg.html#_dg_ide_eclipse_editor-templates">editor templates for Eclipse</a>) for further guidance.</p>
 </div>
 </td>
 </tr>