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 2017/03/07 23:59:59 UTC

[01/44] isis-site git commit: ISIS-1594: provide an 'edit' button

Repository: isis-site
Updated Branches:
  refs/heads/asf-site 721364638 -> 83a3755a5


http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/support.html
----------------------------------------------------------------------
diff --git a/content/support.html b/content/support.html
index 4a83201..3f3b98f 100644
--- a/content/support.html
+++ b/content/support.html
@@ -1,12 +1,10 @@
 <!doctype html>
 <html class="no-js" lang="en">
-<head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-
-    <title>Mailing lists</title>
-
-    <!--
+ <head> 
+  <meta charset="utf-8"> 
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"> 
+  <title>Mailing lists</title> 
+  <!--
         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
@@ -23,31 +21,21 @@
         KIND, either express or implied.  See the License for the
         specific language governing permissions and limitations
         under the License.
-    -->
-
-    <!-- No caching headers -->
-    <meta http-equiv="cache-control" content="no-cache" />
-    <meta http-equiv="pragma" content="no-cache" />
-    <meta http-equiv="expires" content="-1" />
-
-
-    <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
-    <link href="css/foundation/5.5.1/foundation.css" rel="stylesheet" />
-    <script src="js/foundation/5.5.1/vendor/modernizr.js"></script>
-    <link href="css/asciidoctor/colony.css" rel="stylesheet">
-    <link href="css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-
-
-
-    <link href="css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
-    <!--[if lt IE 9]>
+    --> 
+  <!-- No caching headers --> 
+  <meta http-equiv="cache-control" content="no-cache"> 
+  <meta http-equiv="pragma" content="no-cache"> 
+  <meta http-equiv="expires" content="-1"> 
+  <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line --> 
+  <link href="css/foundation/5.5.1/foundation.css" rel="stylesheet"> 
+  <script src="js/foundation/5.5.1/vendor/modernizr.js"></script> 
+  <link href="css/asciidoctor/colony.css" rel="stylesheet"> 
+  <link href="css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet"> 
+  <link href="css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet"> 
+  <!--[if lt IE 9]>
       <link href="css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
-    <![endif]-->
-
-
-
-    <style type="text/css">
+    <![endif]--> 
+  <style type="text/css">
         pre code {
             background-color: inherit;
             border-style: none;
@@ -192,9 +180,8 @@ table.CodeRay td.code>pre{padding:0}
         color:#fff;
         font-size: 1.1em;
     }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         @media only screen and (min-width: 40.063em) {
           .top-bar {
             .contain-to-grid .top-bar {
@@ -205,9 +192,8 @@ table.CodeRay td.code>pre{padding:0}
         .row {
             max-width: 80rem;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .extended-quote,
         .extended-quote-first {
             margin-left: 40px;
@@ -231,9 +217,8 @@ table.CodeRay td.code>pre{padding:0}
             text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
         }
         
-    </style>
-
-    <style>
+    </style> 
+  <style>
         body {
           position: relative;
         }
@@ -255,6 +240,7 @@ table.CodeRay td.code>pre{padding:0}
 
         div#doc-content {
             margin-top: 30px;
+            padding-top: 30px;
         }
 
         div.documentation-page table.frame-all {
@@ -286,9 +272,8 @@ table.CodeRay td.code>pre{padding:0}
             min-height: 2000px;
         }
 
-    </style>
-
-    <style>
+    </style> 
+  <style>
 
         @media only screen and (min-width: 768px) {
           #toc.toc2 ul ul { margin-left: -10px; }
@@ -316,15 +301,13 @@ table.CodeRay td.code>pre{padding:0}
         body div#toc2 li.tocify-item.active a {
             color: red;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         footer {
             margin-top: 1000px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* overriding colony.css stylesheet */
         .literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
            /*padding: 1.25em 1.5625em 1.125em 1.5625em;*/
@@ -372,9 +355,8 @@ table.CodeRay td.code>pre{padding:0}
         .imageblock img {
             margin-bottom: 10px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* from http://ben.balter.com/2014/03/13/pages-anchor-links/ */
         .header-link {
           position: absolute;
@@ -395,9 +377,8 @@ table.CodeRay td.code>pre{padding:0}
         h6:hover .header-link {
           opacity: 1;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .top-bar
         {
             -webkit-transition-duration: .5s;
@@ -425,214 +406,164 @@ table.CodeRay td.code>pre{padding:0}
             -webkit-transition-property: -webkit-transform;
             transition-property: transform;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         #doc-content a.guide {
             color: white;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
+        .tocify {
+            margin-top: 80px;
+        }
+    </style> 
+  <style>
         .tocify {
             margin-top: 80px;
         }
-    </style>
-
-
-</script>
-
-</head>
-<body>
-
-<<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
-    <div class="github-fork-ribbon">
-        <a href="https://github.com/apache/isis#fork-destination-box">Fork me on GitHub</a>
-    </div>
-</div>
-
-
-<div class="row">
-
-    <div class="fixed contain-to-grid header">
-        <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
-            <ul class="title-area">
-                <li class="name">
-                    <h1>
-                        <a href="/index.html">Apache Isis&trade;</a>
-                    </h1>
-                </li>
-                <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
-                <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
-            </ul>
-
-            <section class="top-bar-section">
-                <ul class="right">
-
-                    <li class="has-form">
-                       <FORM class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
-                        <div class="row collapse">
-                            <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
-                            <INPUT type="hidden" name="cof" value="FORID:0">
-                            <INPUT class="form-control" name="q" type="text" placeholder="Search">
-                        </div>
-                    </FORM>
-                     </li>
-
-                </ul>
-
-                <!-- Left Nav Section -->
-                <ul class="left">
-
-                    <li><a href="/documentation.html">Documentation</a></li>
-                    <li><a href="/downloads.html">Downloads</a></li>
-                    <li><a href="/help.html">Help</a></li>
-                    <li><a href="/asf.html">@ASF</a></li>
-
-                </ul>
-
-            </section>
-        </nav>
-    </div>
-</div>
-
-<div class="row">
-
-    <div id="doc-content-left" class="large-9 medium-9 columns">
-
-
-        <div id="doc-content">
-          <div id="preamble">
-<div class="sectionbody">
-<div class="paragraph">
-<p><br/><br/><br/></p>
-</div>
-<div class="paragraph">
-<p>Apache Isis has two public mailing lists.</p>
-</div>
-<table class="tableblock frame-all grid-all spread">
-<caption class="title">Table 1. Table caption</caption>
-<colgroup>
-<col style="width: 20%;">
-<col style="width: 30%;">
-<col style="width: 20%;">
-<col style="width: 30%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">Mailing list</th>
-<th class="tableblock halign-left valign-top">Email</th>
-<th class="tableblock halign-left valign-top">Mail archives</th>
-<th class="tableblock halign-left valign-top">Subscribe</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Users</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="mailto:users@isis.apache.org">users@isis.apache.org</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://lists.apache.org/list.html?users&#0064;isis.apache.org">Pony mail</a><br>
-<a href="http://markmail.org/search/isis-users+list:org.apache.incubator.isis-users">Markmail</a><br>
-<a href="http://mail-archives.apache.org/mod_mbox/isis-users/">mbox</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="mailto:users-subscribe@isis.apache.org">users-subscribe@isis.apache.org</a></p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Contributors</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="mailto:dev@isis.apache.org">dev@isis.apache.org</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://lists.apache.org/list.html?dev&#0064;isis.apache.org">Pony mail</a><br>
-<a href="http://markmail.org/search/isis-dev+list:org.apache.incubator.isis-dev">Markmail</a><br>
-<a href="http://mail-archives.apache.org/mod_mbox/isis-dev/">mbox</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="mailto:dev-subscribe@isis.apache.org">dev-subscribe@isis.apache.org</a></p></td>
-</tr>
-</tbody>
-</table>
-<div class="paragraph">
-<p>The Markmail archives span both our current (TLP) mailing lists and also our original mailing lists while in the Apache incubator; the ASF archives span just our TLP mailing lists.</p>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="how-to-subscribe">How to subscribe</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>To subscribe to the <code>users</code> mailing list:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>send a blank email to <a href="mailto:users-subscribe@isis.apache.org">users-subscribe@isis.apache.org</a></p>
-</li>
-<li>
-<p>You&#8217;ll then get back a confirmation email.</p>
-</li>
-<li>
-<p>To confirm, all you generally need to do is to send a blank reply (there are more detailed instructions inside that confirmation mail if that doesn&#8217;t work)</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>Then, to ask questions, simply mail to <a href="mailto:users@isis.apache.org">users@isis.apache.org</a> (nb: no <code>-subscribe</code> suffix this time).</p>
-</div>
-<div class="paragraph">
-<p>If you ever want to unsubscribe, then you can send a mail to the <code>users-unsubscribe</code> email address.</p>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="mailing-list-etiquette">Mailing list etiquette</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Just a couple of rules/suggestions:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>if you are referencing links, then in the body of the mail, number then [1], [2], [3] etc and then list them at the end.</p>
-</li>
-<li>
-<p>reply to a previous post in the <a href="http://en.wikipedia.org/wiki/Posting_style#Interleaved_style">interleaved style</a> (adding your replies in-line).  Try not to <a href="http://en.wikipedia.org/wiki/Posting_style#Top-posting)">top-post</a>.</p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-        </div>
-
-        <footer>
-          <hr>
-          <p class="small">
-          Copyright &copy; 2010~2016 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0.
-          <br/>
-          Apache, the Apache feather logo, Apache&nbsp;Isis, and the Apache&nbsp;Isis project logo are all trademarks of The&nbsp;Apache&nbsp;Software&nbsp;Foundation.
-          </p>
-        </footer>
-
-    </div>
-
-    <div id="doc-content-right" class="large-3 medium-3 xcolumns">
-        <div id="toc" class="toc2">
-            <div class="fallback-toc">
-                <ul class="sectlevel1">
-<li><a href="#how-to-subscribe">How to subscribe</a></li>
-<li><a href="#mailing-list-etiquette">Mailing list etiquette</a></li>
-</ul>
-            </div>
-        </div>
-    </div>
-
-</div>
-
-
-<script src="./js/foundation/5.5.1/vendor/jquery.js"></script>
-<script src="./js/foundation/5.5.1/foundation.min.js"></script>
-
-
-<link href="./css/jquery.tocify/1.9.0/jquery.tocify.css" rel="stylesheet">
-<script src="./js/jqueryui/1.11.4/jquery-ui.min.js"></script>
-<script src="./js/jquery.tocify/1.9.0/jquery.tocify.js"></script>
-
-
-
-<script type="text/javascript">
+    </style>  
+ </head> 
+ <body> 
+  <div class="row"> 
+   <div class="fixed contain-to-grid header"> 
+    <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem"> 
+     <ul class="title-area"> 
+      <li class="name"> <h1> <a href="/index.html">Apache Isis\u2122</a> </h1> </li> 
+      <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone --> 
+      <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li> 
+     </ul> 
+     <section class="top-bar-section"> 
+      <ul class="right"> 
+       <li class="has-form"> 
+        <form class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse"> 
+         <div class="row collapse"> 
+          <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya"> 
+          <input type="hidden" name="cof" value="FORID:0"> 
+          <input class="form-control" name="q" type="text" placeholder="Search"> 
+         </div> 
+        </form> </li> 
+      </ul> 
+      <!-- Left Nav Section --> 
+      <ul class="left"> 
+       <li><a href="/documentation.html">Documentation</a></li> 
+       <li><a href="/downloads.html">Downloads</a></li> 
+       <li><a href="/help.html">Help</a></li> 
+       <li><a href="/asf.html">@ASF</a></li> 
+      </ul> 
+     </section> 
+    </nav> 
+   </div> 
+  </div> 
+  <div class="row"> 
+   <div id="doc-content-left" class="large-9 medium-9 columns"> 
+    <div id="doc-content">
+     <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/support.adoc&quot;" style="float: right; font-size: small; padding: 6px;  "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+     <div id="preamble"> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p><br><br><br></p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>Apache Isis has two public mailing lists.</p> 
+       </div> 
+       <table class="tableblock frame-all grid-all spread"> 
+        <caption class="title">
+         Table 1. Table caption
+        </caption> 
+        <colgroup> 
+         <col style="width: 20%;"> 
+         <col style="width: 30%;"> 
+         <col style="width: 20%;"> 
+         <col style="width: 30%;"> 
+        </colgroup> 
+        <thead> 
+         <tr> 
+          <th class="tableblock halign-left valign-top">Mailing list</th> 
+          <th class="tableblock halign-left valign-top">Email</th> 
+          <th class="tableblock halign-left valign-top">Mail archives</th> 
+          <th class="tableblock halign-left valign-top">Subscribe</th> 
+         </tr> 
+        </thead> 
+        <tbody> 
+         <tr> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock">Users</p></td> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="mailto:users@isis.apache.org">users@isis.apache.org</a></p></td> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://lists.apache.org/list.html?users@isis.apache.org">Pony mail</a><br> <a href="http://markmail.org/search/isis-users+list:org.apache.incubator.isis-users">Markmail</a><br> <a href="http://mail-archives.apache.org/mod_mbox/isis-users/">mbox</a></p></td> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="mailto:users-subscribe@isis.apache.org">users-subscribe@isis.apache.org</a></p></td> 
+         </tr> 
+         <tr> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock">Contributors</p></td> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="mailto:dev@isis.apache.org">dev@isis.apache.org</a></p></td> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://lists.apache.org/list.html?dev@isis.apache.org">Pony mail</a><br> <a href="http://markmail.org/search/isis-dev+list:org.apache.incubator.isis-dev">Markmail</a><br> <a href="http://mail-archives.apache.org/mod_mbox/isis-dev/">mbox</a></p></td> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="mailto:dev-subscribe@isis.apache.org">dev-subscribe@isis.apache.org</a></p></td> 
+         </tr> 
+        </tbody> 
+       </table> 
+       <div class="paragraph"> 
+        <p>The Markmail archives span both our current (TLP) mailing lists and also our original mailing lists while in the Apache incubator; the ASF archives span just our TLP mailing lists.</p> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="how-to-subscribe">How to subscribe</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/how-to-subscribe.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>To subscribe to the <code>users</code> mailing list:</p> 
+       </div> 
+       <div class="ulist"> 
+        <ul> 
+         <li> <p>send a blank email to <a href="mailto:users-subscribe@isis.apache.org">users-subscribe@isis.apache.org</a></p> </li> 
+         <li> <p>You\u2019ll then get back a confirmation email.</p> </li> 
+         <li> <p>To confirm, all you generally need to do is to send a blank reply (there are more detailed instructions inside that confirmation mail if that doesn\u2019t work)</p> </li> 
+        </ul> 
+       </div> 
+       <div class="paragraph"> 
+        <p>Then, to ask questions, simply mail to <a href="mailto:users@isis.apache.org">users@isis.apache.org</a> (nb: no <code>-subscribe</code> suffix this time).</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>If you ever want to unsubscribe, then you can send a mail to the <code>users-unsubscribe</code> email address.</p> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="mailing-list-etiquette">Mailing list etiquette</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/mailing-list-etiquette.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>Just a couple of rules/suggestions:</p> 
+       </div> 
+       <div class="ulist"> 
+        <ul> 
+         <li> <p>if you are referencing links, then in the body of the mail, number then [1], [2], [3] etc and then list them at the end.</p> </li> 
+         <li> <p>reply to a previous post in the <a href="http://en.wikipedia.org/wiki/Posting_style#Interleaved_style">interleaved style</a> (adding your replies in-line). Try not to <a href="http://en.wikipedia.org/wiki/Posting_style#Top-posting)">top-post</a>.</p> </li> 
+        </ul> 
+       </div> 
+      </div> 
+     </div> 
+    </div> 
+    <footer> 
+     <hr> 
+     <p class="small"> Copyright � 2010~2016 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0. <br> Apache, the Apache feather logo, Apache&nbsp;Isis, and the Apache&nbsp;Isis project logo are all trademarks of The&nbsp;Apache&nbsp;Software&nbsp;Foundation. </p> 
+    </footer> 
+   </div> 
+   <div id="doc-content-right" class="large-3 medium-3 xcolumns"> 
+    <div id="toc" class="toc2"> 
+     <div class="fallback-toc"> 
+      <ul class="sectlevel1"> 
+       <li><a href="#how-to-subscribe">How to subscribe</a></li> 
+       <li><a href="#mailing-list-etiquette">Mailing list etiquette</a></li> 
+      </ul> 
+     </div> 
+    </div> 
+   </div> 
+  </div> 
+  <script src="./js/foundation/5.5.1/vendor/jquery.js"></script> 
+  <script src="./js/foundation/5.5.1/foundation.min.js"></script> 
+  <link href="./css/jquery.tocify/1.9.0/jquery.tocify.css" rel="stylesheet"> 
+  <script src="./js/jqueryui/1.11.4/jquery-ui.min.js"></script> 
+  <script src="./js/jquery.tocify/1.9.0/jquery.tocify.js"></script> 
+  <script type="text/javascript">
     $(function () {
         $("#toc").tocify({
             scrollTo: 50,
@@ -645,9 +576,8 @@ table.CodeRay td.code>pre{padding:0}
         });
         $(".fallback-toc").hide();
     });
-</script>
-
-<script type="text/javascript">
+</script> 
+  <script type="text/javascript">
 
   /****
 
@@ -757,9 +687,8 @@ table.CodeRay td.code>pre{padding:0}
 
     ***/
 
-</script>
-
-<script type="text/javascript">
+</script> 
+  <script type="text/javascript">
 
 $(document).ready(function(){
     if("Documentation" === "Mailing lists") {
@@ -771,10 +700,8 @@ $(document).ready(function(){
 
 });
 
-</script>
-
-
-<script>
+</script> 
+  <script>
 
 $( document ).ready(function() {
 
@@ -865,7 +792,6 @@ $( document ).ready(function() {
 
 
 });
-</script>
-
-</body>
+</script>  
+ </body>
 </html>


[41/44] isis-site git commit: ISIS-1594: provide an 'edit' button

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/guides/cgcom.html
----------------------------------------------------------------------
diff --git a/content/guides/cgcom.html b/content/guides/cgcom.html
index 90f050b..cdfb151 100644
--- a/content/guides/cgcom.html
+++ b/content/guides/cgcom.html
@@ -1,12 +1,10 @@
 <!doctype html>
 <html class="no-js" lang="en">
-<head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-
-    <title>Committers' Guide</title>
-
-    <!--
+ <head> 
+  <meta charset="utf-8"> 
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"> 
+  <title>Committers' Guide</title> 
+  <!--
         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
@@ -23,31 +21,21 @@
         KIND, either express or implied.  See the License for the
         specific language governing permissions and limitations
         under the License.
-    -->
-
-    <!-- No caching headers -->
-    <meta http-equiv="cache-control" content="no-cache" />
-    <meta http-equiv="pragma" content="no-cache" />
-    <meta http-equiv="expires" content="-1" />
-
-
-    <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
-    <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet" />
-    <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script>
-    <link href="../css/asciidoctor/colony.css" rel="stylesheet">
-    <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-
-
-
-    <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
-    <!--[if lt IE 9]>
+    --> 
+  <!-- No caching headers --> 
+  <meta http-equiv="cache-control" content="no-cache"> 
+  <meta http-equiv="pragma" content="no-cache"> 
+  <meta http-equiv="expires" content="-1"> 
+  <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line --> 
+  <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet"> 
+  <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script> 
+  <link href="../css/asciidoctor/colony.css" rel="stylesheet"> 
+  <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet"> 
+  <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet"> 
+  <!--[if lt IE 9]>
       <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
-    <![endif]-->
-
-
-
-    <style type="text/css">
+    <![endif]--> 
+  <style type="text/css">
         pre code {
             background-color: inherit;
             border-style: none;
@@ -192,9 +180,8 @@ table.CodeRay td.code>pre{padding:0}
         color:#fff;
         font-size: 1.1em;
     }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         @media only screen and (min-width: 40.063em) {
           .top-bar {
             .contain-to-grid .top-bar {
@@ -205,9 +192,8 @@ table.CodeRay td.code>pre{padding:0}
         .row {
             max-width: 80rem;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .extended-quote,
         .extended-quote-first {
             margin-left: 40px;
@@ -231,9 +217,8 @@ table.CodeRay td.code>pre{padding:0}
             text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
         }
         
-    </style>
-
-    <style>
+    </style> 
+  <style>
         body {
           position: relative;
         }
@@ -255,6 +240,7 @@ table.CodeRay td.code>pre{padding:0}
 
         div#doc-content {
             margin-top: 30px;
+            padding-top: 30px;
         }
 
         div.documentation-page table.frame-all {
@@ -286,9 +272,8 @@ table.CodeRay td.code>pre{padding:0}
             min-height: 2000px;
         }
 
-    </style>
-
-    <style>
+    </style> 
+  <style>
 
         @media only screen and (min-width: 768px) {
           #toc.toc2 ul ul { margin-left: -10px; }
@@ -316,15 +301,13 @@ table.CodeRay td.code>pre{padding:0}
         body div#toc2 li.tocify-item.active a {
             color: red;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         footer {
             margin-top: 1000px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* overriding colony.css stylesheet */
         .literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
            /*padding: 1.25em 1.5625em 1.125em 1.5625em;*/
@@ -372,9 +355,8 @@ table.CodeRay td.code>pre{padding:0}
         .imageblock img {
             margin-bottom: 10px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* from http://ben.balter.com/2014/03/13/pages-anchor-links/ */
         .header-link {
           position: absolute;
@@ -395,9 +377,8 @@ table.CodeRay td.code>pre{padding:0}
         h6:hover .header-link {
           opacity: 1;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .top-bar
         {
             -webkit-transition-duration: .5s;
@@ -425,273 +406,196 @@ table.CodeRay td.code>pre{padding:0}
             -webkit-transition-property: -webkit-transform;
             transition-property: transform;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         #doc-content a.guide {
             color: white;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
+        .tocify {
+            margin-top: 80px;
+        }
+    </style> 
+  <style>
         .tocify {
             margin-top: 80px;
         }
-    </style>
-
-
-</script>
-
-</head>
-<body>
-
-<<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
-    <div class="github-fork-ribbon">
-        <a href="https://github.com/apache/isis#fork-destination-box">Fork me on GitHub</a>
-    </div>
-</div>
-
-
-<div class="row">
-
-    <div class="fixed contain-to-grid header">
-        <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
-            <ul class="title-area">
-                <li class="name">
-                    <h1>
-                        <a href="/index.html">Apache Isis&trade;</a>
-                    </h1>
-                </li>
-                <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
-                <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
-            </ul>
-
-            <section class="top-bar-section">
-                <ul class="right">
-
-                    <li class="has-form">
-                       <FORM class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
-                        <div class="row collapse">
-                            <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
-                            <INPUT type="hidden" name="cof" value="FORID:0">
-                            <INPUT class="form-control" name="q" type="text" placeholder="Search">
-                        </div>
-                    </FORM>
-                     </li>
-
-                </ul>
-
-                <!-- Left Nav Section -->
-                <ul class="left">
-
-                    <li><a href="/documentation.html">Documentation</a></li>
-                    <li><a href="/downloads.html">Downloads</a></li>
-                    <li><a href="/help.html">Help</a></li>
-                    <li><a href="/asf.html">@ASF</a></li>
-
-                </ul>
-
-            </section>
-        </nav>
-    </div>
-</div>
-
-<div class="row">
-
-    <div id="doc-content-left" class="large-9 medium-9 columns">
-
-
-        <div id="doc-content">
-          <div class="sect1">
-<h2 id="_cgcom">1. Committers' Guide</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>This committers' guide is for committers of Apache Isis itself who want guidance on release process, publishing documents and other related procedures.</p>
-</div>
-<div class="sect2">
-<h3 id="_other_guides">1.1. Other Guides</h3>
-<div class="paragraph">
-<p>Apache Isis documentation is broken out into a number of user, reference and "supporting procedures" guides.</p>
-</div>
-<div class="paragraph">
-<p>The user guides available are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="ugfun.html">Fundamentals</a></p>
-</li>
-<li>
-<p><a href="ugvw.html">Wicket viewer</a></p>
-</li>
-<li>
-<p><a href="ugvro.html">Restful Objects viewer</a></p>
-</li>
-<li>
-<p><a href="ugdno.html">DataNucleus object store</a></p>
-</li>
-<li>
-<p><a href="ugsec.html">Security</a></p>
-</li>
-<li>
-<p><a href="ugtst.html">Testing</a></p>
-</li>
-<li>
-<p><a href="ugbtb.html">Beyond the Basics</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The reference guides are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="rgant.html">Annotations</a></p>
-</li>
-<li>
-<p><a href="rgsvc.html">Domain Services</a></p>
-</li>
-<li>
-<p><a href="rgcfg.html">Configuration Properties</a></p>
-</li>
-<li>
-<p><a href="rgcms.html">Classes, Methods and Schema</a></p>
-</li>
-<li>
-<p><a href="rgmvn.html">Apache Isis Maven plugin</a></p>
-</li>
-<li>
-<p><a href="rgfis.html">Framework Internal Services</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The remaining guides are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="dg.html">Developers' Guide</a> (how to set up a development environment for Apache Isis and contribute back to the project)</p>
-</li>
-<li>
-<p><a href="#">Committers' Guide</a> (this guide)</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>This guide provides guidance for Apache Isis' own committers.</p>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_cgcom_merging-a-pull-request">2. Merging a Pull Request</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>The process for merging in github pull requests (so that they can be tested locally before committing) has been scripted in the <code>github-pr.sh</code> script.</p>
-</div>
-<div class="paragraph">
-<p>The script will merge the fork into a temporary branch, and then run a build.  Once you are happy, you can commit.</p>
-</div>
-<div class="sect2">
-<h3 id="_process_and_usage">2.1. Process and Usage</h3>
-<div class="paragraph">
-<p>The overall process is as follows:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>locate/raise corresponding JIRA ticket, eg ISIS-1162</p>
-</li>
-<li>
-<p>checkout branch from which PR was forked (usually just 'master')</p>
-</li>
-<li>
-<p>merge PR into temporary branch using the <code>github-pr.sh</code> script</p>
-</li>
-<li>
-<p>test the change locally (run the app, rebuild, manual regression tests etc)</p>
-</li>
-<li>
-<p>if required, tidy up/refactor code as required</p>
-</li>
-<li>
-<p>merge temporary branch into mainline, and commit</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>This <a href="https://youtu.be/CKSLZBBHjME">screencast</a> also shows the process.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_prerequisites">2.2. Prerequisites</h3>
-<div class="paragraph">
-<p>The script uses 'jq' to parse JSON.  To install:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>on Linux:<br></p>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">aptitude install jq</code></pre>
-</div>
-</div>
-</li>
-<li>
-<p>on MacOS:<br></p>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">brew install jq</code></pre>
-</div>
-</div>
-</li>
-<li>
-<p>on Windows:<br></p>
-<div class="paragraph">
-<p>Download exe from <a href="http://stedolan.github.io/jq/download/">website</a></p>
-</div>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_syntax">2.3. Syntax</h3>
-<div class="paragraph">
-<p>The syntax is:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">github-pr.sh isis 1162 31</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>where:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><code>isis</code> is the JIRA project and repo</p>
-</li>
-<li>
-<p><code>1162</code> is the JIRA ticket number</p>
-</li>
-<li>
-<p><code>31</code>   is the gthub PR issue number</p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_example_transcript">2.4. Example transcript</h3>
-<div class="paragraph">
-<p>The listing below shows the steps taken by the script:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">$ sh github-pr.sh isis 1162 31
+    </style>  
+ </head> 
+ <body> 
+  <div class="row"> 
+   <div class="fixed contain-to-grid header"> 
+    <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem"> 
+     <ul class="title-area"> 
+      <li class="name"> <h1> <a href="/index.html">Apache Isis\u2122</a> </h1> </li> 
+      <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone --> 
+      <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li> 
+     </ul> 
+     <section class="top-bar-section"> 
+      <ul class="right"> 
+       <li class="has-form"> 
+        <form class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse"> 
+         <div class="row collapse"> 
+          <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya"> 
+          <input type="hidden" name="cof" value="FORID:0"> 
+          <input class="form-control" name="q" type="text" placeholder="Search"> 
+         </div> 
+        </form> </li> 
+      </ul> 
+      <!-- Left Nav Section --> 
+      <ul class="left"> 
+       <li><a href="/documentation.html">Documentation</a></li> 
+       <li><a href="/downloads.html">Downloads</a></li> 
+       <li><a href="/help.html">Help</a></li> 
+       <li><a href="/asf.html">@ASF</a></li> 
+      </ul> 
+     </section> 
+    </nav> 
+   </div> 
+  </div> 
+  <div class="row"> 
+   <div id="doc-content-left" class="large-9 medium-9 columns"> 
+    <div id="doc-content">
+     <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/cgcom.adoc&quot;" style="float: right; font-size: small; padding: 6px;  "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+     <div class="sect1"> 
+      <h2 id="_cgcom">1. Committers' Guide</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_cgcom.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>This committers' guide is for committers of Apache Isis itself who want guidance on release process, publishing documents and other related procedures.</p> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_other_guides">1.1. Other Guides</h3> 
+        <div class="paragraph"> 
+         <p>Apache Isis documentation is broken out into a number of user, reference and "supporting procedures" guides.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The user guides available are:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><a href="ugfun.html">Fundamentals</a></p> </li> 
+          <li> <p><a href="ugvw.html">Wicket viewer</a></p> </li> 
+          <li> <p><a href="ugvro.html">Restful Objects viewer</a></p> </li> 
+          <li> <p><a href="ugdno.html">DataNucleus object store</a></p> </li> 
+          <li> <p><a href="ugsec.html">Security</a></p> </li> 
+          <li> <p><a href="ugtst.html">Testing</a></p> </li> 
+          <li> <p><a href="ugbtb.html">Beyond the Basics</a></p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The reference guides are:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><a href="rgant.html">Annotations</a></p> </li> 
+          <li> <p><a href="rgsvc.html">Domain Services</a></p> </li> 
+          <li> <p><a href="rgcfg.html">Configuration Properties</a></p> </li> 
+          <li> <p><a href="rgcms.html">Classes, Methods and Schema</a></p> </li> 
+          <li> <p><a href="rgmvn.html">Apache Isis Maven plugin</a></p> </li> 
+          <li> <p><a href="rgfis.html">Framework Internal Services</a></p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The remaining guides are:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><a href="dg.html">Developers' Guide</a> (how to set up a development environment for Apache Isis and contribute back to the project)</p> </li> 
+          <li> <p><a href="#">Committers' Guide</a> (this guide)</p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>This guide provides guidance for Apache Isis' own committers.</p> 
+        </div> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_cgcom_merging-a-pull-request">2. Merging a Pull Request</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_cgcom_merging-a-pull-request.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>The process for merging in github pull requests (so that they can be tested locally before committing) has been scripted in the <code>github-pr.sh</code> script.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>The script will merge the fork into a temporary branch, and then run a build. Once you are happy, you can commit.</p> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_process_and_usage">2.1. Process and Usage</h3> 
+        <div class="paragraph"> 
+         <p>The overall process is as follows:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p>locate/raise corresponding JIRA ticket, eg ISIS-1162</p> </li> 
+          <li> <p>checkout branch from which PR was forked (usually just 'master')</p> </li> 
+          <li> <p>merge PR into temporary branch using the <code>github-pr.sh</code> script</p> </li> 
+          <li> <p>test the change locally (run the app, rebuild, manual regression tests etc)</p> </li> 
+          <li> <p>if required, tidy up/refactor code as required</p> </li> 
+          <li> <p>merge temporary branch into mainline, and commit</p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>This <a href="https://youtu.be/CKSLZBBHjME">screencast</a> also shows the process.</p> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_prerequisites">2.2. Prerequisites</h3> 
+        <div class="paragraph"> 
+         <p>The script uses 'jq' to parse JSON. To install:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p>on Linux:<br></p> 
+           <div class="listingblock"> 
+            <div class="content"> 
+             <pre class="CodeRay highlight"><code data-lang="bash">aptitude install jq</code></pre> 
+            </div> 
+           </div> </li> 
+          <li> <p>on MacOS:<br></p> 
+           <div class="listingblock"> 
+            <div class="content"> 
+             <pre class="CodeRay highlight"><code data-lang="bash">brew install jq</code></pre> 
+            </div> 
+           </div> </li> 
+          <li> <p>on Windows:<br></p> 
+           <div class="paragraph"> 
+            <p>Download exe from <a href="http://stedolan.github.io/jq/download/">website</a></p> 
+           </div> </li> 
+         </ul> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_syntax">2.3. Syntax</h3> 
+        <div class="paragraph"> 
+         <p>The syntax is:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="bash">github-pr.sh isis 1162 31</code></pre> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>where:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><code>isis</code> is the JIRA project and repo</p> </li> 
+          <li> <p><code>1162</code> is the JIRA ticket number</p> </li> 
+          <li> <p><code>31</code> is the gthub PR issue number</p> </li> 
+         </ul> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_example_transcript">2.4. Example transcript</h3> 
+        <div class="paragraph"> 
+         <p>The listing below shows the steps taken by the script:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="bash">$ sh github-pr.sh isis 1162 31
 
 Found JIRA ticket
 Found github PR
@@ -716,97 +620,88 @@ Merge made by the 'recursive' strategy.
  .../apache/isis/security/shiro/IsisLdapRealm.java  | 198 +++++++++++++++++++--
  2 files changed, 186 insertions(+), 15 deletions(-)
 
-Merged the PR; hit enter to build</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>The build now commences.  Once done, the script continues:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">If build successful and happy to merge, execute:
-
-git checkout master &amp;&amp; git merge --no-ff ISIS-1162_pr-31 &amp;&amp; git branch -d ISIS-1162_pr-31</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>The screenshot belows shows the history we end up with:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/committers/github-pr-history.png"><img src="images/committers/github-pr-history.png" alt="github pr history"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>This shows the fork being merged into the temporary branch ("ISIS-1162_pr-31"), then some further tidy-up, and finally the merging of the temporary branch into mainline.</p>
-</div>
-<div class="paragraph">
-<p>Note that there is no rebasing in this model.  This is intentional: when the merged branch is pushed, github will automatically close the original pull request.</p>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_cgcom_cutting-a-release">3. Cutting a Release</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>The release process consists of:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>the release manager cutting the release (documented below)</p>
-</li>
-<li>
-<p>Members of the Apache Isis PMC <a href="#_cgcom_verifying-releases">verifying</a> and voting on the release</p>
-</li>
-<li>
-<p>the release manager performing post-release tasks, for either a <a href="#_cgcom_post-release-successful">successful</a> or an <a href="#_cgcom_post-release-unsuccessful">unsuccessful</a> vote.</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>Apache Isis itself consists of two separately releasable modules; relative to the <a href="https://git-wip-us.apache.org/repos/asf/isis/repo?p=isis.git;a=tree">source code root</a> there are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><code>core</code></p>
-</li>
-<li>
-<p><code>component/example/archetypes/simpleapp</code></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>This section details the process for formally releasing Isis modules.  It describes the process for both <code>core</code> and then the archetype.  The subsequent sections describe how other committers can <a href="#_cgcom_verifying-releases">verify a release</a> and how the release manager can then perform <a href="#_cgcom_post-release">post-release</a> activities and set up for the next development iteration.</p>
-</div>
-<div class="paragraph">
-<p>If you&#8217;ve not performed a release before, then note that there are some configuration <a href="#_cgcom_release-process-prereqs">prerequisites</a> that must be configured first.  In particular, you&#8217;ll need signed public/private keys, and the ASF Nexus staging repo inlocal <code>~/.m2/settings.xml</code> file.</p>
-</div>
-<div class="paragraph">
-<p>These release notes using bash command line tools.  They should work on Linux and MacOS; for Windows, use mSysGit.</p>
-</div>
-<div class="sect2">
-<h3 id="_cgcom_cutting-a-release_obtain-consensus">3.1. Obtain Consensus</h3>
-<div class="paragraph">
-<p>Before releasing <code>core</code>, ensure there is consensus on the <a href="../support.html">dev mailing list</a> that this is the right time for a release. The discussion should include confirming the version number to be used, and to confirm content.</p>
-</div>
-<div class="paragraph">
-<p>These discussions should also confirm the version number of the module being released. This should be in line with our <a href="#_cgcom_versioning-policy">semantic versioning policy</a>.</p>
-</div>
-<div class="paragraph">
-<p>Make sure you have a JIRA ticket open against which to perform all commits.  In most cases a JIRA ticket will have been created at the beginning of the previous release cycle.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_cgcom_cutting-a-release_set-environment-variables">3.2. Set environment variables</h3>
-<div class="paragraph">
-<p>We use environment variables to parameterize as many of the steps as possible.  For example:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">cd core
+Merged the PR; hit enter to build</code></pre> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The build now commences. Once done, the script continues:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="bash">If build successful and happy to merge, execute:
+
+git checkout master &amp;&amp; git merge --no-ff ISIS-1162_pr-31 &amp;&amp; git branch -d ISIS-1162_pr-31</code></pre> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The screenshot belows shows the history we end up with:</p> 
+        </div> 
+        <div class="imageblock"> 
+         <div class="content"> 
+          <a class="image" href="images/committers/github-pr-history.png"><img src="images/committers/github-pr-history.png" alt="github pr history"></a> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>This shows the fork being merged into the temporary branch ("ISIS-1162_pr-31"), then some further tidy-up, and finally the merging of the temporary branch into mainline.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Note that there is no rebasing in this model. This is intentional: when the merged branch is pushed, github will automatically close the original pull request.</p> 
+        </div> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_cgcom_cutting-a-release">3. Cutting a Release</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_cgcom_cutting-a-release.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>The release process consists of:</p> 
+       </div> 
+       <div class="ulist"> 
+        <ul> 
+         <li> <p>the release manager cutting the release (documented below)</p> </li> 
+         <li> <p>Members of the Apache Isis PMC <a href="#_cgcom_verifying-releases">verifying</a> and voting on the release</p> </li> 
+         <li> <p>the release manager performing post-release tasks, for either a <a href="#_cgcom_post-release-successful">successful</a> or an <a href="#_cgcom_post-release-unsuccessful">unsuccessful</a> vote.</p> </li> 
+        </ul> 
+       </div> 
+       <div class="paragraph"> 
+        <p>Apache Isis itself consists of two separately releasable modules; relative to the <a href="https://git-wip-us.apache.org/repos/asf/isis/repo?p=isis.git;a=tree">source code root</a> there are:</p> 
+       </div> 
+       <div class="ulist"> 
+        <ul> 
+         <li> <p><code>core</code></p> </li> 
+         <li> <p><code>component/example/archetypes/simpleapp</code></p> </li> 
+        </ul> 
+       </div> 
+       <div class="paragraph"> 
+        <p>This section details the process for formally releasing Isis modules. It describes the process for both <code>core</code> and then the archetype. The subsequent sections describe how other committers can <a href="#_cgcom_verifying-releases">verify a release</a> and how the release manager can then perform <a href="#_cgcom_post-release">post-release</a> activities and set up for the next development iteration.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>If you\u2019ve not performed a release before, then note that there are some configuration <a href="#_cgcom_release-process-prereqs">prerequisites</a> that must be configured first. In particular, you\u2019ll need signed public/private keys, and the ASF Nexus staging repo inlocal <code>~/.m2/settings.xml</code> file.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>These release notes using bash command line tools. They should work on Linux and MacOS; for Windows, use mSysGit.</p> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_cgcom_cutting-a-release_obtain-consensus">3.1. Obtain Consensus</h3> 
+        <div class="paragraph"> 
+         <p>Before releasing <code>core</code>, ensure there is consensus on the <a href="../support.html">dev mailing list</a> that this is the right time for a release. The discussion should include confirming the version number to be used, and to confirm content.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>These discussions should also confirm the version number of the module being released. This should be in line with our <a href="#_cgcom_versioning-policy">semantic versioning policy</a>.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Make sure you have a JIRA ticket open against which to perform all commits. In most cases a JIRA ticket will have been created at the beginning of the previous release cycle.</p> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_cgcom_cutting-a-release_set-environment-variables">3.2. Set environment variables</h3> 
+        <div class="paragraph"> 
+         <p>We use environment variables to parameterize as many of the steps as possible. For example:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="bash">cd core
 export ISISTMP=/c/tmp                               <i class="conum" data-value="1"></i><b>(1)</b>
 export ISISDEV=1.16.0-SNAPSHOT
 export ISISREL=1.15.0
@@ -815,321 +710,309 @@ export ISISBRANCH=release-$ISISREL-$ISISRC
 export ISISJIRA=ISIS-9999                           <i class="conum" data-value="2"></i><b>(2)</b>
 export CATALINA_HOME=/c/java/apache-tomcat-8.0.30   <i class="conum" data-value="3"></i><b>(3)</b>
 
-env | grep ISIS | sort</code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td>adjust by platform</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="2"></i><b>2</b></td>
-<td>set to an "umbrella" ticket for all release activities.  (One should exist already, <a href="#_cgcom_post-release-successful_update-jira_create-new-jira">created at</a> the beginning of the development cycle now completing).</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="3"></i><b>3</b></td>
-<td>adjust as required (Tomcat is used to smoke test the simpleapp archetype)</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>Obviously, alter <code>$ISISDEV</code> and <code>$ISISREL</code> as required, and bump <code>$ISISRC</code> for re-releasing following an <a href="#_cgcom_post-release-unsuccessful">unsuccessful</a> releases.</p>
-</div>
-<div class="admonitionblock important">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-important" title="Important"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>Note that the branch name is <strong>not</strong> the same any of the eventual tag names (eg <code>isis-1.15.0</code> or <code>simpleapp-archetype-1.15.0</code>).</p>
-</div>
-<div class="paragraph">
-<p>If they did have the same name, then what would happen is that the <code>maven-release-plugin</code> would checkout the (HEAD of the) branch and thus upload a SNAPSHOT to the snapshot repository.  What it should of course do is checkout the tag and then upload that to the release staging repository.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_cgcom_cutting-a-release_pull-down-code-to-release">3.3. Pull down code to release</h3>
-<div class="paragraph">
-<p>Set the HEAD of your local git repo to the commit to be released.  This will usually be the tip of the origin&#8217;s <code>master</code> branch.  Then, create a release branch for the version number being released; eg:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">git checkout master
+env | grep ISIS | sort</code></pre> 
+         </div> 
+        </div> 
+        <div class="colist arabic"> 
+         <table> 
+          <tbody>
+           <tr> 
+            <td><i class="conum" data-value="1"></i><b>1</b></td> 
+            <td>adjust by platform</td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="2"></i><b>2</b></td> 
+            <td>set to an "umbrella" ticket for all release activities. (One should exist already, <a href="#_cgcom_post-release-successful_update-jira_create-new-jira">created at</a> the beginning of the development cycle now completing).</td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="3"></i><b>3</b></td> 
+            <td>adjust as required (Tomcat is used to smoke test the simpleapp archetype)</td> 
+           </tr> 
+          </tbody>
+         </table> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Obviously, alter <code>$ISISDEV</code> and <code>$ISISREL</code> as required, and bump <code>$ISISRC</code> for re-releasing following an <a href="#_cgcom_post-release-unsuccessful">unsuccessful</a> releases.</p> 
+        </div> 
+        <div class="admonitionblock important"> 
+         <table> 
+          <tbody>
+           <tr> 
+            <td class="icon"> <i class="fa icon-important" title="Important"></i> </td> 
+            <td class="content"> 
+             <div class="paragraph"> 
+              <p>Note that the branch name is <strong>not</strong> the same any of the eventual tag names (eg <code>isis-1.15.0</code> or <code>simpleapp-archetype-1.15.0</code>).</p> 
+             </div> 
+             <div class="paragraph"> 
+              <p>If they did have the same name, then what would happen is that the <code>maven-release-plugin</code> would checkout the (HEAD of the) branch and thus upload a SNAPSHOT to the snapshot repository. What it should of course do is checkout the tag and then upload that to the release staging repository.</p> 
+             </div> </td> 
+           </tr> 
+          </tbody>
+         </table> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_cgcom_cutting-a-release_pull-down-code-to-release">3.3. Pull down code to release</h3> 
+        <div class="paragraph"> 
+         <p>Set the HEAD of your local git repo to the commit to be released. This will usually be the tip of the origin\u2019s <code>master</code> branch. Then, create a release branch for the version number being released; eg:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="bash">git checkout master
 git pull --ff-only
-git checkout -b $ISISBRANCH</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>All release preparation is done locally; if we are successful, this branch will be merged back into master.</p>
-</div>
-<div class="paragraph">
-<p>Double check that the version number of the parent pom should reflect the branch name that you are now on (with a <code>-SNAPSHOT</code> suffix).  his will normally have been done already during earlier development; but confirm that it has been updated. If it has not, make the change.</p>
-</div>
-<div class="paragraph">
-<p>Double check that the version number of the core POM (<code>core/pom.xml</code>) should reflect the branch name that you are now on.  For example, if releasing version <code>1.15.0</code>, the POM should read:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="xml"><span class="tag">&lt;groupId&gt;</span>org.apache.isis.core<span class="tag">&lt;/groupId&gt;</span>
+git checkout -b $ISISBRANCH</code></pre> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>All release preparation is done locally; if we are successful, this branch will be merged back into master.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Double check that the version number of the parent pom should reflect the branch name that you are now on (with a <code>-SNAPSHOT</code> suffix). his will normally have been done already during earlier development; but confirm that it has been updated. If it has not, make the change.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Double check that the version number of the core POM (<code>core/pom.xml</code>) should reflect the branch name that you are now on. For example, if releasing version <code>1.15.0</code>, the POM should read:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="xml"><span class="tag">&lt;groupId&gt;</span>org.apache.isis.core<span class="tag">&lt;/groupId&gt;</span>
 <span class="tag">&lt;artifactId&gt;</span>isis<span class="tag">&lt;/artifactId&gt;</span>
-<span class="tag">&lt;version&gt;</span>1.16.0-SNAPSHOT<span class="tag">&lt;/version&gt;</span></code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Also, check that there are no snapshot dependencies:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">grep SNAPSHOT `/bin/find . -name pom.xml | grep -v target | grep -v mothball | sort`</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>The only mention of <code>SNAPSHOT</code> should be for the Isis modules about to be released.</p>
-</div>
-<div class="admonitionblock tip">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-tip" title="Tip"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>Obviously, don&#8217;t update Apache Isis' <code>SNAPSHOT</code> references; these get updated by the <code>mvn release:prepare</code> command we run later.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_cgcom_cutting-a-release_releasing-core">3.4. Releasing Core</h3>
-<div class="paragraph">
-<p>First, we release <code>core</code>.  Switch to the appropriate directory:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">cd core</code></pre>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_cgcom_cutting-a-release_releasing-core_set-environment-variables">3.4.1. Set environment variables</h4>
-<div class="paragraph">
-<p>Set additional environment variables for the core "artifact":</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">export ISISART=isis
-export ISISCOR=&quot;Y&quot;
-
-env | grep ISIS | sort</code></pre>
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_cgcom_cutting-a-release_releasing-core_license-headers">3.4.2. License headers</h4>
-<div class="paragraph">
-<p>The Apache Release Audit Tool <code>RAT</code> (from the <a href="http://creadur.apache.org">Apache Creadur</a> project) checks for missing license header files. The parent <code>pom.xml</code> of each releasable module specifies the RAT Maven plugin, with a number of custom exclusions.</p>
-</div>
-<div class="paragraph">
-<p>To run the RAT tool, use:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">mvn org.apache.rat:apache-rat-plugin:check -D rat.numUnapprovedLicenses=50 -o &amp;&amp; \
+<span class="tag">&lt;version&gt;</span>1.16.0-SNAPSHOT<span class="tag">&lt;/version&gt;</span></code></pre> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Also, check that there are no snapshot dependencies:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="bash">grep SNAPSHOT `/bin/find . -name pom.xml | grep -v target | grep -v mothball | sort`</code></pre> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The only mention of <code>SNAPSHOT</code> should be for the Isis modules about to be released.</p> 
+        </div> 
+        <div class="admonitionblock tip"> 
+         <table> 
+          <tbody>
+           <tr> 
+            <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td> 
+            <td class="content"> 
+             <div class="paragraph"> 
+              <p>Obviously, don\u2019t update Apache Isis' <code>SNAPSHOT</code> references; these get updated by the <code>mvn release:prepare</code> command we run later.</p> 
+             </div> </td> 
+           </tr> 
+          </tbody>
+         </table> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_cgcom_cutting-a-release_releasing-core">3.4. Releasing Core</h3> 
+        <div class="paragraph"> 
+         <p>First, we release <code>core</code>. Switch to the appropriate directory:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="bash">cd core</code></pre> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_cgcom_cutting-a-release_releasing-core_set-environment-variables">3.4.1. Set environment variables</h4> 
+         <div class="paragraph"> 
+          <p>Set additional environment variables for the core "artifact":</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="bash">export ISISART=isis
+export ISISCOR="Y"
+
+env | grep ISIS | sort</code></pre> 
+          </div> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_cgcom_cutting-a-release_releasing-core_license-headers">3.4.2. License headers</h4> 
+         <div class="paragraph"> 
+          <p>The Apache Release Audit Tool <code>RAT</code> (from the <a href="http://creadur.apache.org">Apache Creadur</a> project) checks for missing license header files. The parent <code>pom.xml</code> of each releasable module specifies the RAT Maven plugin, with a number of custom exclusions.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>To run the RAT tool, use:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="bash">mvn org.apache.rat:apache-rat-plugin:check -D rat.numUnapprovedLicenses=50 -o &amp;&amp; \
 for a in `/bin/find . -name rat.txt -print`; do grep '!???' $a; done || \
-for a in `/bin/find . -name rat.txt -print`; do grep '!AL' $a; done</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>where <code>rat.numUnapprovedLicenses</code> property is set to a high figure, temporarily overriding the default value of 0. This will allow the command to run over all submodules, rather than failing after the first one.   The command writes out a <code>target\rat.txt</code> for each submodule.  missing license notes are indicated using the key <code>!???</code>.  The <code>for</code> command collates all the errors.</p>
-</div>
-<div class="paragraph">
-<p>Investigate and fix any reported violations, typically by either:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>adding genuinely missing license headers from Java (or other) source files, or</p>
-</li>
-<li>
-<p>updating the <code>&lt;excludes&gt;</code> element for the <code>apache-rat-plugin</code> plugin to ignore test files, log files and any other non-source code files</p>
-</li>
-<li>
-<p>also look to remove any stale <code>&lt;exclude&gt;</code> entries</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>To add missing headers, use the groovy script <code>addmissinglicenses.groovy</code> (in the <code>scripts</code> directory) to automatically insert missing headers for certain file types. The actual files checked are those with extensions specified in the line <code>def fileEndings = [&quot;.java&quot;, &quot;.htm&quot;]</code>:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">groovy ../scripts/addmissinglicenses.groovy -x</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>(If the <code>-x</code> is omitted then the script is run in "dry run" mode).  Once you&#8217;ve fixed all issues, confirm once more that <code>apache-rat-plugin</code> no longer reports any license violations, this time leaving the <code>rat.numUnapprovedLicenses</code> property to its default, 0:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">mvn org.apache.rat:apache-rat-plugin:check -D rat.numUnapprovedLicenses=0 -o &amp;&amp; \
-for a in `find . -name rat.txt -print`; do grep '!???' $a; done</code></pre>
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_cgcom_cutting-a-release_releasing-core_missing-license-check">3.4.3. Missing License Check</h4>
-<div class="paragraph">
-<p>Although Apache Isis has no dependencies on artifacts with incompatible licenses, the POMs for some of these dependencies (in the Maven central repo) do not necessarily contain the required license information. Without appropriate additional configuration, this would result in the generated <code>DEPENDENCIES</code> file and generated Maven site indicating dependencies as having "unknown" licenses.</p>
-</div>
-<div class="paragraph">
-<p>Fortunately, Maven allows the missing information to be provided by configuring the <code>maven-remote-resources-plugin</code>. This is stored in the <code>src/main/appended-resources/supplemental-models.xml</code> file, relative to the root of each releasable module.</p>
-</div>
-<div class="paragraph">
-<p>To capture the missing license information, use:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">mvn license:download-licenses &amp;&amp; \
-groovy ../scripts/checkmissinglicenses.groovy</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>The Maven plugin creates a <code>license.xml</code> file in the <code>target/generated-resources</code> directory of each module.  The script then searches for these <code>licenses.xml</code> files, and compares them against the contents of the <code>supplemental-models.xml</code> file.</p>
-</div>
-<div class="paragraph">
-<p>For example, the output could be something like:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">licenses to add to supplemental-models.xml:
+for a in `/bin/find . -name rat.txt -print`; do grep '!AL' $a; done</code></pre> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>where <code>rat.numUnapprovedLicenses</code> property is set to a high figure, temporarily overriding the default value of 0. This will allow the command to run over all submodules, rather than failing after the first one. The command writes out a <code>target\rat.txt</code> for each submodule. missing license notes are indicated using the key <code>!???</code>. The <code>for</code> command collates all the errors.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>Investigate and fix any reported violations, typically by either:</p> 
+         </div> 
+         <div class="ulist"> 
+          <ul> 
+           <li> <p>adding genuinely missing license headers from Java (or other) source files, or</p> </li> 
+           <li> <p>updating the <code>&lt;excludes&gt;</code> element for the <code>apache-rat-plugin</code> plugin to ignore test files, log files and any other non-source code files</p> </li> 
+           <li> <p>also look to remove any stale <code>&lt;exclude&gt;</code> entries</p> </li> 
+          </ul> 
+         </div> 
+         <div class="paragraph"> 
+          <p>To add missing headers, use the groovy script <code>addmissinglicenses.groovy</code> (in the <code>scripts</code> directory) to automatically insert missing headers for certain file types. The actual files checked are those with extensions specified in the line <code>def fileEndings = [".java", ".htm"]</code>:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="bash">groovy ../scripts/addmissinglicenses.groovy -x</code></pre> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>(If the <code>-x</code> is omitted then the script is run in "dry run" mode). Once you\u2019ve fixed all issues, confirm once more that <code>apache-rat-plugin</code> no longer reports any license violations, this time leaving the <code>rat.numUnapprovedLicenses</code> property to its default, 0:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="bash">mvn org.apache.rat:apache-rat-plugin:check -D rat.numUnapprovedLicenses=0 -o &amp;&amp; \
+for a in `find . -name rat.txt -print`; do grep '!???' $a; done</code></pre> 
+          </div> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_cgcom_cutting-a-release_releasing-core_missing-license-check">3.4.3. Missing License Check</h4> 
+         <div class="paragraph"> 
+          <p>Although Apache Isis has no dependencies on artifacts with incompatible licenses, the POMs for some of these dependencies (in the Maven central repo) do not necessarily contain the required license information. Without appropriate additional configuration, this would result in the generated <code>DEPENDENCIES</code> file and generated Maven site indicating dependencies as having "unknown" licenses.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>Fortunately, Maven allows the missing information to be provided by configuring the <code>maven-remote-resources-plugin</code>. This is stored in the <code>src/main/appended-resources/supplemental-models.xml</code> file, relative to the root of each releasable module.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>To capture the missing license information, use:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="bash">mvn license:download-licenses &amp;&amp; \
+groovy ../scripts/checkmissinglicenses.groovy</code></pre> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>The Maven plugin creates a <code>license.xml</code> file in the <code>target/generated-resources</code> directory of each module. The script then searches for these <code>licenses.xml</code> files, and compares them against the contents of the <code>supplemental-models.xml</code> file.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>For example, the output could be something like:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="bash">licenses to add to supplemental-models.xml:
 
 [org.slf4j, slf4j-api, 1.5.7]
 [org.codehaus.groovy, groovy-all, 1.7.2]
 
 licenses to remove from supplemental-models.xml (are spurious):
 
-[org.slf4j, slf4j-api, 1.5.2]</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>If any missing entries are listed or are spurious, then update <code>supplemental-models.xml</code> and try again.</p>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_cgcom_cutting-a-release_releasing-core_commit-changes">3.4.4. Commit changes</h4>
-<div class="paragraph">
-<p>Commit any changes from the preceding steps:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">git commit -am &quot;$ISISJIRA: updates to pom.xml etc for release&quot;</code></pre>
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_cgcom_cutting-a-release_releasing-core_sanity-check">3.4.5. Sanity check</h4>
-<div class="paragraph">
-<p>Perform one last sanity check on the codebase.  Delete all Isis artifacts from your local Maven repo, then build using the <code>-o</code> offline flag:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">rm -rf ~/.m2/repository/org/apache/isis
-mvn clean install -o</code></pre>
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_cgcom_cutting-a-release_releasing-core_release-prepare-dry-run">3.4.6. Release prepare "dry run"</h4>
-<div class="paragraph">
-<p>Most of the work is done using the <code>mvn release:prepare</code> goal.  Since this makes a lot of changes, we run it first in "dry run" mode; only if that works do we run the goal for real.</p>
-</div>
-<div class="paragraph">
-<p>Run the dry-run as follows:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">mvn release:prepare -P apache-release -D dryRun=true \
+[org.slf4j, slf4j-api, 1.5.2]</code></pre> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>If any missing entries are listed or are spurious, then update <code>supplemental-models.xml</code> and try again.</p> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_cgcom_cutting-a-release_releasing-core_commit-changes">3.4.4. Commit changes</h4> 
+         <div class="paragraph"> 
+          <p>Commit any changes from the preceding steps:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="bash">git commit -am "$ISISJIRA: updates to pom.xml etc for release"</code></pre> 
+          </div> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_cgcom_cutting-a-release_releasing-core_sanity-check">3.4.5. Sanity check</h4> 
+         <div class="paragraph"> 
+          <p>Perform one last sanity check on the codebase. Delete all Isis artifacts from your local Maven repo, then build using the <code>-o</code> offline flag:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="bash">rm -rf ~/.m2/repository/org/apache/isis
+mvn clean install -o</code></pre> 
+          </div> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_cgcom_cutting-a-release_releasing-core_release-prepare-dry-run">3.4.6. Release prepare "dry run"</h4> 
+         <div class="paragraph"> 
+          <p>Most of the work is done using the <code>mvn release:prepare</code> goal. Since this makes a lot of changes, we run it first in "dry run" mode; only if that works do we run the goal for real.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>Run the dry-run as follows:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="bash">mvn release:prepare -P apache-release -D dryRun=true \
     -DreleaseVersion=$ISISREL \
     -Dtag=$ISISART-$ISISREL \
-    -DdevelopmentVersion=$ISISDEV</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>You may be prompted for the gpg passphrase.</p>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>Experiments in using <code>--batch-mode -Dgpg.passphrase=&quot;&#8230;&#8203;&quot;</code> to fully automate this didn&#8217;t work; for more info, see <a href="http://maven.apache.org/plugins/maven-gpg-plugin/sign-mojo.html">here</a> (maven release plugin docs) and <a href="http://maven.apache.org/maven-release/maven-release-plugin/examples/non-interactive-release.html">here</a> (maven gpg plugin docs).</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_cgcom_cutting-a-release_releasing-core_release-prepare-proper">3.4.7. Release prepare "proper"</h4>
-<div class="paragraph">
-<p>Assuming this completes successfully, re-run the command, but without the <code>dryRun</code> flag and specifying <code>resume=false</code> (to ignore the generated <code>release.properties</code> file that gets generated as a side-effect of using <code>git</code>). You can also set the <code>skipTests</code> flag since they would have been run during the previous dry run:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">mvn release:prepare -P apache-release -D resume=false -DskipTests=true \
+    -DdevelopmentVersion=$ISISDEV</code></pre> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>You may be prompted for the gpg passphrase.</p> 
+         </div> 
+         <div class="admonitionblock note"> 
+          <table> 
+           <tbody>
+            <tr> 
+             <td class="icon"> <i class="fa icon-note" title="Note"></i> </td> 
+             <td class="content"> 
+              <div class="paragraph"> 
+               <p>Experiments in using <code>--batch-mode -Dgpg.passphrase="\u2026\u200b"</code> to fully automate this didn\u2019t work; for more info, see <a href="http://maven.apache.org/plugins/maven-gpg-plugin/sign-mojo.html">here</a> (maven release plugin docs) and <a href="http://maven.apache.org/maven-release/maven-release-plugin/examples/non-interactive-release.html">here</a> (maven gpg plugin docs).</p> 
+              </div> </td> 
+            </tr> 
+           </tbody>
+          </table> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_cgcom_cutting-a-release_releasing-core_release-prepare-proper">3.4.7. Release prepare "proper"</h4> 
+         <div class="paragraph"> 
+          <p>Assuming this completes successfully, re-run the command, but without the <code>dryRun</code> flag and specifying <code>resume=false</code> (to ignore the generated <code>release.properties</code> file that gets generated as a side-effect of using <code>git</code>). You can also set the <code>skipTests</code> flag since they would have been run during the previous dry run:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="bash">mvn release:prepare -P apache-release -D resume=false -DskipTests=true \
         -DreleaseVersion=$ISISREL \
         -Dtag=$ISISART-$ISISREL \
-        -DdevelopmentVersion=$ISISDEV</code></pre>
-</div>
-</div>
-<div class="admonitionblock tip">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-tip" title="Tip"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>If there are any snags at this stage, then explicitly delete the generated <code>release.properties</code> file first before trying again.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_cgcom_cutting-a-release_releasing-core_post-prepare-sanity-check">3.4.8. Post-prepare sanity check</h4>
-<div class="paragraph">
-<p>You should end up with artifacts in your local repo with the new version (eg <code>1.15.0</code>).  This is a good time to do some quick sanity checks; nothing has yet been uploaded:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>unzip the source-release ZIP and check it builds.</p>
-</li>
-<li>
-<p>Inspect the <code>DEPENDENCIES</code> file, and check it looks correct.</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>These steps can be performed using the following script:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code>rm -rf $ISISTMP/$ISISART-$ISISREL
+        -DdevelopmentVersion=$ISISDEV</code></pre> 
+          </div> 
+         </div> 
+         <div class="admonitionblock tip"> 
+          <table> 
+           <tbody>
+            <tr> 
+             <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td> 
+             <td class="content"> 
+              <div class="paragraph"> 
+               <p>If there are any snags at this stage, then explicitly delete the generated <code>release.properties</code> file first before trying again.</p> 
+              </div> </td> 
+            </tr> 
+           </tbody>
+          </table> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_cgcom_cutting-a-release_releasing-core_post-prepare-sanity-check">3.4.8. Post-prepare sanity check</h4> 
+         <div class="paragraph"> 
+          <p>You should end up with artifacts in your local repo with the new version (eg <code>1.15.0</code>). This is a good time to do some quick sanity checks; nothing has yet been uploaded:</p> 
+         </div> 
+         <div class="ulist"> 
+          <ul> 
+           <li> <p>unzip the source-release ZIP and check it builds.</p> </li> 
+           <li> <p>Inspect the <code>DEPENDENCIES</code> file, and check it looks correct.</p> </li> 
+          </ul> 
+         </div> 
+         <div class="paragraph"> 
+          <p>These steps can be performed using the following script:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code>rm -rf $ISISTMP/$ISISART-$ISISREL
 mkdir $ISISTMP/$ISISART-$ISISREL
 
 if [ "$ISISCOR" == "Y" ]; then
@@ -1148,308 +1031,285 @@ mvn clean install
 
 cat DEPENDENCIES
 
-popd</code></pre>
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_cgcom_cutting-a-release_releasing-core_release-perform-upload">3.4.9. Release perform (Upload)</h4>
-<div class="paragraph">
-<p>Once the release has been built locally, it should be uploaded for voting. This is done by deploying the Maven artifacts to a staging directory (this includes the source release ZIP file which will be voted upon).</p>
-</div>
-<div class="paragraph">
-<p>The Apache staging repository runs on Nexus server, hosted at <a href="https://repository.apache.org">repository.apache.org</a>. The process of uploading will create a staging repository that is associated with the host (IP address) performing the release. Once the repository is staged, the newly created staging repository is "closed" in order to make it available to others.</p>
-</div>
-<div class="paragraph">
-<p>Use:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">mvn release:perform -P apache-release \
-    -DworkingDirectory=$ISISTMP/$ISISART-$ISISREL/checkout</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>The custom <code>workingDirectory</code> prevents file path issues if releasing on Windows.  The command checks out the codebase from the tag, then builds the artifacts, then uploads them to the Apache staging repository:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">...
+popd</code></pre> 
+          </div> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_cgcom_cutting-a-release_releasing-core_release-perform-upload">3.4.9. Release perform (Upload)</h4> 
+         <div class="paragraph"> 
+          <p>Once the release has been built locally, it should be uploaded for voting. This is done by deploying the Maven artifacts to a staging directory (this includes the source release ZIP file which will be voted upon).</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>The Apache staging repository runs on Nexus server, hosted at <a href="https://repository.apache.org">repository.apache.org</a>. The process of uploading will create a staging repository that is associated with the host (IP address) performing the release. Once the repository is staged, the newly created staging repository is "closed" in order to make it available to others.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>Use:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="bash">mvn release:perform -P apache-release \
+    -DworkingDirectory=$ISISTMP/$ISISART-$ISISREL/checkout</code></pre> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>The custom <code>workingDirectory</code> prevents file path issues if releasing on Windows. The command checks out the codebase from the tag, then builds the artifacts, then uploads them to the Apache staging repository:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="bash">...
 [INFO] --- maven-release-plugin:2.3.2:perform (default-cli) @ isis ---
 [INFO] Performing a LOCAL checkout from scm:git:file:///C:\APACHE\isis-git-rw\co
 re
 [INFO] Checking out the project to perform the release ...
-[INFO] Executing: cmd.exe /X /C &quot;git clone --branch release-1.15.0 file:///C:\APACHE\isis-git-rw\core C:\APACHE\isis-git-rw\core\target\checkout&quot;
+[INFO] Executing: cmd.exe /X /C "git clone --branch release-1.15.0 file:///C:\APACHE\isis-git-rw\core C:\APACHE\isis-git-rw\core\target\checkout"
 [INFO] Working directory: C:\APACHE\isis-git-rw\core\target
 [INFO] Performing a LOCAL checkout from scm:git:file:///C:\APACHE\isis-git-rw
 [INFO] Checking out the project to perform the release ...
-[INFO] Executing: cmd.exe /X /C &quot;git clone --branch release-1.15.0 file:///C:\APACHE\isis-git-rw C:\APACHE\isis-git-rw\core\target\checkout&quot;
+[INFO] Executing: cmd.exe /X /C "git clone --branch release-1.15.0 file:///C:\APACHE\isis-git-rw C:\APACHE\isis-git-rw\core\target\checkout"
 [INFO] Working directory: C:\APACHE\isis-git-rw\core\target
-[INFO] Executing: cmd.exe /X /C &quot;git ls-remote file:///C:\APACHE\isis-git-rw&quot;
+[INFO] Executing: cmd.exe /X /C "git ls-remote file:///C:\APACHE\isis-git-rw"
 [INFO] Working directory: C:\Users\ADMINI~1\AppData\Local\Temp
-[INFO] Executing: cmd.exe /X /C &quot;git fetch file:///C:\APACHE\isis-git-rw&quot;
+[INFO] Executing: cmd.exe /X /C "git fetch file:///C:\APACHE\isis-git-rw"
 [INFO] Working directory: C:\APACHE\isis-git-rw\core\target\checkout
-[INFO] Executing: cmd.exe /X /C &quot;git checkout release-1.15.0&quot;
+[INFO] Executing: cmd.exe /X /C "git checkout release-1.15.0"
 [INFO] Working directory: C:\APACHE\isis-git-rw\core\target\checkout
-[INFO] Executing: cmd.exe /X /C &quot;git ls-files&quot;
+[INFO] Executing: cmd.exe /X /C "git ls-files"
 [INFO] Working directory: C:\APACHE\isis-git-rw\core\target\checkout
 [INFO] Invoking perform goals in directory C:\APACHE\isis-git-rw\core\target\checkout\core
 [INFO] Executing goals 'deploy'...
-...</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>You may (again) be prompted for gpg passphrase.  All being well this command will complete successfully. Given that it is uploading code artifacts, it could take a while to complete.</p>
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_cgcom_cutting-a-release_releasing-the-archetype">3.5. Releasing the Archetype</h3>
-<div class="paragraph">
-<p>Apache Isis archetypes are reverse engineered from example applications.
-Once reverse engineered, the source is checked into git (replacing any earlier version of the archetype) and released.</p>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>If releasing using Windows and Maven &gt;= 3.3.3, then there is an issue that requires a small workaround.</p>
-</div>
-<div class="paragraph">
-<p>In Maven 3.3.3 the <code>mvn.bat</code> file was removed, replaced instead with <code>mvn.cmd</code>.
-However, <code>maven-archetype-plugin:2.4</code> only uses <code>mvn.bat</code>; this causes the <code>archetype:create-from-project</code> goal to fail.
-The fix is to simple: just copy <code>mvn.cmd</code> to <code>mvn.bat</code>.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>Switch to the directory containing the <code>simpleapp</code> example:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">cd ../example/application/simpleapp</code></pre>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_cgcom_cutting-a-release_releasing-the-archetype_setup-environment-variables">3.5.1. Setup environment variables</h4>
-<div class="paragraph">
-<p>Set additional environment variables for the <code>simpleapp-archetype</code> artifact:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">export ISISART=simpleapp-archetype
+...</code></pre> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>You may (again) be prompted for gpg passphrase. All being well this command will complete successfully. Given that it is uploading code artifacts, it could take a while to complete.</p> 
+         </div> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_cgcom_cutting-a-release_releasing-the-archetype">3.5. Releasing the Archetype</h3> 
+        <div class="paragraph"> 
+         <p>Apache Isis archetypes are reverse engineered from example applications. Once reverse engineered, the source is checked into git (replacing any earlier version of the archetype) and released.</p> 
+        </div> 
+        <div class="admonitionblock note"> 
+         <table> 
+          <tbody>
+           <tr> 
+            <td class="icon"> <i class="fa icon-note" title="Note"></i> </td> 
+            <td class="content"> 
+             <div class="paragraph"> 
+              <p>If releasing using Windows and Maven &gt;= 3.3.3, then there is an issue that requires a small workaround.</p> 
+             </div> 
+             <div class="paragraph"> 
+              <p>In Maven 3.3.3 the <code>mvn.bat</code> file was removed, replaced instead with <code>mvn.cmd</code>. However, <code>maven-archetype-plugin:2.4</code> only uses <code>mvn.bat</code>; this causes the <code>archetype:create-from-project</code> goal to fail. The fix is to simple: just copy <code>mvn.cmd</code> to <code>mvn.bat</code>.</p> 
+             </div> </td> 
+           </tr> 
+          </tbody>
+         </table> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Switch to the directory containing the <code>simpleapp</code> example:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="bash">cd ../example/application/simpleapp</code></pre> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_cgcom_cutting-a-release_releasing-the-archetype_setup-environment-variables">3.5.1. Setup environment variables</h4> 
+         <div class="paragraph"> 
+          <p>Set additional environment variables for the <code>simpleapp-archetype</code> artifact:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="bash">export ISISART=simpleapp-archetype
 export ISISPAR=$ISISREL                 <i class="conum" data-value="1"></i><b>(1)</b>
 
 export ISISCPT=$(echo $ISISART | cut -d- -f2)
 export ISISCPN=$(echo $ISISART | cut -d- -f1)
 
-env | grep ISIS | sort</code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td><code>$ISISPAR</code> is the version of the Apache Isis core that will act as the archetype&#8217;s parent. Usually this is the same as <code>$ISISREL</code>.</td>
-</tr>
-</table>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_cgcom_cutting-a-release_releasing-the-archetype_check-the-example-app">3.5.2. Check the example app</h4>
-<div class="paragraph">
-<p>Update the parent <code>pom.xml</code> to reference the <em>released</em> version of Apache Isis core, eg:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="xml"><span class="tag">&lt;properties&gt;</span>
+env | grep ISIS | sort</code></pre> 
+          </div> 
+         </div> 
+         <div class="colist arabic"> 
+          <table> 
+           <tbody>
+            <tr> 
+             <td><i class="conum" data-value="1"></i><b>1</b></td> 
+             <td><code>$ISISPAR</code> is the version of the Apache Isis core that will act as the archetype\u2019s parent. Usually this is the same as <code>$ISISREL</code>.</td> 
+            </tr> 
+           </tbody>
+          </table> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_cgcom_cutting-a-release_releasing-the-archetype_check-the-example-app">3.5.2. Check the example app</h4> 
+         <div class="paragraph"> 
+          <p>Update the parent <code>pom.xml</code> to reference the <em>released</em> version of Apache Isis core, eg:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="xml"><span class="tag">&lt;properties&gt;</span>
     <span class="tag">&lt;isis.version&gt;</span>1.15.0<span class="tag">&lt;/isis.version&gt;</span>
     ...
-<span class="tag">&lt;/properties&gt;</span></code></pre>
-</div>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>Previously at this point we used to check for and fix any missing license header notices; however it doesn&#8217;t make sense for the archetype to include the Apache rat-plugin, so this has been removed.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>Finally, double check that the app</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>builds:</p>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">mvn clean install</code></pre>
-</div>
-</div>
-</li>
-<li>
-<p>can be run from an IDE</p>
-<div class="ulist">
-<ul>
-<li>
-<p>mainClass=<code>org.apache.isis.WebServer</code></p>
-</li>
-<li>
-<p>args=<code>-m domainapp.application.manifest.DomainAppAppManifestWithFixtures</code></p>
-</li>
-<li>
-<p>run before: <code>mvn -f pom-jdo-enhance-all.xml datanucleus:enhance -o</code> in the root module</p>
-</li>
-</ul>
-</div>
-</li>
-<li>
-<p>can be run using the mvn jetty plugin:</p>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">mvn -pl webapp jetty:run</code></pre>
-</div>
-</div>
-</li>
-<li>
-<p>can be packaged and run using the mvn jetty-console plugin:</p>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">mvn install -Dmavenmixin-jettyconsole
-mvn antrun:run -Dmavenmixin-jettyconsole</code></pre>
-</div>
-</div>
-</li>
-<li>
-<p>can be deployed as a WAR</p>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">cp webapp/target/simpleapp.war $CATALINA_HOME/webapps/ROOT.war
+<span class="tag">&lt;/properties&gt;</span></code></pre> 
+          </div> 
+         </div> 
+         <div class="admonitionblock note"> 
+          <table> 
+           <tbody>
+            <tr> 
+             <td class="icon"> <i class="fa icon-note" title="Note"></i> </td> 
+             <td class="content"> 
+              <div class="paragraph"> 
+               <p>Previously at this point we used to check for and fix any missing license header notices; however it doesn\u2019t make sense for the archetype to include the Apache rat-plugin, so this has been removed.</p> 
+              </div> </td> 
+            </tr> 
+           </tbody>
+          </table> 
+         </div> 
+         <div class="paragraph"> 
+          <p>Finally, double check that the app</p> 
+         </div> 
+         <div class="ulist"> 
+          <ul> 
+           <li> <p>builds:</p> 
+            <div class="listingblock"> 
+             <div class="content"> 
+              <pre class="CodeRay highlight"><code data-lang="bash">mvn clean install</code></pre> 
+             </div> 
+            </div> </li> 
+           <li> <p>can be run from an IDE</p> 
+            <div class="ulist"> 
+             <ul> 
+              <li> <p>mainClass=<code>org.apache.isis.WebServer</code></p> </li> 
+              <li> <p>args=<code>-m domainapp.application.manifest.DomainAppAppManifestWithFixtures</code></p> </li> 
+              <li> <p>run before: <code>mvn -f pom-jdo-enhance-all.xml datanucleus:enhance -o</code> in the root module</p> </li> 
+             </ul> 
+            </div> </li> 
+           <li> <p>can be run using the mvn jetty plugin:</p> 
+            <div class="listingblock"> 
+             <div class="content"> 
+              <pre class="CodeRay highlight"><code data-lang="bash">mvn -pl webapp jetty:run</code></pre> 
+             </div> 
+            </div> </li> 
+           <li> <p>can be packaged and run using the mvn jetty-console plugin:</p> 
+            <div class="listingblock"> 
+             <div class="content"> 
+              <pre class="CodeRay highlight"><code data-lang="bash">mvn install -Dmavenmixin-jettyconsole
+mvn antrun:run -Dmavenmixin-jettyconsole</code></pre> 
+             </div> 
+            </div> </li> 
+           <li> <p>can be deployed as a WAR</p> 
+            <div class="listingblock"> 
+             <div class="content"> 
+              <pre class="CodeRay highlight"><code data-lang="bash">cp webapp/target/simpleapp.war $CATALINA_HOME/webapps/ROOT.war
 pushd $CATALINA_HOME/bin
 sh startup.sh
-tail -f ../logs/catalina.out</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>quit using:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">sh shutdown.sh
-popd</code></pre>
-</div>
-</div>
-</li>
-<li>
-<p>can be packaged and run using Docker:</p>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">mvn install -Dmavenmixin-docker -D docker-plugin.imageName=test/simpleapp
-docker container run -p 8080:8080 -d test/simpleapp</code></pre>
-</div>
-</div>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>This too should be accessed at <a href="http://localhost:8080">localhost:8080</a>.</p>
-</div>
-<div class="admonitionblock tip">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-tip" title="Tip"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>The Kitematic UI tool is handy for viewing and interacting with running containers.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>In each case, check the about page and confirm has been built against non-SNAPSHOT versions of the Apache Isis jars.</p>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_cgcom_cutting-a-release_releasing-the-archetype_create-the-archetype">3.5.3. Create the archetype</h4>
-<div class="paragraph">
-<p>Make sure you are in the correct directory and environment variables are correct.</p>
-</div>
-<div class="paragraph">
-<p>To recreate the <strong>simpleapp</strong> archetype:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">cd example/application/simpleapp
-env | grep ISIS | sort</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Then, run the script:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">sh ../../../scripts/recreate-archetype.sh $ISISJIRA</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>The script automatically commits changes; if you wish use <code>git log</code> and
-<code>git diff</code> (or a tool such as SourceTree) to review changes made.</p>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_cgcom_cutting-a-release_releasing-the-archetype_release-prepare">3.5.4. Release prepare</h4>
-<div class="paragraph">
-<p>Switch to the <strong>archetype</strong> directory and execute the <code>release:prepare</code>:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code>cd ../../../example/archetype/$ISISCPN
+tail -f ../logs/catalina.out</code></pre> 
+             </div> 
+            </div> 
+            <div class="paragraph"> 
+             <p>quit using:</p> 
+            </div> 
+            <div class="listingblock"> 
+             <div class="content"> 
+              <pre class="CodeRay highlight"><code data-lang="bash">sh shutdown.sh
+popd</code></pre> 
+             </div> 
+            </div> </li> 
+           <li> <p>can be packaged and run using Docker:</p> 
+            <div class="listingblock"> 
+             <div class="content"> 
+              <pre class="CodeRay highlight"><code data-lang="bash">mvn install -Dmavenmixin-docker -D docker-plugin.imageName=test/simpleapp
+docker container run -p 8080:8080 -d test/simpleapp</code></pre> 
+             </div> 
+            </div> </li> 
+          </ul> 
+         </div> 
+         <div class="paragraph"> 
+          <p>This too should be accessed at <a href="http://localhost:8080">localhost:8080</a>.</p> 
+         </div> 
+         <div class="admonitionblock tip"> 
+          <table> 
+           <tbody>
+            <tr> 
+             <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td> 
+             <td class="content"> 
+              <div class="paragraph"> 
+               <p>The Kitematic UI tool is handy for viewing and interacting with running containers.</p> 
+              </div> </td> 
+            </tr> 
+           </tbody>
+          </table> 
+         </div> 
+         <div class="paragraph"> 
+          <p>In each case, check the about page and confirm has been built against non-SNAPSHOT versions of the Apache Isis jars.</p> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_cgcom_cutting-a-release_releasing-the-archetype_create-the-archetype">3.5.3. Create the archetype</h4> 
+         <div class="paragraph"> 
+          <p>Make sure you are in the correct directory and environment variables are correct.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>To recreate the <strong>simpleapp</strong> archetype:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="bash">cd example/application/simpleapp
+env | grep ISIS | sort</code></pre> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>Then, run the script:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="bash">sh ../../../scripts/recreate-archetype.sh $ISISJIRA</code></pre> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>The script automatically commits changes; if you wish use <code>git log</code> and <code>git diff</code> (or a tool such as SourceTree) to review changes made.</p> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_cgcom_cutting-a-release_releasing-the-archetype_release-prepare">3.5.4. Release prepare</h4> 
+         <div class="paragraph"> 
+          <p>Switch to the <strong>archetype</strong> directory and execute the <code>release:prepare</code>:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code>cd ../../../example/archetype/$ISISCPN
 rm -rf $ISISTMP/checkout
 mvn release:prepare -P apache-release \
                 -DreleaseVersion=$ISISREL \
                 -DdevelopmentVersion=$ISISDEV \
-                -Dtag=$ISISART-$ISISREL</code></pre>
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_cgcom_cutting-a-release_releasing-the-archetype_post-prepare-sanity-check">3.5.5. Post-prepare sanity check</h4>
-<div class="paragraph">
-<p>This is a good point to test the archetype; nothing has yet been uploaded.</p>
-</div>
-<div class="paragraph">
-<p><em>In a different session</em>, create a new app from the archetype.  First set up environment variables:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">export ISISTMP=/c/tmp    # or as required
+                -Dtag=$ISISART-$ISISREL</code></pre> 
+          </div> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_cgcom_cutting-a-release_releasing-the-archetype_post-prepare-sanity-check">3.5.5. Post-prepare sanity check</h4> 
+         <div class="paragraph"> 
+          <p>This is a good point to test the archetype; nothing has yet been uploaded.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p><em>In a different session</em>, create a new app from the archetype. First set up environment variables:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="bash">export ISISTMP=/c/tmp    # or as required
 export ISISCPN=simpleapp
-env | grep ISIS | sort</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Then generate a new app from the archetype:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">rm -rf $ISISTMP/test-$ISISCPN
+env | grep ISIS | sort</code></pre> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>Then generate a new app from the archetype:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="bash">rm -rf $ISISTMP/test-$ISISCPN
 
 mkdir $ISISTMP/test-$ISISCPN
 cd $ISISTMP/test-$ISISCPN
@@ -1458,181 +1318,179 @@ mvn archetype:generate  \
     -D groupId=com.mycompany \
     -D artifactId=myapp \
     -D archetypeGroupId=org.apache.isis.archetype \
-    -D archetypeArtifactId=$ISISCPN-archetype</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Build the newly generated app and test:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">cd myapp
+    -D archetypeArtifactId=$ISISCPN-archetype</code></pre> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>Build the newly generated app and test:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="bash">cd myapp
 mvn clean install -o
-mvn -pl webapp jetty:run              # runs as mvn jetty plugin</code></pre>
-</d

<TRUNCATED>

[14/44] isis-site git commit: ISIS-1594: provide an 'edit' button

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/guides/ugtst.pdf
----------------------------------------------------------------------
diff --git a/content/guides/ugtst.pdf b/content/guides/ugtst.pdf
index e0a2f09..242b553 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:20170219155351+00'00')
-/ModDate (D:20170219155351+00'00')
+/CreationDate (D:20170307234531+00'00')
+/ModDate (D:20170307234531+00'00')
 >>
 endobj
 2 0 obj
 << /Type /Catalog
 /Pages 3 0 R
 /Names 14 0 R
-/Outlines 367 0 R
-/PageLabels 400 0 R
+/Outlines 366 0 R
+/PageLabels 399 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 51
-/Kids [7 0 R 10 0 R 12 0 R 34 0 R 45 0 R 51 0 R 57 0 R 65 0 R 72 0 R 80 0 R 85 0 R 91 0 R 100 0 R 106 0 R 109 0 R 116 0 R 118 0 R 123 0 R 126 0 R 134 0 R 139 0 R 143 0 R 145 0 R 149 0 R 154 0 R 165 0 R 170 0 R 175 0 R 178 0 R 184 0 R 198 0 R 204 0 R 212 0 R 217 0 R 229 0 R 231 0 R 236 0 R 243 0 R 248 0 R 252 0 R 257 0 R 262 0 R 266 0 R 269 0 R 271 0 R 273 0 R 278 0 R 285 0 R 292 0 R 297 0 R 302 0 R]
+/Kids [7 0 R 10 0 R 12 0 R 34 0 R 45 0 R 51 0 R 56 0 R 64 0 R 71 0 R 79 0 R 84 0 R 90 0 R 99 0 R 105 0 R 108 0 R 115 0 R 117 0 R 122 0 R 125 0 R 133 0 R 138 0 R 142 0 R 144 0 R 148 0 R 153 0 R 164 0 R 169 0 R 174 0 R 177 0 R 183 0 R 197 0 R 203 0 R 211 0 R 216 0 R 228 0 R 230 0 R 235 0 R 242 0 R 247 0 R 251 0 R 256 0 R 261 0 R 265 0 R 268 0 R 270 0 R 272 0 R 277 0 R 284 0 R 291 0 R 296 0 R 301 0 R]
 >>
 endobj
 4 0 obj
@@ -78,13 +78,13 @@ endobj
 endobj
 8 0 obj
 << /Type /Font
-/BaseFont /AAAAEG+NotoSerif
+/BaseFont /AAAADT+NotoSerif
 /Subtype /TrueType
-/FontDescriptor 402 0 R
+/FontDescriptor 401 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 404 0 R
-/ToUnicode 403 0 R
+/Widths 403 0 R
+/ToUnicode 402 0 R
 >>
 endobj
 9 0 obj
@@ -1353,7 +1353,7 @@ endobj
 /F6.0 43 0 R
 >>
 >>
-/Annots [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 357 0 R 358 0 R 359 0 R 360 0 R 361 0 R 362 0 R 363 0 R 364 0 R 365 0 R]
+/Annots [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 357 0 R 358 0 R 359 0 R 360 0 R 361 0 R 362 0 R 363 0 R 364 0 R]
 >>
 endobj
 11 0 obj
@@ -1986,7 +1986,7 @@ endobj
 /Font << /F2.0 16 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 366 0 R
+/XObject << /Stamp1 365 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 31 0 R 32 0 R]
@@ -2001,18 +2001,18 @@ endobj
 >>
 endobj
 15 0 obj
-<< /Kids [111 0 R 180 0 R 112 0 R]
+<< /Kids [110 0 R 179 0 R 111 0 R]
 >>
 endobj
 16 0 obj
 << /Type /Font
-/BaseFont /AAAAEH+NotoSerif-Bold
+/BaseFont /AAAADU+NotoSerif-Bold
 /Subtype /TrueType
-/FontDescriptor 406 0 R
+/FontDescriptor 405 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 408 0 R
-/ToUnicode 407 0 R
+/Widths 407 0 R
+/ToUnicode 406 0 R
 >>
 endobj
 17 0 obj
@@ -2820,7 +2820,7 @@ endobj
 /F5.0 40 0 R
 /F6.0 43 0 R
 >>
-/XObject << /Stamp1 366 0 R
+/XObject << /Stamp1 365 0 R
 >>
 >>
 /Annots [41 0 R]
@@ -2834,24 +2834,24 @@ endobj
 endobj
 37 0 obj
 << /Type /Font
-/BaseFont /AAAAEI+FontAwesome
+/BaseFont /AAAADV+FontAwesome
 /Subtype /TrueType
-/FontDescriptor 410 0 R
+/FontDescriptor 409 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 412 0 R
-/ToUnicode 411 0 R
+/Widths 411 0 R
+/ToUnicode 410 0 R
 >>
 endobj
 38 0 obj
 << /Type /Font
-/BaseFont /AAAAEJ+NotoSerif-BoldItalic
+/BaseFont /AAAADW+NotoSerif-BoldItalic
 /Subtype /TrueType
-/FontDescriptor 414 0 R
+/FontDescriptor 413 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 416 0 R
-/ToUnicode 415 0 R
+/Widths 415 0 R
+/ToUnicode 414 0 R
 >>
 endobj
 39 0 obj
@@ -2859,13 +2859,13 @@ endobj
 endobj
 40 0 obj
 << /Type /Font
-/BaseFont /AAAAEK+NotoSerif-Italic
+/BaseFont /AAAADX+NotoSerif-Italic
 /Subtype /TrueType
-/FontDescriptor 418 0 R
+/FontDescriptor 417 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 420 0 R
-/ToUnicode 419 0 R
+/Widths 419 0 R
+/ToUnicode 418 0 R
 >>
 endobj
 41 0 obj
@@ -2884,13 +2884,13 @@ endobj
 endobj
 43 0 obj
 << /Type /Font
-/BaseFont /AAAAEL+mplus1mn-regular
+/BaseFont /AAAADY+mplus1mn-regular
 /Subtype /TrueType
-/FontDescriptor 422 0 R
+/FontDescriptor 421 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 424 0 R
-/ToUnicode 423 0 R
+/Widths 423 0 R
+/ToUnicode 422 0 R
 >>
 endobj
 44 0 obj
@@ -3288,8 +3288,8 @@ f
 h
 S
 Q
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 59.24 158.1111494903738 Td
@@ -3310,8 +3310,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 97.74000000000001 158.1111494903738 Td
@@ -3332,8 +3332,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 136.24 158.1111494903738 Td
@@ -3493,7 +3493,7 @@ endobj
 /F2.0 16 0 R
 >>
 /XObject << /I1 48 0 R
-/Stamp1 366 0 R
+/Stamp1 365 0 R
 >>
 >>
 /Annots [46 0 R 47 0 R]
@@ -3602,7 +3602,7 @@ endobj
 [45 0 R /XYZ 0 308.13614949037384 null]
 endobj
 50 0 obj
-<< /Length 16564
+<< /Length 17092
 >>
 stream
 q
@@ -3646,12 +3646,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24 756.035 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -3668,12 +3668,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 756.035 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <766f6964> Tj
 ET
 
@@ -3690,12 +3690,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.400 0.733 scn
-0.000 0.400 0.733 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 125.24000000000001 756.035 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <736574437573746f6d65725265706f7369746f7279> Tj
 ET
 
@@ -3795,7 +3795,29 @@ ET
 BT
 422.24 756.035 Td
 /F6.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+427.74 756.035 Td
+/F6.0 11 Tf
+<2e> 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
+433.24 756.035 Td
+/F6.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3860,12 +3882,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24 679.515 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -3882,12 +3904,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 679.515 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <766f6964> Tj
 ET
 
@@ -3904,12 +3926,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.400 0.733 scn
-0.000 0.400 0.733 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 125.24000000000001 679.515 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <696e6a656374437573746f6d65725265706f7369746f7279> Tj
 ET
 
@@ -4009,7 +4031,29 @@ ET
 BT
 438.74 679.515 Td
 /F6.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+444.24 679.515 Td
+/F6.0 11 Tf
+<2e> 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
+449.74 679.515 Td
+/F6.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4550,35 +4594,23 @@ endobj
 /Contents 50 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
-/F7.0 52 0 R
 /F6.0 43 0 R
 /F3.1 37 0 R
 /F2.0 16 0 R
 >>
-/XObject << /Stamp1 366 0 R
+/XObject << /Stamp1 365 0 R
 >>
 >>
-/Annots [55 0 R]
+/Annots [54 0 R]
 >>
 endobj
 52 0 obj
-<< /Type /Font
-/BaseFont /AAAAEM+mplus1mn-bold
-/Subtype /TrueType
-/FontDescriptor 426 0 R
-/FirstChar 32
-/LastChar 255
-/Widths 428 0 R
-/ToUnicode 427 0 R
->>
-endobj
-53 0 obj
 [51 0 R /XYZ 0 586.26 null]
 endobj
-54 0 obj
+53 0 obj
 [51 0 R /XYZ 0 241.26000000000016 null]
 endobj
-55 0 obj
+54 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -4589,7 +4621,7 @@ endobj
 /Type /Annot
 >>
 endobj
-56 0 obj
+55 0 obj
 << /Length 11197
 >>
 stream
@@ -5114,26 +5146,26 @@ Q
 
 endstream
 endobj
-57 0 obj
+56 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 56 0 R
+/Contents 55 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F2.0 16 0 R
 /F3.1 37 0 R
 >>
-/XObject << /Stamp1 366 0 R
+/XObject << /Stamp1 365 0 R
 >>
 >>
-/Annots [59 0 R 61 0 R 62 0 R 63 0 R]
+/Annots [58 0 R 60 0 R 61 0 R 62 0 R]
 >>
 endobj
-58 0 obj
-[57 0 R /XYZ 0 778.86 null]
+57 0 obj
+[56 0 R /XYZ 0 778.86 null]
 endobj
-59 0 obj
+58 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -5144,10 +5176,10 @@ endobj
 /Type /Annot
 >>
 endobj
-60 0 obj
-[57 0 R /XYZ 0 418.3000000000002 null]
+59 0 obj
+[56 0 R /XYZ 0 418.3000000000002 null]
 endobj
-61 0 obj
+60 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -5158,7 +5190,7 @@ endobj
 /Type /Annot
 >>
 endobj
-62 0 obj
+61 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -5169,7 +5201,7 @@ endobj
 /Type /Annot
 >>
 endobj
-63 0 obj
+62 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -5180,8 +5212,8 @@ endobj
 /Type /Annot
 >>
 endobj
-64 0 obj
-<< /Length 22063
+63 0 obj
+<< /Length 23527
 >>
 stream
 q
@@ -5515,12 +5547,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24 478.9650000000003 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -5537,12 +5569,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 478.9650000000003 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -5559,12 +5591,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 478.9650000000003 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <4465706172746d656e74> Tj
 ET
 
@@ -5603,12 +5635,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 464.2250000000003 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <70726976617465> Tj
 ET
 
@@ -5625,8 +5657,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 125.24000000000001 464.2250000000003 Td
@@ -5724,12 +5756,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 301.24 464.2250000000003 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <6e6577> Tj
 ET
 
@@ -5746,8 +5778,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 323.24 464.2250000000003 Td
@@ -5785,7 +5817,40 @@ ET
 BT
 411.24 464.2250000000003 Td
 /F6.0 11 Tf
-<3e28293b> Tj
+<3e> 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
+416.74 464.2250000000003 Td
+/F6.0 11 Tf
+<28> 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
+422.24 464.2250000000003 Td
+/F6.0 11 Tf
+<29> 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
+427.74 464.2250000000003 Td
+/F6.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5807,7 +5872,29 @@ ET
 BT
 81.24000000000001 449.4850000000003 Td
 /F6.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+86.74000000000001 449.4850000000003 Td
+/F6.0 11 Tf
+<2e> 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
+92.24000000000001 449.4850000000003 Td
+/F6.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5861,12 +5948,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24 358.2250000000003 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -5883,12 +5970,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 358.2250000000003 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -5905,12 +5992,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 358.2250000000003 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <536f6d65446f6d61696e4f626a656374> Tj
 ET
 
@@ -5949,12 +6036,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 343.4850000000003 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <70726976617465> Tj
 ET
 
@@ -5971,8 +6058,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 125.24000000000001 343.4850000000003 Td
@@ -6070,12 +6157,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 273.74 343.4850000000003 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <6e6577> Tj
 ET
 
@@ -6092,8 +6179,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 295.74 343.4850000000003 Td
@@ -6131,7 +6218,40 @@ ET
 BT
 394.74 343.4850000000003 Td
 /F6.0 11 Tf
-<3e28293b> Tj
+<3e> 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
+400.24 343.4850000000003 Td
+/F6.0 11 Tf
+<28> 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
+405.74 343.4850000000003 Td
+/F6.0 11 Tf
+<29> 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
+411.24 343.4850000000003 Td
+/F6.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6153,7 +6273,29 @@ ET
 BT
 81.24000000000001 328.7450000000003 Td
 /F6.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+86.74000000000001 328.7450000000003 Td
+/F6.0 11 Tf
+<2e> 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
+92.24000000000001 328.7450000000003 Td
+/F6.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6623,30 +6765,29 @@ Q
 
 endstream
 endobj
-65 0 obj
+64 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 64 0 R
+/Contents 63 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 16 0 R
 /F1.0 8 0 R
 /F6.0 43 0 R
-/F7.0 52 0 R
 >>
-/XObject << /Stamp1 366 0 R
+/XObject << /Stamp1 365 0 R
 >>
 >>
-/Annots [68 0 R 70 0 R]
+/Annots [67 0 R 69 0 R]
 >>
 endobj
+65 0 obj
+[64 0 R /XYZ 0 841.89 null]
+endobj
 66 0 obj
-[65 0 R /XYZ 0 841.89 null]
+[64 0 R /XYZ 0 721.6100000000001 null]
 endobj
 67 0 obj
-[65 0 R /XYZ 0 721.6100000000001 null]
-endobj
-68 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -6657,10 +6798,10 @@ endobj
 /Type /Annot
 >>
 endobj
-69 0 obj
-[65 0 R /XYZ 0 622.1900000000002 null]
+68 0 obj
+[64 0 R /XYZ 0 622.1900000000002 null]
 endobj
-70 0 obj
+69 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -6671,8 +6812,8 @@ endobj
 /Type /Annot
 >>
 endobj
-71 0 obj
-<< /Length 28324
+70 0 obj
+<< /Length 30742
 >>
 stream
 q
@@ -6727,12 +6868,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24 728.255 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -6749,12 +6890,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 728.255 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -6771,12 +6912,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 728.255 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <536f7274656453657473436f6e747261637454657374416c6c> Tj
 ET
 
@@ -6793,12 +6934,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 273.74 728.255 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <657874656e6473> Tj
 ET
 
@@ -6859,12 +7000,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 698.7750000000001 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -6898,7 +7039,18 @@ ET
 BT
 257.24 698.7750000000001 Td
 /F6.0 11 Tf
-<2829> Tj
+<28> 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
+262.74 698.7750000000001 Td
+/F6.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6936,12 +7088,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 103.24000000000001 684.0350000000001 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <7375706572> Tj
 ET
 
@@ -6958,13 +7110,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 136.24 684.0350000000001 Td
 /F6.0 11 Tf
-<226f72672e6573746174696f2e646f6d22> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+141.74 684.0350000000001 Td
+/F6.0 11 Tf
+<6f72672e6573746174696f2e646f6d> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+224.24 684.0350000000001 Td
+/F6.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6975,7 +7149,18 @@ ET
 BT
 229.74 684.0350000000001 Td
 /F6.0 11 Tf
-<293b> Tj
+<29> 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
+235.24 684.0350000000001 Td
+/F6.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7013,8 +7198,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 180.24 669.2950000000001 Td
@@ -7035,8 +7220,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 218.74 669.2950000000001 Td
@@ -7052,7 +7237,18 @@ ET
 BT
 235.24 669.2950000000001 Td
 /F6.0 11 Tf
-<293b> Tj
+<29> 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
+240.74 669.2950000000001 Td
+/F6.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7567,12 +7763,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24000000000001 343.9950000000003 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -7589,12 +7785,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 343.9950000000003 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -7611,12 +7807,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 343.9950000000003 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <4269646972656374696f6e616c52656c6174696f6e73686970436f6e747261637454657374416c6c> Tj
 ET
 
@@ -7633,12 +7829,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 103.24000000000001 329.2550000000003 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <657874656e6473> Tj
 ET
 
@@ -7699,12 +7895,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 299.77500000000026 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -7738,7 +7934,18 @@ ET
 BT
 339.74 299.77500000000026 Td
 /F6.0 11 Tf
-<2829> Tj
+<28> 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
+345.24 299.77500000000026 Td
+/F6.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7776,12 +7983,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 103.24000000000001 285.03500000000025 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <7375706572> Tj
 ET
 
@@ -7798,13 +8005,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 136.24 285.03500000000025 Td
 /F6.0 11 Tf
-<226f72672e6170616368652e697369732e636f72652e756e697474657374737570706f72742e626964697222> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+141.74 285.03500000000025 Td
+/F6.0 11 Tf
+<6f72672e6170616368652e697369732e636f72652e756e697474657374737570706f72742e6269646972> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+372.74 285.03500000000025 Td
+/F6.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7848,7 +8077,7 @@ ET
 BT
 213.24 270.2950000000003 Td
 /F6.0 11 Tf
-<2e3c> Tj
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7857,6 +8086,17 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
+218.74 270.2950000000003 Td
+/F6.0 11 Tf
+<3c> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
+
+BT
 224.24 270.2950000000003 Td
 /F6.0 11 Tf
 <436c617373> Tj
@@ -7870,7 +8110,40 @@ ET
 BT
 251.74 270.2950000000003 Td
 /F6.0 11 Tf
-<3c3f3e2c> Tj
+<3c> 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
+257.24 270.2950000000003 Td
+/F6.0 11 Tf
+<3f> 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
+262.74 270.2950000000003 Td
+/F6.0 11 Tf
+<3e> 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
+268.24 270.2950000000003 Td
+/F6.0 11 Tf
+<2c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7952,8 +8225,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 268.24 255.5550000000003 Td
@@ -7985,12 +8258,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 306.74 255.5550000000003 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <6e6577> Tj
 ET
 
@@ -8024,7 +8297,29 @@ ET
 BT
 504.74 255.5550000000003 Td
 /F6.0 11 Tf
-<28292c> Tj
+<28> 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
+510.24 255.5550000000003 Td
+/F6.0 11 Tf
+<29> 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
+515.74 255.5550000000003 Td
+/F6.0 11 Tf
+<2c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -8062,8 +8357,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 262.74 240.81500000000028 Td
@@ -8095,12 +8390,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 301.24 240.81500000000028 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <6e6577> Tj
 ET
 
@@ -8161,8 +8456,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 213.24 226.07500000000027 Td
@@ -8200,7 +8495,29 @@ ET
 BT
 147.24 211.3350000000003 Td
 /F6.0 11 Tf
-<29293b> Tj
+<29> 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
+152.74 211.3350000000003 Td
+/F6.0 11 Tf
+<29> 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
+158.24 211.3350000000003 Td
+/F6.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -8238,8 +8555,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 180.24 196.59500000000028 Td
@@ -8260,8 +8577,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 218.74 196.59500000000028 Td
@@ -8277,7 +8594,18 @@ ET
 BT
 235.24 196.59500000000028 Td
 /F6.0 11 Tf
-<293b> Tj
+<29> 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
+240.74 196.59500000000028 Td
+/F6.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -8522,28 +8850,27 @@ Q
 
 endstream
 endobj
-72 0 obj
+71 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 71 0 R
+/Contents 70 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
-/F7.0 52 0 R
 /F6.0 43 0 R
 /F2.0 16 0 R
 /F3.1 37 0 R
 >>
-/XObject << /Stamp1 366 0 R
+/XObject << /Stamp1 365 0 R
 >>
 >>
-/Annots [74 0 R 75 0 R 76 0 R 77 0 R 78 0 R]
+/Annots [73 0 R 74 0 R 75 0 R 76 0 R 77 0 R]
 >>
 endobj
-73 0 obj
-[72 0 R /XYZ 0 613.9000000000001 null]
+72 0 obj
+[71 0 R /XYZ 0 613.9000000000001 null]
 endobj
-74 0 obj
+73 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -8554,7 +8881,7 @@ endobj
 /Type /Annot
 >>
 endobj
-75 0 obj
+74 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -8565,7 +8892,7 @@ endobj
 /Type /Annot
 >>
 endobj
-76 0 obj
+75 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -8576,7 +8903,7 @@ endobj
 /Type /Annot
 >>
 endobj
-77 0 obj
+76 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -8587,7 +8914,7 @@ endobj
 /Type /Annot
 >>
 endobj
-78 0 obj
+77 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -8598,8 +8925,8 @@ endobj
 /Type /Annot
 >>
 endobj
-79 0 obj
-<< /Length 23221
+78 0 obj
+<< /Length 23936
 >>
 stream
 q
@@ -9027,12 +9354,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24 516.9550000000002 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -9049,12 +9376,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 97.74000000000001 516.9550000000002 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <6162737472616374> Tj
 ET
 
@@ -9071,12 +9398,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 147.24 516.9550000000002 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -9093,12 +9420,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 180.24 516.9550000000002 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <4573746174696f446f6d61696e4f626a656374> Tj
 ET
 
@@ -9137,8 +9464,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 502.2150000000002 Td
@@ -9159,8 +9486,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 119.74000000000001 502.2150000000002 Td
@@ -9181,8 +9508,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 158.24 502.2150000000002 Td
@@ -9203,12 +9530,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 487.4750000000002 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <70726f746563746564> Tj
 ET
 
@@ -9418,7 +9745,7 @@ ET
 
 BT
 338.5999053485577 375.51600000000013 Td
-/F8.0 10.5 Tf
+/F7.0 10.5 Tf
 <c9> Tj
 ET
 
@@ -9713,12 +10040,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24000000000001 182.41500000000013 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -9735,12 +10062,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 182.41500000000013 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -9757,12 +10084,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 182.41500000000013 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <496e6a656374536572766963654d6574686f644d757374426546696e616c436f6e747261637454657374416c6c> Tj
 ET
 
@@ -9779,12 +10106,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 383.74 182.41500000000013 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <657874656e6473> Tj
 ET
 
@@ -9843,12 +10170,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 138.19500000000014 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -9882,7 +10209,18 @@ ET
 BT
 367.24 138.19500000000014 Td
 /F6.0 11 Tf
-<2829> Tj
+<28> 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
+372.74 138.19500000000014 Td
+/F6.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9920,12 +10258,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 103.24000000000001 123.45500000000014 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <7375706572> Tj
 ET
 
@@ -9942,13 +10280,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 136.24 123.45500000000014 Td
 /F6.0 11 Tf
-<226f72672e6573746174696f2e646f6d22> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+141.74 123.45500000000014 Td
+/F6.0 11 Tf
+<6f72672e6573746174696f2e646f6d> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+224.24 123.45500000000014 Td
+/F6.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9959,7 +10319,18 @@ ET
 BT
 229.74 123.45500000000014 Td
 /F6.0 11 Tf
-<293b> Tj
+<29> 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
+235.24 123.45500000000014 Td
+/F6.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9997,8 +10368,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 180.24 108.71500000000015 Td
@@ -10019,8 +10390,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 218.74 108.71500000000015 Td
@@ -10036,7 +10407,18 @@ ET
 BT
 235.24 108.71500000000015 Td
 /F6.0 11 Tf
-<293b> Tj
+<29> 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
+240.74 108.71500000000015 Td
+/F6.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -10098,26 +10480,25 @@ Q
 
 endstream
 endobj
-80 0 obj
+79 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 79 0 R
+/Contents 78 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F6.0 43 0 R
 /F1.0 8 0 R
 /F2.0 16 0 R
-/F7.0 52 0 R
-/F8.0 83 0 R
+/F7.0 82 0 R
 /F3.1 37 0 R
 >>
-/XObject << /Stamp1 366 0 R
+/XObject << /Stamp1 365 0 R
 >>
 >>
-/Annots [81 0 R]
+/Annots [80 0 R]
 >>
 endobj
-81 0 obj
+80 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -10128,22 +10509,22 @@ endobj
 /Type /Annot
 >>
 endobj
-82 0 obj
-[80 0 R /XYZ 0 616.62 null]
+81 0 obj
+[79 0 R /XYZ 0 616.62 null]
 endobj
-83 0 obj
+82 0 obj
 << /Type /Font
-/BaseFont /AAAAEN+mplus-1p-regular
+/BaseFont /AAAADZ+mplus-1p-regular
 /Subtype /TrueType
-/FontDescriptor 430 0 R
+/FontDescriptor 425 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 432 0 R
-/ToUnicode 431 0 R
+/Widths 427 0 R
+/ToUnicode 426 0 R
 >>
 endobj
-84 0 obj
-<< /Length 20014
+83 0 obj
+<< /Length 21860
 >>
 stream
 q
@@ -10309,12 +10690,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24 683.2450000000001 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -10331,12 +10712,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 683.2450000000001 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -10353,12 +10734,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 683.2450000000001 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <56616c756554797065436f6e74726163745465737441627374726163745f426967496e746567657254657374> Tj
 ET
 
@@ -10375,12 +10756,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 378.24 683.2450000000001 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <657874656e6473> Tj
 ET
 
@@ -10417,8 +10798,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 224.24 668.5050000000001 Td
@@ -10472,8 +10853,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 639.0250000000002 Td
@@ -10494,12 +10875,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 624.2850000000002 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <70726f746563746564> Tj
 ET
 
@@ -10516,8 +10897,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 136.24 624.2850000000002 Td
@@ -10538,8 +10919,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 163.74 624.2850000000002 Td
@@ -10588,7 +10969,18 @@ ET
 BT
 356.24 624.2850000000002 Td
 /F6.0 11 Tf
-<2829> Tj
+<28> 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
+361.74 624.2850000000002 Td
+/F6.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -10626,12 +11018,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 103.24000000000001 609.5450000000002 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <72657475726e> Tj
 ET
 
@@ -10648,8 +11040,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 141.74 609.5450000000002 Td
@@ -10670,8 +11062,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 180.24 609.5450000000002 Td
@@ -10692,12 +11084,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 218.74 609.5450000000002 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <6e6577> Tj
 ET
 
@@ -10714,8 +11106,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 240.74 609.5450000000002 Td
@@ -10736,13 +11128,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 301.24 609.5450000000002 Td
 /F6.0 11 Tf
-<223122> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+306.74 609.5450000000002 Td
+/F6.0 11 Tf
+<31> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+312.24 609.5450000000002 Td
+/F6.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -10753,7 +11167,18 @@ ET
 BT
 317.74 609.5450000000002 Td
 /F6.0 11 Tf
-<292c> Tj
+<29> 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
+323.24 609.5450000000002 Td
+/F6.0 11 Tf
+<2c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -10769,12 +11194,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 334.24 609.5450000000002 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <6e6577> Tj
 ET
 
@@ -10791,8 +11216,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 356.24 609.5450000000002 Td
@@ -10813,13 +11238,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 416.74 609.5450000000002 Td
 /F6.0 11 Tf
-<223122> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+422.24 609.5450000000002 Td
+/F6.0 11 Tf
+<31> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+427.74 609.5450000000002 Td
+/F6.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -10830,7 +11277,29 @@ ET
 BT
 433.24 609.5450000000002 Td
 /F6.0 11 Tf
-<29293b> Tj
+<29> 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
+438.74 609.5450000000002 Td
+/F6.0 11 Tf
+<29> 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
+444.24 609.5450000000002 Td
+/F6.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -10868,8 +11337,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 565.3250000000002 Td
@@ -10890,12 +11359,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 550.5850000000002 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <70726f746563746564> Tj
 ET
 
@@ -10912,8 +11381,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 136.24 550.5850000000002 Td
@@ -10934,8 +11403,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 163.74 550.5850000000002 Td
@@ -10984,7 +11453,18 @@ ET
 BT
 383.74 550.5850000000002 Td
 /F6.0 11 Tf
-<2829> Tj
+<28> 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
+389.24 550.5850000000002 Td
+/F6.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -11022,12 +11502,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 103.24000000000001 535.8450000000001 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <72657475726e> Tj
 ET
 
@@ -11044,8 +11524,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 141.74 535.8450000000001 Td
@@ -11066,8 +11546,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 180.24 535.8450000000001 Td
@@ -11088,12 +11568,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 218.74 535.8450000000001 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <6e6577> Tj
 ET
 
@@ -11110,8 +11590,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 240.74 535.8450000000001 Td
@@ -11132,13 +11612,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 301.24 535.8450000000001 Td
 /F6.0 11 Tf
-<223222> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+306.74 535.8450000000001 Td
+/F6.0 11 Tf
+<32> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+312.24 535.8450000000001 Td
+/F6.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -11149,7 +11651,29 @@ ET
 BT
 317.74 535.8450000000001 Td
 /F6.0 11 Tf
-<29293b> Tj
+<29> 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
+323.24 535.8450000000001 Td
+/F6.0 11 Tf
+<29> 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
+328.74 535.8450000000001 Td
+/F6.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -11485,27 +12009,26 @@ Q
 
 endstream
 endobj
-85 0 obj
+84 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 84 0 R
+/Contents 83 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 16 0 R
 /F1.0 8 0 R
 /F6.0 43 0 R
-/F7.0 52 0 R
 >>
-/XObject << /Stamp1 366 0 R
+/XObject << /Stamp1 365 0 R
 >>
 >>
-/Annots [87 0 R 89 0 R]
+/Annots [86 0 R 88 0 R]
 >>
 endobj
-86 0 obj
-[85 0 R /XYZ 0 841.89 null]
+85 0 obj
+[84 0 R /XYZ 0 841.89 null]
 endobj
-87 0 obj
+86 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -11516,10 +12039,10 @@ endobj
 /Type /Annot
 >>
 endobj
-88 0 obj
-[85 0 R /XYZ 0 452.6700000000002 null]
+87 0 obj
+[84 0 R /XYZ 0 452.6700000000002 null]
 endobj
-89 0 obj
+88 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -11530,8 +12053,8 @@ endobj
 /Type /Annot
 >>
 endobj
-90 0 obj
-<< /Length 23100
+89 0 obj
+<< /Length 24094
 >>
 stream
 q
@@ -11716,7 +12239,7 @@ ET
 
 BT
 519.29 663.466 Td
-/F8.0 10.5 Tf
+/F7.0 10.5 Tf
 <c9> Tj
 ET
 
@@ -12024,12 +12547,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24000000000001 474.3650000000001 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -12046,12 +12569,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 474.3650000000001 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -12068,12 +12591,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 474.3650000000001 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <4a556e697452756c654d6f636b65727932546573745f6175746f576972696e675f736574746572496e6a656374696f6e5f686170707943617365> Tj
 ET
 
@@ -12112,8 +12635,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 444.8850000000001 Td
@@ -12134,12 +12657,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 430.1450000000001 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -12244,8 +12767,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 372.74 430.1450000000001 Td
@@ -12288,8 +12811,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 64.74000000000001 415.4050000000001 Td
@@ -12305,7 +12828,18 @@ ET
 BT
 185.74 415.4050000000001 Td
 /F6.0 11 Tf
-<293b> Tj
+<29> 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
+191.24 415.4050000000001 Td
+/F6.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -12321,8 +12855,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 385.9250000000001 Td
@@ -12343,12 +12877,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 371.1850000000001 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <70726976617465> Tj
 ET
 
@@ -12420,8 +12954,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 341.70500000000015 Td
@@ -12442,12 +12976,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 326.96500000000015 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <70726976617465> Tj
 ET
 
@@ -12519,8 +13053,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 297.4850000000001 Td
@@ -12541,12 +13075,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 282.7450000000001 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -12563,12 +13097,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 282.7450000000001 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <766f6964> Tj
 ET
 
@@ -12602,7 +13136,18 @@ ET
 BT
 180.24 282.7450000000001 Td
 /F6.0 11 Tf
-<2829> Tj
+<28> 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
+185.74 282.7450000000001 Td
+/F6.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -12684,8 +13229,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 240.74 268.0050000000001 Td
@@ -12778,7 +13323,62 @@ ET
 BT
 405.74 268.0050000000001 Td
 /F6.0 11 Tf
-<28292929293b> Tj
+<28> 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
+411.24 268.0050000000001 Td
+/F6.0 11 Tf
+<29> 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
+416.74 268.0050000000001 Td
+/F6.0 11 Tf
+<29> 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
+422.24 268.0050000000001 Td
+/F6.0 11 Tf
+<29> 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
+427.74 268.0050000000001 Td
+/F6.0 11 Tf
+<29> 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
+433.24 268.0050000000001 Td
+/F6.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -13022,26 +13622,25 @@ Q
 
 endstream
 endobj
-91 0 obj
+90 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 90 0 R
+/Contents 89 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F3.1 37 0 R
 /F5.0 40 0 R
 /F1.0 8 0 R
 /F6.0 43 0 R
-/F8.0 83 0 R
-/F7.0 52 0 R
+/F7.0 82 0 R
 >>
-/XObject << /Stamp1 366 0 R
+/XObject << /Stamp1 365 0 R
 >>
 >>
-/Annots [92 0 R 93 0 R 94 0 R 95 0 R 96 0 R 97 0 R 98 0 R]
+/Annots [91 0 R 92 0 R 93 0 R 94 0 R 95 0 R 96 0 R 97 0 R]
 >>
 endobj
-92 0 obj
+91 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -13052,7 +13651,7 @@ endobj
 /Type /Annot
 >>
 endobj
-93 0 obj
+92 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -13063,7 +13662,7 @@ endobj
 /Type /Annot
 >>
 endobj
-94 0 obj
+93 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -13074,7 +13673,7 @@ endobj
 /Type /Annot
 >>
 endobj
-95 0 obj
+94 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -13085,7 +13684,7 @@ endobj
 /Type /Annot
 >>
 endobj
-96 0 obj
+95 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -13096,7 +13695,7 @@ endobj
 /Type /Annot
 >>
 endobj
-97 0 obj
+96 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -13107,7 +13706,7 @@ endobj
 /Type /Annot
 >>
 endobj
-98 0 obj
+97 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -13118,7 +13717,7 @@ endobj
 /Type /Annot
 >>
 endobj
-99 0 obj
+98 0 obj
 << /Length 10666
 >>
 stream
@@ -13610,27 +14209,27 @@ Q
 
 endstream
 endobj
-100 0 obj
+99 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 99 0 R
+/Contents 98 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 16 0 R
 /F1.0 8 0 R
 /F6.0 43 0 R
 /F3.1 37 0 R
 >>
-/XObject << /Stamp1 366 0 R
+/XObject << /Stamp1 365 0 R
 >>
 >>
-/Annots [102 0 R 103 0 R]
+/Annots [101 0 R 102 0 R]
 >>
 endobj
-101 0 obj
-[100 0 R /XYZ 0 841.89 null]
+100 0 obj
+[99 0 R /XYZ 0 841.89 null]
 endobj
-102 0 obj
+101 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -13641,7 +14240,7 @@ endobj
 /Type /Annot
 >>
 endobj
-103 0 obj
+102 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -13652,11 +14251,11 @@ endobj
 /Type /Annot
 >>
 endobj
-104 0 obj
-[100 0 R /XYZ 0 556.8100000000002 null]
+103 0 obj
+[99 0 R /XYZ 0 556.8100000000002 null]
 endobj
-105 0 obj
-<< /Length 44609
+104 0 obj
+<< /Length 49066
 >>
 stream
 q
@@ -13690,13 +14289,13 @@ h
 S
 Q
 /DeviceRGB cs
-0.000 0.533 0.000 scn
+0.000 0.400 0.600 scn
 /DeviceRGB CS
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 SCN
 
 BT
 59.24 783.0649999999999 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -13713,12 +14312,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 783.0649999999999 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -13735,12 +14334,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 783.0649999999999 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <46616b6545787465726e616c53797374656d456e64706f696e7452756c6554657374> Tj
 ET
 
@@ -13779,8 +14378,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 768.3249999999999 Td
@@ -13801,12 +14400,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 753.585 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -13889,12 +14488,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 103.24000000000001 738.845 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <6e6577> Tj
 ET
 
@@ -13955,8 +14554,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 422.24 738.845 Td
@@ -13972,7 +14571,18 @@ ET
 BT
 449.74 738.845 Td
 /F6.0 11 Tf
-<293b> Tj
+<29> 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
+455.24 738.845 Td
+/F6.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -14010,12 +14620,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 724.105 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <70726976617465> Tj
 ET
 
@@ -14087,12 +14697,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 709.365 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <70726976617465> Tj
 ET
 
@@ -14186,8 +14796,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 694.625 Td
@@ -14208,12 +14818,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 679.885 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -14230,12 +14840,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 679.885 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <766f6964> Tj
 ET
 
@@ -14269,7 +14879,18 @@ ET
 BT
 174.74 679.885 Td
 /F6.0 11 Tf
-<2829> Tj
+<28> 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
+180.24 679.885 Td
+/F6.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -14285,12 +14906,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 191.24 679.885 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <7468726f7773> Tj
 ET
 
@@ -14417,8 +15038,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 185.74 650.405 Td
@@ -14461,8 +15082,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 460.74 650.405 Td
@@ -14478,7 +15099,18 @@ ET
 BT
 488.24 650.405 Td
 /F6.0 11 Tf
-<293b> Tj
+<29> 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
+493.74 650.405 Td
+/F6.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -14516,12 +15148,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 103.24000000000001 635.665 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <66696e616c> Tj
 ET
 
@@ -14538,8 +15170,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 136.24 635.665 Td
@@ -14626,8 +15258,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 185.74 620.925 Td
@@ -14670,8 +15302,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 438.74 620.925 Td
@@ -14687,7 +15319,18 @@ ET
 BT
 466.24 620.925 Td
 /F6.0 11 Tf
-<293b> Tj
+<29> 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
+471.74 620.925 Td
+/F6.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -14725,12 +15368,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 103.24000000000001 606.185 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <66696e616c> Tj
 ET
 
@@ -14835,12 +15478,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 147.24 591.4449999999999 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <6e6577> Tj
 ET
 
@@ -14901,8 +15544,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 372.74 591.4449999999999 Td
@@ -14918,7 +15561,40 @@ ET
 BT
 411.24 591.4449999999999 Td
 /F6.0 11 Tf
-<2829293b> Tj
+<28> 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
+416.74 591.4449999999999 Td
+/F6.0 11 Tf
+<29> 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
+422.24 591.4449999999999 Td
+/F6.0 11 Tf
+<29> 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
+427.74 591.4449999999999 Td
+/F6.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -15022,8 +15698,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 361.74 576.7049999999999 Td
@@ -15039,7 +15715,29 @@ ET
 BT
 477.24 576.7049999999999 Td
 /F6.0 11 Tf
-<28293b> Tj
+<28> 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
+482.74 576.7049999999999 Td
+/F6.0 11 Tf
+<29> 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
+488.24 576.7049999999999 Td
+/F6.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -15220,8 +15918,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 152.74 547.2249999999999 Td
@@ -15237,13 +15935,35 @@ ET
 BT
 246.24 547.2249999999999 Td
 /F6.0 11 Tf
-<28292e> Tj
+<28> 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
+251.74 547.2249999999999 Td
+/F6.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+257.24 547.2249999999999 Td
+/F6.0 11 Tf
+<2e> 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
 262.74 547.2249999999999 Td
@@ -15297,8 +16017,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 235.24 532.4849999999999 Td
@@ -15369,7 +16089,18 @@ ET
 BT
 103.24000000000001 503.00499999999994 Td
 /F6.0 11 Tf
-<293b> Tj
+<29> 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
+108.74000000000001 503.00499999999994 Td
+/F6.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -15407,8 +16138,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 473.5249999999999 Td
@@ -15429,12 +16160,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 458.7849999999999 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -15451,12 +16182,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 458.7849999999999 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <766f6964> Tj
 ET
 
@@ -15490,7 +16221,18 @@ ET
 BT
 202.24 458.7849999999999 Td
 /F6.0 11 Tf
-<2829> Tj
+<28> 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.74 458.7849999999999 Td
+/F6.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -15506,12 +16248,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 218.74 458.7849999999999 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <7468726f7773> Tj
 ET
 
@@ -15572,8 +16314,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.600 0.600 0.600 scn
+0.600 0.600 0.600 SCN
 
 BT
 103.24000000000001 444.0449999999999 Td
@@ -15594,12 +16336,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 103.24000000000001 429.3049999999999 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <66696e616c> Tj
 ET
 
@@ -15682,12 +16424,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 224.24 429.3049999999999 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <6e6577> Tj
 ET
 
@@ -15721,7 +16463,29 @@ ET
 BT
 279.24 429.3049999999999 Td
 /F6.0 11 Tf
-<28293b> Tj
+<28> 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
+284.74 429.3049999999999 Td
+/F6.0 11 Tf
+<29> 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
+290.24 429.3049999999999 Td
+/F6.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -15765,7 +16529,29 @@ ET
 BT
 103.24000000000001 414.5649999999999 Td
 /F6.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+108.74000000000001 414.5649999999999 Td
+/F6.0 11 Tf
+<2e> 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
+114.24000000000001 414.5649999999999 Td
+/F6.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -15781,8 +16567,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.600 0.600 0.600 scn
+0.600 0.600 0.600 SCN
 
 BT
 103.24000000000001 399.8249999999999 Td
@@ -15803,12 +16589,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 103.24000000000001 385.08499999999987 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <66696e616c> Tj
 ET
 
@@ -15891,12 +16677,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 279.24 385.08499999999987 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <6e6577> Tj
 ET
 
@@ -15930,7 +16716,29 @@ ET
 BT
 378.24 385.08499999999987 Td
 /F6.0 11 Tf
-<28293b> Tj
+<28> 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
+383.74 385.08499999999987 Td
+/F6.0 11 Tf
+<29> 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
+389.24 385.08499999999987 Td
+/F6.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -15974,7 +16782,29 @@ ET
 BT
 103.24000000000001 370.34499999999986 Td
 /F6.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+108.74000000000001 370.34499999999986 Td
+/F6.0 11 Tf
+<2e> 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
+114.24000000000001 370.34499999999986 Td
+/F6.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16012,8 +16842,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 207.74 355.60499999999985 Td
@@ -16029,13 +16859,35 @@ ET
 BT
 246.24 355.60499999999985 Td
 /F6.0 11 Tf
-<28292e> Tj
+<28> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+251.74 355.60499999999985 Td
+/F6.0 11 Tf
+<29> 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
+257.24 355.60499999999985 Td
+/F6.0 11 Tf
+<2e> 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
 262.74 355.60499999999985 Td
@@ -16073,7 +16925,18 @@ ET
 BT
 405.74 355.60499999999985 Td
 /F6.0 11 Tf
-<293b> Tj
+<29> 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
+411.24 355.60499999999985 Td
+/F6.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16089,8 +16952,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.600 0.600 0.600 scn
+0.600 0.600 0.600 SCN
 
 BT
 103.24000000000001 340.86499999999984 Td
@@ -16199,8 +17062,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 361.74 326.12499999999983 Td
@@ -16238,7 +17101,18 @@ ET
 BT
 422.24 326.12499999999983 Td
 /F6.0 11 Tf
-<293b> Tj
+<29> 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
+427.74 326.12499999999983 Td
+/F6.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16276,8 +17150,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.600 0.600 0.600 scn
+0.600 0.600 0.600 SCN
 
 BT
 103.24000000000001 311.3849999999998 Td
@@ -16298,12 +17172,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 103.24000000000001 296.6449999999998 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <66696e616c> Tj
 ET
 
@@ -16320,8 +17194,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 136.24 296.6449999999998 Td
@@ -16463,8 +17337,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 229.74 281.9049999999998 Td
@@ -16480,13 +17354,35 @@ ET
 BT
 268.24 281.9049999999998 Td
 /F6.0 11 Tf
-<28292e> Tj
+<28> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+273.74 281.9049999999998 Td
+/F6.0 11 Tf
+<29> 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
+279.24 281.9049999999998 Td
+/F6.0 11 Tf
+<2e> 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
 284.74 281.9049999999998 Td
@@ -16502,7 +17398,29 @@ ET
 BT
 339.74 281.9049999999998 Td
 /F6.0 11 Tf
-<28293b> Tj
+<28> 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
+345.24 281.9049999999998 Td
+/F6.0 11 Tf
+<29> 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
+350.74 281.9049999999998 Td
+/F6.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16524,7 +17442,29 @@ ET
 BT
 103.24000000000001 267.16499999999985 Td
 /F6.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+108.74000000000001 267.16499999999985 Td
+/F6.0 11 Tf
+<2e> 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
+114.24000000000001 267.16499999999985 Td
+/F6.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16773,35 +17713,34 @@ Q
 
 endstream
 endobj
-106 0 obj
+105 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 105 0 R
+/Contents 104 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F7.0 52 0 R
-/F6.0 43 0 R
-/F6.1 107 0 R
+/Font << /F6.0 43 0 R
+/F6.1 106 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 366 0 R
+/XObject << /Stamp1 365 0 R
 >>
 >>
 >>
 endobj
-107 0 obj
+106 0 obj
 << /Type /Font
-/BaseFont /AAAAEO+mplus1mn-regular
+/BaseFont /AAAAEA+mplus1mn-regular
 /Subtype /TrueType
-/FontDescriptor 434 0 R
+/FontDescriptor 429 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 436 0 R
-/ToUnicode 435 0 R
+/Widths 431 0 R
+/ToUnicode 430 0 R
 >>
 endobj
-108 0 obj
-<< /Length 19537
+107 0 obj
+<< /Length 19821
 >>
 stream
 q
@@ -16889,8 +17828,8 @@ f
 h
 S
 Q
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 59.239999999999995 705.725 Td
@@ -16900,12 +17839,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.239999999999995 690.985 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -16988,12 +17927,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 147.24 676.2450000000001 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <6e6577> Tj
 ET
 
@@ -17065,8 +18004,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 290.24 661.5050000000001 Td
@@ -17120,8 +18059,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 273.74 646.7650000000001 Td
@@ -17175,8 +18114,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 284.74 632.0250000000001 Td
@@ -17192,7 +18131,18 @@ ET
 BT
 312.24 632.0250000000001 Td
 /F6.0 11 Tf
-<293b> Tj
+<29> 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
+317.74 632.0250000000001 Td
+/F6.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17323,8 +18273,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 185.74 540.7650000000001 Td
@@ -17367,8 +18317,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 416.74 540.7650000000001 Td
@@ -17384,7 +18334,18 @@ ET
 BT
 444.24 540.7650000000001 Td
 /F6.0 11 Tf
-<293b> Tj
+<29> 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
+449.74 540.7650000000001 Td
+/F6.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17710,12 +18671,12 @@ f
 h
 S
 Q
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 59.239999999999995 256.42499999999995 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <3c646570656e64656e63793e> Tj
 ET
 
@@ -17732,12 +18693,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 81.24 241.68499999999995 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <3c67726f757049643e> Tj
 ET
 
@@ -17754,12 +18715,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 240.74 241.68499999999995 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <3c2f67726f757049643e> Tj
 ET
 
@@ -17776,12 +18737,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 81.24 226.94499999999994 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <3c617274696661637449643e> Tj
 ET
 
@@ -17798,12 +18759,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 284.74 226.94499999999994 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <3c2f617274696661637449643e> Tj
 ET
 
@@ -17820,12 +18781,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 81.24 212.20499999999993 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <3c73636f70653e> Tj
 ET
 
@@ -17842,12 +18803,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 141.74 212.20499999999993 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <3c2f73636f70653e> Tj
 ET
 
@@ -17875,12 +18836,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 59.239999999999995 197.46499999999992 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <3c2f646570656e64656e63793e> Tj
 ET
 
@@ -18010,41 +18971,40 @@ Q
 
 endstream
 endobj
-109 0 obj
+108 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 108 0 R
+/Contents 107 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F6.1 107 0 R
+/Font << /F6.1 106 0 R
 /F1.0 8 0 R
 /F6.0 43 0 R
-/F7.0 52 0 R
 /F2.0 16 0 R
 >>
-/XObject << /Stamp1 366 0 R
+/XObject << /Stamp1 365 0 R
 >>
 >>
-/Annots [114 0 R]
+/Annots [113 0 R]
 >>
 endobj
-110 0 obj
-[109 0 R /XYZ 0 455.51 null]
+109 0 obj
+[108 0 R /XYZ 0 455.51 null]
 endobj
-111 0 obj
+110 0 obj
 << /Limits [(1-13-0-improved-intent) (_ugtst_integ-test-support_typical-usage)]
-/Names [(1-13-0-improved-intent) 136 0 R (1-8-0-and-earlier) 141 0 R (1-9-0-code-appmanifest-code) 137 0 R (_ugtst) 13 0 R (_ugtst_aaa) 35 0 R (_ugtst_bdd-spec-support) 185 0 R (_ugtst_bdd-spec-support_bdd-tooling) 221 0 R (_ugtst_bdd-spec-support_how-it-works) 189 0 R (_ugtst_bdd-spec-support_key-classes) 194 0 R (_ugtst_bdd-spec-support_maven-configuration) 226 0 R (_ugtst_bdd-spec-support_writing-a-bdd-spec) 202 0 R (_ugtst_fixture-scripts) 232 0 R (_ugtst_fixture-scripts_api-and-usage) 237 0 R (_ugtst_fixture-scripts_api-and-usage_organizing) 279 0 R (_ugtst_fixture-scripts_sudo-service) 299 0 R (_ugtst_integ-test-support) 119 0 R (_ugtst_integ-test-support_bootstrapping) 130 0 R (_ugtst_integ-test-support_bootstrapping_IntegrationTestAbstract) 152 0 R (_ugtst_integ-test-support_maven-configuration) 179 0 R (_ugtst_integ-test-support_typical-usage) 120 0 R]
+/Names [(1-13-0-improved-intent) 135 0 R (1-8-0-and-earlier) 140 0 R (1-9-0-code-appmanifest-code) 136 0 R (_ugtst) 13 0 R (_ugtst_aaa) 35 0 R (_ugtst_bdd-spec-support) 184 0 R (_ugtst_bdd-spec-support_bdd-tooling) 220 0 R (_ugtst_bdd-spec-support_how-it-works) 188 0 R (_ugtst_bdd-spec-support_key-classes) 193 0 R (_ugtst_bdd-spec-support_maven-configuration) 225 0 R (_ugtst_bdd-spec-support_writing-a-bdd-spec) 201 0 R (_ugtst_fixture-scripts) 231 0 R (_ugtst_fixture-scripts_api-and-usage) 236 0 R (_ugtst_fixture-scripts_api-and-usage_organizing) 278 0 R (_ugtst_fixture-scripts_sudo-service) 298 0 R (_ugtst_integ-test-support) 118 0 R (_ugtst_integ-test-support_bootstrapping) 129 0 R (_ugtst_integ-test-support_bootstrapping_IntegrationTestAbstract) 151 0 R (_ugtst_integ-test-support_maven-configuration) 178 0 R (_ugtst_integ-test-support_typical-usage) 119 0 R]
 >>
 endobj
-112 0 obj
+111 0 obj
 << /Limits [(fake-data) (xml-marshalling-support)]
-/Names [(fake-data) 58 0 R (feature-toggles) 60 0 R (firing-domain-events) 173 0 R (fixture-management) 54 0 R (further-approaches) 295 0 R (given-when-then) 53 0 R (injected-services-method) 82 0 R (integ-tests-vs-bdd-specs) 39 0 R (isisconfigurationforjdointegtests) 146 0 R (other-guides) 17 0 R (simulated-ui-code-wrapperfactory-code) 42 0 R (system-initializer) 135 0 R (unit-tests-vs-integ-tests) 36 0 R (using-the-wrapper) 171 0 R (using-within-tests) 275 0 R (value-objects) 86 0 R (wrapping-and-unwrapping) 167 0 R (xml-marshalling-support) 110 0 R]
+/Names [(fake-data) 57 0 R (feature-toggles) 59 0 R (firing-domain-events) 172 0 R (fixture-management) 53 0 R (further-approaches) 294 0 R (given-when-then) 52 0 R (injected-services-method) 81 0 R (integ-tests-vs-bdd-specs) 39 0 R (isisconfigurationforjdointegtests) 145 0 R (other-guides) 17 0 R (simulated-ui-code-wrapperfactory-code) 42 0 R (system-initializer) 134 0 R (unit-tests-vs-integ-tests) 36 0 R (using-the-wrapper) 170 0 R (using-within-tests) 274 0 R (value-objects) 85 0 R (wrapping-and-unwrapping) 166 0 R (xml-marshalling-support) 109 0 R]
 >>
 endobj
-113 0 obj
-[109 0 R /XYZ 0 362.89 null]
+112 0 obj
+[108 0 R /XYZ 0 362.89 null]
 endobj
-114 0 obj
+113 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -18055,7 +19015,7 @@ endobj
 /Type /Annot
 >>
 endobj
-115 0 obj
+114 0 obj
 << /Length 10913
 >>
 stream
@@ -18090,13 +19050,13 @@ h
 S
 Q
 /DeviceRGB cs
-0.733 0.000 0.400 scn
+0.184 0.435 0.624 scn
 /DeviceRGB CS
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 SCN
 
 BT
 59.24 783.0649999999999 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <3c706c7567696e3e> Tj
 ET
 
@@ -18113,12 +19073,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 81.24000000000001 768.3249999999999 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <3c67726f757049643e> Tj
 ET
 
@@ -18135,12 +19095,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 262.74 768.3249999999999 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <3c2f67726f757049643e> Tj
 ET
 
@@ -18157,12 +19117,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 81.24000000000001 753.585 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <3c617274696661637449643e> Tj
 ET
 
@@ -18179,12 +19139,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 262.74 753.585 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <3c2f617274696661637449643e> Tj
 ET
 
@@ -18201,12 +19161,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 81.24000000000001 738.845 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <3c76657273696f6e3e> Tj
 ET
 
@@ -18223,12 +19183,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 152.74 738.845 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <3c2f76657273696f6e3e> Tj
 ET
 
@@ -18245,12 +19205,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 81.24000000000001 724.105 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <3c636f6e66696775726174696f6e3e> Tj
 ET
 
@@ -18267,12 +19227,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 103.24000000000001 709.365 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <3c696e636c756465733e> Tj
 ET
 
@@ -18289,12 +19249,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 125.24000000000001 694.625 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <3c696e636c7564653e> Tj
 ET
 
@@ -18311,12 +19271,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 246.24 694.625 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <3c2f696e636c7564653e> Tj
 ET
 
@@ -18333,12 +19293,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 125.24000000000001 679.885 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <3c696e636c7564653e> Tj
 ET
 
@@ -18355,12 +19315,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 257.24 679.885 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <3c2f696e636c7564653e> Tj
 ET
 
@@ -18377,12 +19337,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 125.24000000000001 665.145 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <3c696e636c7564653e> Tj
 ET
 
@@ -18399,12 +19359,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 251.74 665.145 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <3c2f696e636c7564653e> Tj
 ET
 
@@ -18421,12 +19381,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 103.24000000000001 650.405 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <3c2f696e636c756465733e> Tj
 ET
 
@@ -18443,12 +19403,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 103.24000000000001 635.665 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <3c6578636c756465733e> Tj
 ET
 
@@ -18465,12 +19425,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 125.24000000000001 620.925 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <3c6578636c7564653e> Tj
 ET
 
@@ -18487,12 +19447,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 246.24 620.925 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <3c2f6578636c7564653e> Tj
 ET
 
@@ -18509,12 +19469,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 125.24000000000001 606.185 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <3c6578636c7564653e> Tj
 ET
 
@@ -18531,12 +19491,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 279.24 606.185 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <3c2f6578636c7564653e> Tj
 ET
 
@@ -18553,12 +19513,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 125.24000000000001 591.4449999999999 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <3c6578636c7564653e> Tj
 ET
 
@@ -18575,12 +19535,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 273.74 591.4449999999999 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <3c2f6578636c7564653e> Tj
 ET
 
@@ -18597,12 +19557,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 103.24000000000001 576.7049999999999 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <3c2f6578636c756465733e> Tj
 ET
 
@@ -18619,12 +19579,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 103.24000000000001 561.9649999999999 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <3c75736546696c653e> Tj
 ET
 
@@ -18641,12 +19601,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 174.74 561.9649999999999 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <3c2f75736546696c653e> Tj
 ET
 
@@ -18663,12 +19623,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 103.24000000000001 547.2249999999999 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <3c7072696e7453756d6d6172793e> Tj
 ET
 
@@ -18685,12 +19645,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 202.24 547.2249999999999 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <3c2f7072696e7453756d6d6172793e> Tj
 ET
 
@@ -18707,12 +19667,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 103.24000000000001 532.4849999999999 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <3c6f75747075744469726563746f72793e> Tj
 ET
 
@@ -18729,12 +19689,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 433.24 532.4849999999999 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <3c2f6f75747075744469726563746f72793e> Tj
 ET
 
@@ -18751,23 +19711,23 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 81.24000000000001 517.7449999999999 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <3c2f636f6e66696775726174696f6e3e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 59.24 503.00499999999994 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <3c2f706c7567696e3e> Tj
 ET
 
@@ -18797,23 +19757,22 @@ Q
 
 endstream
 endobj
-116 0 obj
+115 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 115 0 R
+/Contents 114 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F7.0 52 0 R
-/F6.0 43 0 R
+/Font << /F6.0 43 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 366 0 R
+/XObject << /Stamp1 365 0 R
 >>
 >>
 >>
 endobj
-117 0 obj
-<< /Length 26834
+116 0 obj
+<< /Length 28890
 >>
 stream
 q
@@ -19102,12 +20061,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24000000000001 478.46500000000043 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -19124,12 +20083,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 478.46500000000043 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -19146,12 +20105,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 478.46500000000043 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <546f446f4974656d> Tj
 ET
 
@@ -19174,7 +20133,29 @@ ET
 BT
 180.24 478.46500000000043 Td
 /F6.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+185.74 478.46500000000043 Td
+/F6.0 11 Tf
+<2e> 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
+191.24 478.46500000000043 Td
+/F6.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -19212,12 +20193,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 448.9850000000004 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <70726976617465> Tj
 ET
 
@@ -19234,12 +20215,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 125.24000000000001 448.9850000000004 Td
-/F7.0 11 Tf
+/F6.0 11 Tf
 <626f6f6c65616e> Tj
 ET
 
@@ -19289,8 +20270,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 434.2450000000004 Td
@@ -19388,8 +20369,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 

<TRUNCATED>

[33/44] isis-site git commit: ISIS-1594: provide an 'edit' button

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/guides/rgcms.html
----------------------------------------------------------------------
diff --git a/content/guides/rgcms.html b/content/guides/rgcms.html
index 9153f9d..dea4eb3 100644
--- a/content/guides/rgcms.html
+++ b/content/guides/rgcms.html
@@ -1,12 +1,10 @@
 <!doctype html>
 <html class="no-js" lang="en">
-<head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-
-    <title>Classes, Methods and Schema</title>
-
-    <!--
+ <head> 
+  <meta charset="utf-8"> 
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"> 
+  <title>Classes, Methods and Schema</title> 
+  <!--
         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
@@ -23,31 +21,21 @@
         KIND, either express or implied.  See the License for the
         specific language governing permissions and limitations
         under the License.
-    -->
-
-    <!-- No caching headers -->
-    <meta http-equiv="cache-control" content="no-cache" />
-    <meta http-equiv="pragma" content="no-cache" />
-    <meta http-equiv="expires" content="-1" />
-
-
-    <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
-    <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet" />
-    <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script>
-    <link href="../css/asciidoctor/colony.css" rel="stylesheet">
-    <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-
-
-
-    <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
-    <!--[if lt IE 9]>
+    --> 
+  <!-- No caching headers --> 
+  <meta http-equiv="cache-control" content="no-cache"> 
+  <meta http-equiv="pragma" content="no-cache"> 
+  <meta http-equiv="expires" content="-1"> 
+  <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line --> 
+  <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet"> 
+  <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script> 
+  <link href="../css/asciidoctor/colony.css" rel="stylesheet"> 
+  <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet"> 
+  <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet"> 
+  <!--[if lt IE 9]>
       <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
-    <![endif]-->
-
-
-
-    <style type="text/css">
+    <![endif]--> 
+  <style type="text/css">
         pre code {
             background-color: inherit;
             border-style: none;
@@ -192,9 +180,8 @@ table.CodeRay td.code>pre{padding:0}
         color:#fff;
         font-size: 1.1em;
     }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         @media only screen and (min-width: 40.063em) {
           .top-bar {
             .contain-to-grid .top-bar {
@@ -205,9 +192,8 @@ table.CodeRay td.code>pre{padding:0}
         .row {
             max-width: 80rem;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .extended-quote,
         .extended-quote-first {
             margin-left: 40px;
@@ -231,9 +217,8 @@ table.CodeRay td.code>pre{padding:0}
             text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
         }
         
-    </style>
-
-    <style>
+    </style> 
+  <style>
         body {
           position: relative;
         }
@@ -255,6 +240,7 @@ table.CodeRay td.code>pre{padding:0}
 
         div#doc-content {
             margin-top: 30px;
+            padding-top: 30px;
         }
 
         div.documentation-page table.frame-all {
@@ -286,9 +272,8 @@ table.CodeRay td.code>pre{padding:0}
             min-height: 2000px;
         }
 
-    </style>
-
-    <style>
+    </style> 
+  <style>
 
         @media only screen and (min-width: 768px) {
           #toc.toc2 ul ul { margin-left: -10px; }
@@ -316,15 +301,13 @@ table.CodeRay td.code>pre{padding:0}
         body div#toc2 li.tocify-item.active a {
             color: red;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         footer {
             margin-top: 1000px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* overriding colony.css stylesheet */
         .literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
            /*padding: 1.25em 1.5625em 1.125em 1.5625em;*/
@@ -372,9 +355,8 @@ table.CodeRay td.code>pre{padding:0}
         .imageblock img {
             margin-bottom: 10px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* from http://ben.balter.com/2014/03/13/pages-anchor-links/ */
         .header-link {
           position: absolute;
@@ -395,9 +377,8 @@ table.CodeRay td.code>pre{padding:0}
         h6:hover .header-link {
           opacity: 1;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .top-bar
         {
             -webkit-transition-duration: .5s;
@@ -425,510 +406,487 @@ table.CodeRay td.code>pre{padding:0}
             -webkit-transition-property: -webkit-transform;
             transition-property: transform;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         #doc-content a.guide {
             color: white;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
+        .tocify {
+            margin-top: 80px;
+        }
+    </style> 
+  <style>
         .tocify {
             margin-top: 80px;
         }
-    </style>
-
-
-</script>
-
-</head>
-<body>
-
-<<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
-    <div class="github-fork-ribbon">
-        <a href="https://github.com/apache/isis#fork-destination-box">Fork me on GitHub</a>
-    </div>
-</div>
-
-
-<div class="row">
-
-    <div class="fixed contain-to-grid header">
-        <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
-            <ul class="title-area">
-                <li class="name">
-                    <h1>
-                        <a href="/index.html">Apache Isis&trade;</a>
-                    </h1>
-                </li>
-                <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
-                <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
-            </ul>
-
-            <section class="top-bar-section">
-                <ul class="right">
-
-                    <li class="has-form">
-                       <FORM class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
-                        <div class="row collapse">
-                            <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
-                            <INPUT type="hidden" name="cof" value="FORID:0">
-                            <INPUT class="form-control" name="q" type="text" placeholder="Search">
-                        </div>
-                    </FORM>
-                     </li>
-
-                </ul>
-
-                <!-- Left Nav Section -->
-                <ul class="left">
-
-                    <li><a href="/documentation.html">Documentation</a></li>
-                    <li><a href="/downloads.html">Downloads</a></li>
-                    <li><a href="/help.html">Help</a></li>
-                    <li><a href="/asf.html">@ASF</a></li>
-
-                </ul>
-
-            </section>
-        </nav>
-    </div>
-</div>
-
-<div class="row">
-
-    <div id="doc-content-left" class="large-9 medium-9 columns">
-
-
-        <div id="doc-content">
-          <div class="sect1">
-<h2 id="_rgcms">1. Classes, Methods and Schema</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>This reference guide lists and describes various elements of the the Apache Isis Programming Model, specifically
-reserved and prefix <a href="#_rgcms_methods">methods</a> (such as <code>title()</code> and <code>validate&#8230;&#8203;()</code>) and various utility and
-supporting <a href="#_rgcms_classes">classes</a>.</p>
-</div>
-<div class="paragraph">
-<p>It also describes the <a href="#_rgcms_schema">XSD schema</a> defined by Apache Isis.  One use case is for the
-JAXB serialization of view models.</p>
-</div>
-<div class="sect2">
-<h3 id="_other_guides">1.1. Other Guides</h3>
-<div class="paragraph">
-<p>Apache Isis documentation is broken out into a number of user, reference and "supporting procedures" guides.</p>
-</div>
-<div class="paragraph">
-<p>The user guides available are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="ugfun.html">Fundamentals</a></p>
-</li>
-<li>
-<p><a href="ugvw.html">Wicket viewer</a></p>
-</li>
-<li>
-<p><a href="ugvro.html">Restful Objects viewer</a></p>
-</li>
-<li>
-<p><a href="ugdno.html">DataNucleus object store</a></p>
-</li>
-<li>
-<p><a href="ugsec.html">Security</a></p>
-</li>
-<li>
-<p><a href="ugtst.html">Testing</a></p>
-</li>
-<li>
-<p><a href="ugbtb.html">Beyond the Basics</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The reference guides are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="rgant.html">Annotations</a></p>
-</li>
-<li>
-<p><a href="rgsvc.html">Domain Services</a></p>
-</li>
-<li>
-<p><a href="rgcfg.html">Configuration Properties</a></p>
-</li>
-<li>
-<p><a href="#">Classes, Methods and Schema</a> (this guide)</p>
-</li>
-<li>
-<p><a href="rgmvn.html">Apache Isis Maven plugin</a></p>
-</li>
-<li>
-<p><a href="rgfis.html">Framework Internal Services</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The remaining guides are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="dg.html">Developers' Guide</a> (how to set up a development environment
-for Apache Isis and contribute back to the project)</p>
-</li>
-<li>
-<p><a href="cgcom.html">Committers' Guide</a> (release procedures and related practices)</p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_rgcms_methods">2. Methods</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>The Apache Isis metamodel is built up from declaratively (ie, <a href="rgant.html#_rgant">annotations</a>) and imperatively, from "supporting" methods and other reserved methods.</p>
-</div>
-<div class="paragraph">
-<p>This chapter documents the supporting methods and the reserved methods.  It also documents (separately) the reserved methods that act as callback hooks into the persistence lifecycle of domain entities.</p>
-</div>
-<div class="sect2">
-<h3 id="_rgcms_methods_prefixes">2.1. Supporting Method Prefixes</h3>
-<div class="paragraph">
-<p>Supporting methods are those that are associated with properties, collections and actions, providing additional imperative business rule checking and behaviour to be performed when the user interacts with those object members.</p>
-</div>
-<div class="paragraph">
-<p>This association is performed by name matching.  Thus, a property called "firstName", derived from a method <code>getFirstName()</code> may have supporting methods <code>hideFirstName()</code>, <code>disableFirstName()</code> and <code>validateFirstName()</code>.  Supporting methods are, therefore, each characterized by their own particular prefix.</p>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>Using name matching to associate supporting methods generally works very well, but of course if an object member&#8217;s method is renamed, there&#8217;s always the risk that the developer forgets to rename the supporting method; the supporting methods become "orphaned".</p>
-</div>
-<div class="paragraph">
-<p>Apache Isis checks for this automatically, and will fail-fast (fail to boot) if any orphaned methods are located.  A suitable error message is logged so that the issue can be easily diagnosed.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>The table below lists the method prefixes that are recognized as part of Apache Isis' default programming model.</p>
-</div>
-<table class="tableblock frame-all grid-all spread">
-<caption class="title">Table 1. Recognized Method Prefixes</caption>
-<colgroup>
-<col style="width: 18.1818%;">
-<col style="width: 9.0909%;">
-<col style="width: 9.0909%;">
-<col style="width: 9.0909%;">
-<col style="width: 9.0909%;">
-<col style="width: 9.0909%;">
-<col style="width: 36.3637%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">Prefix</th>
-<th class="tableblock halign-left valign-top">Object</th>
-<th class="tableblock halign-left valign-top">Property</th>
-<th class="tableblock halign-left valign-top">Collection</th>
-<th class="tableblock halign-left valign-top">Action</th>
-<th class="tableblock halign-left valign-top">Action<br>
-Param</th>
-<th class="tableblock halign-left valign-top">Description</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_addTo"><code>addTo&#8230;&#8203;()</code></a></p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>add object to a collection <br></p>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>Directly mutable collections are not currently supported by the <a href="ugvw.html">Wicket viewer</a>.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>See also <a href="#_rgcms_methods_prefixes_removeFrom"><code>removeFrom&#8230;&#8203;()</code></a>`</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_autoComplete"><code>autoComplete&#8230;&#8203;()</code></a></p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Return a list of matching elements for a property or an action parameter.<br></p>
-</div>
-<div class="paragraph">
-<p>Alternatively, can specify for a class using <a href="rgant.html#_rgant-DomainObject_autoCompleteRepository"><code>@DomainObject</code><br>
-<code>#autoCompleteRepository</code></a><br></p>
-</div>
-<div class="paragraph">
-<p>See also <a href="#_rgcms_methods_prefixes_choices"><code>choices&#8230;&#8203;()</code></a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_choices"><code>choices&#8230;&#8203;()</code></a></p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Provide list of choices for a property or action parameter.<br></p>
-</div>
-<div class="paragraph">
-<p>See also <a href="#_rgcms_methods_prefixes_autoComplete"><code>autoComplete&#8230;&#8203;()</code></a>.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_clear"><code>clear&#8230;&#8203;()</code></a></p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Clear a property (set it to null).<br></p>
-</div>
-<div class="paragraph">
-<p>Allows business logic to be placed apart from the setter.<br></p>
-</div>
-<div class="paragraph">
-<p>See also <a href="#_rgcms_methods_prefixes_modify"><code>modify&#8230;&#8203;()</code></a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_default"><code>default&#8230;&#8203;()</code></a></p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Default value for a property or an action parameter.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_disable"><code>disable&#8230;&#8203;()</code></a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Disables (makes read-only) a property, a collection or an action.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_get"><code>get&#8230;&#8203;()</code></a></p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Access the value of a property or collection.<br></p>
-</div>
-<div class="paragraph">
-<p>See also <a href="#_rgcms_methods_prefixes_set"><code>set&#8230;&#8203;()</code></a>.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_hide"><code>hide&#8230;&#8203;()</code></a></p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Hides a property, a collection or an action.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_modify"><code>modify&#8230;&#8203;()</code></a></p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Modify a property (set it to a non-null) value.<br></p>
-</div>
-<div class="paragraph">
-<p>Allows business logic to be placed apart from the setter.<br></p>
-</div>
-<div class="paragraph">
-<p>See also <a href="#_rgcms_methods_prefixes_clear"><code>clear&#8230;&#8203;()</code></a>`.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_removeFrom"><code>removeFrom&#8230;&#8203;()</code></a></p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>remove object from a collection.<br></p>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>Directly mutable collections are not currently supported by the <a href="ugvw.html">Wicket viewer</a>.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>See also <a href="#_rgcms_methods_prefixes_addTo"><code>addTo&#8230;&#8203;()</code></a>`</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_set"><code>set&#8230;&#8203;()</code></a></p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Sets the value of a property or a collection.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_validate"><code>validate&#8230;&#8203;()</code></a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Check that a proposed value of a property or a set of action parameters or a single action parameter is valid.<br></p>
-</div>
-<div class="paragraph">
-<p>See also <a href="#_rgcms_methods_prefixes_validateAddTo"><code>validateAddTo&#8230;&#8203;()</code></a> and <a href="#_rgcms_methods_prefixes_validateRemoveFrom"><code>validateRemoveFrom&#8230;&#8203;()</code></a> to validate modifications to collections.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_validateAddTo"><code>validate<br>
-AddTo&#8230;&#8203;()</code></a></p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Check that a proposed object to add to a collection is valid.<br></p>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>Directly mutable collections are not currently supported by the <a href="ugvw.html">Wicket viewer</a>.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>See also <a href="#_rgcms_methods_prefixes_validateRemoveFrom"><code>validateRemoveFrom&#8230;&#8203;()</code></a>, and <a href="#_rgcms_methods_prefixes_validate"><code>validate&#8230;&#8203;()</code></a> for properties and actions.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_validateRemoveFrom"><code>validate<br>
-RemoveFrom&#8230;&#8203;()</code></a></p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Check that a proposed object to remove from a collection is valid.<br></p>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>Directly mutable collections are not currently supported by the <a href="ugvw.html">Wicket viewer</a>.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>See also <a href="#_rgcms_methods_prefixes_validateAddTo"><code>validateAddTo&#8230;&#8203;()</code></a>, and <a href="#_rgcms_methods_prefixes_validate"><code>validate&#8230;&#8203;()</code></a> for properties and actions.</p>
-</div></div></td>
-</tr>
-</tbody>
-</table>
-<div class="sect3">
-<h4 id="_rgcms_methods_prefixes_addTo">2.1.1. <code>addTo&#8230;&#8203;()</code></h4>
-<div class="paragraph">
-<p>The <code>addTo&#8230;&#8203;()</code> supporting method is called whenever an object is added to a collection. Its purpose is to allow additional business logic to be performed.</p>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>Directly mutable collections are not currently supported by the <a href="ugvw.html">Wicket viewer</a>.  The suggested workaround is to simply define an action.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>For example:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">LibraryMember</span> {
+    </style>  
+ </head> 
+ <body> 
+  <div class="row"> 
+   <div class="fixed contain-to-grid header"> 
+    <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem"> 
+     <ul class="title-area"> 
+      <li class="name"> <h1> <a href="/index.html">Apache Isis\u2122</a> </h1> </li> 
+      <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone --> 
+      <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li> 
+     </ul> 
+     <section class="top-bar-section"> 
+      <ul class="right"> 
+       <li class="has-form"> 
+        <form class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse"> 
+         <div class="row collapse"> 
+          <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya"> 
+          <input type="hidden" name="cof" value="FORID:0"> 
+          <input class="form-control" name="q" type="text" placeholder="Search"> 
+         </div> 
+        </form> </li> 
+      </ul> 
+      <!-- Left Nav Section --> 
+      <ul class="left"> 
+       <li><a href="/documentation.html">Documentation</a></li> 
+       <li><a href="/downloads.html">Downloads</a></li> 
+       <li><a href="/help.html">Help</a></li> 
+       <li><a href="/asf.html">@ASF</a></li> 
+      </ul> 
+     </section> 
+    </nav> 
+   </div> 
+  </div> 
+  <div class="row"> 
+   <div id="doc-content-left" class="large-9 medium-9 columns"> 
+    <div id="doc-content">
+     <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/rgcms.adoc&quot;" style="float: right; font-size: small; padding: 6px;  "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+     <div class="sect1"> 
+      <h2 id="_rgcms">1. Classes, Methods and Schema</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_rgcms.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>This reference guide lists and describes various elements of the the Apache Isis Programming Model, specifically reserved and prefix <a href="#_rgcms_methods">methods</a> (such as <code>title()</code> and <code>validate\u2026\u200b()</code>) and various utility and supporting <a href="#_rgcms_classes">classes</a>.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>It also describes the <a href="#_rgcms_schema">XSD schema</a> defined by Apache Isis. One use case is for the JAXB serialization of view models.</p> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_other_guides">1.1. Other Guides</h3> 
+        <div class="paragraph"> 
+         <p>Apache Isis documentation is broken out into a number of user, reference and "supporting procedures" guides.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The user guides available are:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><a href="ugfun.html">Fundamentals</a></p> </li> 
+          <li> <p><a href="ugvw.html">Wicket viewer</a></p> </li> 
+          <li> <p><a href="ugvro.html">Restful Objects viewer</a></p> </li> 
+          <li> <p><a href="ugdno.html">DataNucleus object store</a></p> </li> 
+          <li> <p><a href="ugsec.html">Security</a></p> </li> 
+          <li> <p><a href="ugtst.html">Testing</a></p> </li> 
+          <li> <p><a href="ugbtb.html">Beyond the Basics</a></p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The reference guides are:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><a href="rgant.html">Annotations</a></p> </li> 
+          <li> <p><a href="rgsvc.html">Domain Services</a></p> </li> 
+          <li> <p><a href="rgcfg.html">Configuration Properties</a></p> </li> 
+          <li> <p><a href="#">Classes, Methods and Schema</a> (this guide)</p> </li> 
+          <li> <p><a href="rgmvn.html">Apache Isis Maven plugin</a></p> </li> 
+          <li> <p><a href="rgfis.html">Framework Internal Services</a></p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The remaining guides are:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><a href="dg.html">Developers' Guide</a> (how to set up a development environment for Apache Isis and contribute back to the project)</p> </li> 
+          <li> <p><a href="cgcom.html">Committers' Guide</a> (release procedures and related practices)</p> </li> 
+         </ul> 
+        </div> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_rgcms_methods">2. Methods</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_rgcms_methods.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>The Apache Isis metamodel is built up from declaratively (ie, <a href="rgant.html#_rgant">annotations</a>) and imperatively, from "supporting" methods and other reserved methods.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>This chapter documents the supporting methods and the reserved methods. It also documents (separately) the reserved methods that act as callback hooks into the persistence lifecycle of domain entities.</p> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_rgcms_methods_prefixes">2.1. Supporting Method Prefixes</h3> 
+        <div class="paragraph"> 
+         <p>Supporting methods are those that are associated with properties, collections and actions, providing additional imperative business rule checking and behaviour to be performed when the user interacts with those object members.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>This association is performed by name matching. Thus, a property called "firstName", derived from a method <code>getFirstName()</code> may have supporting methods <code>hideFirstName()</code>, <code>disableFirstName()</code> and <code>validateFirstName()</code>. Supporting methods are, therefore, each characterized by their own particular prefix.</p> 
+        </div> 
+        <div class="admonitionblock note"> 
+         <table> 
+          <tbody>
+           <tr> 
+            <td class="icon"> <i class="fa icon-note" title="Note"></i> </td> 
+            <td class="content"> 
+             <div class="paragraph"> 
+              <p>Using name matching to associate supporting methods generally works very well, but of course if an object member\u2019s method is renamed, there\u2019s always the risk that the developer forgets to rename the supporting method; the supporting methods become "orphaned".</p> 
+             </div> 
+             <div class="paragraph"> 
+              <p>Apache Isis checks for this automatically, and will fail-fast (fail to boot) if any orphaned methods are located. A suitable error message is logged so that the issue can be easily diagnosed.</p> 
+             </div> </td> 
+           </tr> 
+          </tbody>
+         </table> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The table below lists the method prefixes that are recognized as part of Apache Isis' default programming model.</p> 
+        </div> 
+        <table class="tableblock frame-all grid-all spread"> 
+         <caption class="title">
+          Table 1. Recognized Method Prefixes
+         </caption> 
+         <colgroup> 
+          <col style="width: 18.1818%;"> 
+          <col style="width: 9.0909%;"> 
+          <col style="width: 9.0909%;"> 
+          <col style="width: 9.0909%;"> 
+          <col style="width: 9.0909%;"> 
+          <col style="width: 9.0909%;"> 
+          <col style="width: 36.3637%;"> 
+         </colgroup> 
+         <thead> 
+          <tr> 
+           <th class="tableblock halign-left valign-top">Prefix</th> 
+           <th class="tableblock halign-left valign-top">Object</th> 
+           <th class="tableblock halign-left valign-top">Property</th> 
+           <th class="tableblock halign-left valign-top">Collection</th> 
+           <th class="tableblock halign-left valign-top">Action</th> 
+           <th class="tableblock halign-left valign-top">Action<br> Param</th> 
+           <th class="tableblock halign-left valign-top">Description</th> 
+          </tr> 
+         </thead> 
+         <tbody> 
+          <tr> 
+           <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_addTo"><code>addTo\u2026\u200b()</code></a></p></td> 
+           <td class="tableblock halign-left valign-top"></td> 
+           <td class="tableblock halign-left valign-top"></td> 
+           <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td> 
+           <td class="tableblock halign-left valign-top"></td> 
+           <td class="tableblock halign-left valign-top"></td> 
+           <td class="tableblock halign-left valign-top">
+            <div>
+             <div class="paragraph"> 
+              <p>add object to a collection <br></p> 
+             </div> 
+             <div class="admonitionblock note"> 
+              <table> 
+               <tbody>
+                <tr> 
+                 <td class="icon"> <i class="fa icon-note" title="Note"></i> </td> 
+                 <td class="content"> 
+                  <div class="paragraph"> 
+                   <p>Directly mutable collections are not currently supported by the <a href="ugvw.html">Wicket viewer</a>.</p> 
+                  </div> </td> 
+                </tr> 
+               </tbody>
+              </table> 
+             </div> 
+             <div class="paragraph"> 
+              <p>See also <a href="#_rgcms_methods_prefixes_removeFrom"><code>removeFrom\u2026\u200b()</code></a>`</p> 
+             </div>
+            </div></td> 
+          </tr> 
+          <tr> 
+           <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_autoComplete"><code>autoComplete\u2026\u200b()</code></a></p></td> 
+           <td class="tableblock halign-left valign-top"></td> 
+           <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td> 
+           <td class="tableblock halign-left valign-top"></td> 
+           <td class="tableblock halign-left valign-top"></td> 
+           <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td> 
+           <td class="tableblock halign-left valign-top">
+            <div>
+             <div class="paragraph"> 
+              <p>Return a list of matching elements for a property or an action parameter.<br></p> 
+             </div> 
+             <div class="paragraph"> 
+              <p>Alternatively, can specify for a class using <a href="rgant.html#_rgant-DomainObject_autoCompleteRepository"><code>@DomainObject</code><br> <code>#autoCompleteRepository</code></a><br></p> 
+             </div> 
+             <div class="paragraph"> 
+              <p>See also <a href="#_rgcms_methods_prefixes_choices"><code>choices\u2026\u200b()</code></a></p> 
+             </div>
+            </div></td> 
+          </tr> 
+          <tr> 
+           <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_choices"><code>choices\u2026\u200b()</code></a></p></td> 
+           <td class="tableblock halign-left valign-top"></td> 
+           <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td> 
+           <td class="tableblock halign-left valign-top"></td> 
+           <td class="tableblock halign-left valign-top"></td> 
+           <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td> 
+           <td class="tableblock halign-left valign-top">
+            <div>
+             <div class="paragraph"> 
+              <p>Provide list of choices for a property or action parameter.<br></p> 
+             </div> 
+             <div class="paragraph"> 
+              <p>See also <a href="#_rgcms_methods_prefixes_autoComplete"><code>autoComplete\u2026\u200b()</code></a>.</p> 
+             </div>
+            </div></td> 
+          </tr> 
+          <tr> 
+           <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_clear"><code>clear\u2026\u200b()</code></a></p></td> 
+           <td class="tableblock halign-left valign-top"></td> 
+           <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td> 
+           <td class="tableblock halign-left valign-top"></td> 
+           <td class="tableblock halign-left valign-top"></td> 
+           <td class="tableblock halign-left valign-top"></td> 
+           <td class="tableblock halign-left valign-top">
+            <div>
+             <div class="paragraph"> 
+              <p>Clear a property (set it to null).<br></p> 
+             </div> 
+             <div class="paragraph"> 
+              <p>Allows business logic to be placed apart from the setter.<br></p> 
+             </div> 
+             <div class="paragraph"> 
+              <p>See also <a href="#_rgcms_methods_prefixes_modify"><code>modify\u2026\u200b()</code></a></p> 
+             </div>
+            </div></td> 
+          </tr> 
+          <tr> 
+           <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_default"><code>default\u2026\u200b()</code></a></p></td> 
+           <td class="tableblock halign-left valign-top"></td> 
+           <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td> 
+           <td class="tableblock halign-left valign-top"></td> 
+           <td class="tableblock halign-left valign-top"></td> 
+           <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td> 
+           <td class="tableblock halign-left valign-top">
+            <div>
+             <div class="paragraph"> 
+              <p>Default value for a property or an action parameter.</p> 
+             </div>
+            </div></td> 
+          </tr> 
+          <tr> 
+           <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_disable"><code>disable\u2026\u200b()</code></a></p></td> 
+           <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td> 
+           <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td> 
+           <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td> 
+           <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td> 
+           <td class="tableblock halign-left valign-top"></td> 
+           <td class="tableblock halign-left valign-top">
+            <div>
+             <div class="paragraph"> 
+              <p>Disables (makes read-only) a property, a collection or an action.</p> 
+             </div>
+            </div></td> 
+          </tr> 
+          <tr> 
+           <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_get"><code>get\u2026\u200b()</code></a></p></td> 
+           <td class="tableblock halign-left valign-top"></td> 
+           <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td> 
+           <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td> 
+           <td class="tableblock halign-left valign-top"></td> 
+           <td class="tableblock halign-left valign-top"></td> 
+           <td class="tableblock halign-left valign-top">
+            <div>
+             <div class="paragraph"> 
+              <p>Access the value of a property or collection.<br></p> 
+             </div> 
+             <div class="paragraph"> 
+              <p>See also <a href="#_rgcms_methods_prefixes_set"><code>set\u2026\u200b()</code></a>.</p> 
+             </div>
+            </div></td> 
+          </tr> 
+          <tr> 
+           <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_hide"><code>hide\u2026\u200b()</code></a></p></td> 
+           <td class="tableblock halign-left valign-top"></td> 
+           <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td> 
+           <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td> 
+           <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td> 
+           <td class="tableblock halign-left valign-top"></td> 
+           <td class="tableblock halign-left valign-top">
+            <div>
+             <div class="paragraph"> 
+              <p>Hides a property, a collection or an action.</p> 
+             </div>
+            </div></td> 
+          </tr> 
+          <tr> 
+           <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_modify"><code>modify\u2026\u200b()</code></a></p></td> 
+           <td class="tableblock halign-left valign-top"></td> 
+           <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td> 
+           <td class="tableblock halign-left valign-top"></td> 
+           <td class="tableblock halign-left valign-top"></td> 
+           <td class="tableblock halign-left valign-top"></td> 
+           <td class="tableblock halign-left valign-top">
+            <div>
+             <div class="paragraph"> 
+              <p>Modify a property (set it to a non-null) value.<br></p> 
+             </div> 
+             <div class="paragraph"> 
+              <p>Allows business logic to be placed apart from the setter.<br></p> 
+             </div> 
+             <div class="paragraph"> 
+              <p>See also <a href="#_rgcms_methods_prefixes_clear"><code>clear\u2026\u200b()</code></a>`.</p> 
+             </div>
+            </div></td> 
+          </tr> 
+          <tr> 
+           <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_removeFrom"><code>removeFrom\u2026\u200b()</code></a></p></td> 
+           <td class="tableblock halign-left valign-top"></td> 
+           <td class="tableblock halign-left valign-top"></td> 
+           <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td> 
+           <td class="tableblock halign-left valign-top"></td> 
+           <td class="tableblock halign-left valign-top"></td> 
+           <td class="tableblock halign-left valign-top">
+            <div>
+             <div class="paragraph"> 
+              <p>remove object from a collection.<br></p> 
+             </div> 
+             <div class="admonitionblock note"> 
+              <table> 
+               <tbody>
+                <tr> 
+                 <td class="icon"> <i class="fa icon-note" title="Note"></i> </td> 
+                 <td class="content"> 
+                  <div class="paragraph"> 
+                   <p>Directly mutable collections are not currently supported by the <a href="ugvw.html">Wicket viewer</a>.</p> 
+                  </div> </td> 
+                </tr> 
+               </tbody>
+              </table> 
+             </div> 
+             <div class="paragraph"> 
+              <p>See also <a href="#_rgcms_methods_prefixes_addTo"><code>addTo\u2026\u200b()</code></a>`</p> 
+             </div>
+            </div></td> 
+          </tr> 
+          <tr> 
+           <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_set"><code>set\u2026\u200b()</code></a></p></td> 
+           <td class="tableblock halign-left valign-top"></td> 
+           <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td> 
+           <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td> 
+           <td class="tableblock halign-left valign-top"></td> 
+           <td class="tableblock halign-left valign-top"></td> 
+           <td class="tableblock halign-left valign-top">
+            <div>
+             <div class="paragraph"> 
+              <p>Sets the value of a property or a collection.</p> 
+             </div>
+            </div></td> 
+          </tr> 
+          <tr> 
+           <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_validate"><code>validate\u2026\u200b()</code></a></p></td> 
+           <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td> 
+           <td class="tableblock halign-left valign-top"></td> 
+           <td class="tableblock halign-left valign-top"></td> 
+           <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td> 
+           <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td> 
+           <td class="tableblock halign-left valign-top">
+            <div>
+             <div class="paragraph"> 
+              <p>Check that a proposed value of a property or a set of action parameters or a single action parameter is valid.<br></p> 
+             </div> 
+             <div class="paragraph"> 
+              <p>See also <a href="#_rgcms_methods_prefixes_validateAddTo"><code>validateAddTo\u2026\u200b()</code></a> and <a href="#_rgcms_methods_prefixes_validateRemoveFrom"><code>validateRemoveFrom\u2026\u200b()</code></a> to validate modifications to collections.</p> 
+             </div>
+            </div></td> 
+          </tr> 
+          <tr> 
+           <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_validateAddTo"><code>validate<br> AddTo\u2026\u200b()</code></a></p></td> 
+           <td class="tableblock halign-left valign-top"></td> 
+           <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td> 
+           <td class="tableblock halign-left valign-top"></td> 
+           <td class="tableblock halign-left valign-top"></td> 
+           <td class="tableblock halign-left valign-top"></td> 
+           <td class="tableblock halign-left valign-top">
+            <div>
+             <div class="paragraph"> 
+              <p>Check that a proposed object to add to a collection is valid.<br></p> 
+             </div> 
+             <div class="admonitionblock note"> 
+              <table> 
+               <tbody>
+                <tr> 
+                 <td class="icon"> <i class="fa icon-note" title="Note"></i> </td> 
+                 <td class="content"> 
+                  <div class="paragraph"> 
+                   <p>Directly mutable collections are not currently supported by the <a href="ugvw.html">Wicket viewer</a>.</p> 
+                  </div> </td> 
+                </tr> 
+               </tbody>
+              </table> 
+             </div> 
+             <div class="paragraph"> 
+              <p>See also <a href="#_rgcms_methods_prefixes_validateRemoveFrom"><code>validateRemoveFrom\u2026\u200b()</code></a>, and <a href="#_rgcms_methods_prefixes_validate"><code>validate\u2026\u200b()</code></a> for properties and actions.</p> 
+             </div>
+            </div></td> 
+          </tr> 
+          <tr> 
+           <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgcms_methods_prefixes_validateRemoveFrom"><code>validate<br> RemoveFrom\u2026\u200b()</code></a></p></td> 
+           <td class="tableblock halign-left valign-top"></td> 
+           <td class="tableblock halign-left valign-top"><p class="tableblock">Y</p></td> 
+           <td class="tableblock halign-left valign-top"></td> 
+           <td class="tableblock halign-left valign-top"></td> 
+           <td class="tableblock halign-left valign-top"></td> 
+           <td class="tableblock halign-left valign-top">
+            <div>
+             <div class="paragraph"> 
+              <p>Check that a proposed object to remove from a collection is valid.<br></p> 
+             </div> 
+             <div class="admonitionblock note"> 
+              <table> 
+               <tbody>
+                <tr> 
+                 <td class="icon"> <i class="fa icon-note" title="Note"></i> </td> 
+                 <td class="content"> 
+                  <div class="paragraph"> 
+                   <p>Directly mutable collections are not currently supported by the <a href="ugvw.html">Wicket viewer</a>.</p> 
+                  </div> </td> 
+                </tr> 
+               </tbody>
+              </table> 
+             </div> 
+             <div class="paragraph"> 
+              <p>See also <a href="#_rgcms_methods_prefixes_validateAddTo"><code>validateAddTo\u2026\u200b()</code></a>, and <a href="#_rgcms_methods_prefixes_validate"><code>validate\u2026\u200b()</code></a> for properties and actions.</p> 
+             </div>
+            </div></td> 
+          </tr> 
+         </tbody> 
+        </table> 
+        <div class="sect3"> 
+         <h4 id="_rgcms_methods_prefixes_addTo">2.1.1. <code>addTo\u2026\u200b()</code></h4> 
+         <div class="paragraph"> 
+          <p>The <code>addTo\u2026\u200b()</code> supporting method is called whenever an object is added to a collection. Its purpose is to allow additional business logic to be performed.</p> 
+         </div> 
+         <div class="admonitionblock note"> 
+          <table> 
+           <tbody>
+            <tr> 
+             <td class="icon"> <i class="fa icon-note" title="Note"></i> </td> 
+             <td class="content"> 
+              <div class="paragraph"> 
+               <p>Directly mutable collections are not currently supported by the <a href="ugvw.html">Wicket viewer</a>. The suggested workaround is to simply define an action.</p> 
+              </div> </td> 
+            </tr> 
+           </tbody>
+          </table> 
+         </div> 
+         <div class="paragraph"> 
+          <p>For example:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">LibraryMember</span> {
     <span class="directive">public</span> <span class="predefined-type">SortedSet</span>&lt;<span class="predefined-type">Book</span>&gt; getBorrowed() { ... }
     <span class="directive">public</span> <span class="type">void</span> setBorrowed(<span class="predefined-type">SortedSet</span>&lt;<span class="predefined-type">Book</span>&gt; borrowed) { ... }
     <span class="directive">public</span> <span class="type">void</span> addToBorrowed(<span class="predefined-type">Book</span> book) {
@@ -937,66 +895,67 @@ RemoveFrom&#8230;&#8203;()</code></a></p></td>
     }
     <span class="directive">public</span> <span class="type">void</span> removeFromBorrowed(<span class="predefined-type">Book</span> book) { ... }
     ...
-}</code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td>update the collection</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="2"></i><b>2</b></td>
-<td>perform some additional business logic</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>See also <a href="#_rgcms_methods_prefixes_removeFrom"><code>removeFrom&#8230;&#8203;()</code></a>`</p>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_rgcms_methods_prefixes_autoComplete">2.1.2. <code>autoComplete&#8230;&#8203;()</code></h4>
-<div class="paragraph">
-<p>The <code>autoComplete&#8230;&#8203;()</code> supporting method is called for action parameters and for properties to find objects from a drop-down list box.  The use case is when the number of candidate objects is expected to be large, so the user is required to enter some characters to narrow the search down.</p>
-</div>
-<div class="admonitionblock tip">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-tip" title="Tip"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>If the number of candidate objects is comparatively small, then use <a href="#_rgcms_methods_prefixes_choices"><code>choices&#8230;&#8203;()</code></a> supporting method instead.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>The signature of the supporting method depends on whether it is for a parameter or a property.</p>
-</div>
-<div class="sect4">
-<h5 id="_parameters">Parameters</h5>
-<div class="paragraph">
-<p>For an action parameter in (0-based) position <em>N</em>, and of type <code>T</code>, the signature is:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="predefined-type">List</span>&lt;T&gt; autoCompleteNXxx(<span class="predefined-type">String</span> search) { ... }</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>It is also valid to return <code>T[]</code>, a <code>Set&lt;T&gt;</code> or a <code>Collection&lt;T&gt;</code>.</p>
-</div>
-<div class="paragraph">
-<p>For example:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">ShoppingCartItem</span> {
+}</code></pre> 
+          </div> 
+         </div> 
+         <div class="colist arabic"> 
+          <table> 
+           <tbody>
+            <tr> 
+             <td><i class="conum" data-value="1"></i><b>1</b></td> 
+             <td>update the collection</td> 
+            </tr> 
+            <tr> 
+             <td><i class="conum" data-value="2"></i><b>2</b></td> 
+             <td>perform some additional business logic</td> 
+            </tr> 
+           </tbody>
+          </table> 
+         </div> 
+         <div class="paragraph"> 
+          <p>See also <a href="#_rgcms_methods_prefixes_removeFrom"><code>removeFrom\u2026\u200b()</code></a>`</p> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_rgcms_methods_prefixes_autoComplete">2.1.2. <code>autoComplete\u2026\u200b()</code></h4> 
+         <div class="paragraph"> 
+          <p>The <code>autoComplete\u2026\u200b()</code> supporting method is called for action parameters and for properties to find objects from a drop-down list box. The use case is when the number of candidate objects is expected to be large, so the user is required to enter some characters to narrow the search down.</p> 
+         </div> 
+         <div class="admonitionblock tip"> 
+          <table> 
+           <tbody>
+            <tr> 
+             <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td> 
+             <td class="content"> 
+              <div class="paragraph"> 
+               <p>If the number of candidate objects is comparatively small, then use <a href="#_rgcms_methods_prefixes_choices"><code>choices\u2026\u200b()</code></a> supporting method instead.</p> 
+              </div> </td> 
+            </tr> 
+           </tbody>
+          </table> 
+         </div> 
+         <div class="paragraph"> 
+          <p>The signature of the supporting method depends on whether it is for a parameter or a property.</p> 
+         </div> 
+         <div class="sect4"> 
+          <h5 id="_parameters">Parameters</h5> 
+          <div class="paragraph"> 
+           <p>For an action parameter in (0-based) position <em>N</em>, and of type <code>T</code>, the signature is:</p> 
+          </div> 
+          <div class="listingblock"> 
+           <div class="content"> 
+            <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="predefined-type">List</span>&lt;T&gt; autoCompleteNXxx(<span class="predefined-type">String</span> search) { ... }</code></pre> 
+           </div> 
+          </div> 
+          <div class="paragraph"> 
+           <p>It is also valid to return <code>T[]</code>, a <code>Set&lt;T&gt;</code> or a <code>Collection&lt;T&gt;</code>.</p> 
+          </div> 
+          <div class="paragraph"> 
+           <p>For example:</p> 
+          </div> 
+          <div class="listingblock"> 
+           <div class="content"> 
+            <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">ShoppingCartItem</span> {
     <span class="annotation">@Property</span>(editing=Editing.DISABLED)
     <span class="directive">public</span> Product getProduct() { ... }
     <span class="directive">public</span> <span class="type">void</span> setProduct(Product product) { ... }
@@ -1008,7 +967,7 @@ RemoveFrom&#8230;&#8203;()</code></a></p></td>
     <span class="annotation">@Action</span>(semantics=SemanticsOf.IDEMPOTENT)
     <span class="directive">public</span> ShoppingCartItem updateProduct(
         Product product,
-        <span class="annotation">@ParameterLayout</span>(named=<span class="string"><span class="delimiter">&quot;</span><span class="content">Quantity</span><span class="delimiter">&quot;</span></span>)
+        <span class="annotation">@ParameterLayout</span>(named=<span class="string"><span class="delimiter">"</span><span class="content">Quantity</span><span class="delimiter">"</span></span>)
         <span class="directive">final</span> <span class="type">int</span> quantity) {
         setProduct(product);
         setQuantity(quantity);
@@ -1019,41 +978,43 @@ RemoveFrom&#8230;&#8203;()</code></a></p></td>
         ...
     }
     ...
-}</code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td><code>product</code> is the 0th argument of the action.</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="2"></i><b>2</b></td>
-<td>the <a href="rgant.html#_rgant-MinLength"><code>@MinLength</code></a> annotation specifies the minimum number of characters that must be entered before a search is performed for matching objects</td>
-</tr>
-</table>
-</div>
-</div>
-<div class="sect4">
-<h5 id="_properties">Properties</h5>
-<div class="paragraph">
-<p>For a property of type <code>T</code>, the signature is:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="predefined-type">List</span>&lt;T&gt; autoCompleteXxx(<span class="predefined-type">String</span> search) { ... }</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>(As for action parameters) it is also valid to return <code>T[]</code>, a <code>Set&lt;T&gt;</code> or a <code>Collection&lt;T&gt;</code>.</p>
-</div>
-<div class="paragraph">
-<p>For example:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">ShoppingCartItem</span> {
+}</code></pre> 
+           </div> 
+          </div> 
+          <div class="colist arabic"> 
+           <table> 
+            <tbody>
+             <tr> 
+              <td><i class="conum" data-value="1"></i><b>1</b></td> 
+              <td><code>product</code> is the 0th argument of the action.</td> 
+             </tr> 
+             <tr> 
+              <td><i class="conum" data-value="2"></i><b>2</b></td> 
+              <td>the <a href="rgant.html#_rgant-MinLength"><code>@MinLength</code></a> annotation specifies the minimum number of characters that must be entered before a search is performed for matching objects</td> 
+             </tr> 
+            </tbody>
+           </table> 
+          </div> 
+         </div> 
+         <div class="sect4"> 
+          <h5 id="_properties">Properties</h5> 
+          <div class="paragraph"> 
+           <p>For a property of type <code>T</code>, the signature is:</p> 
+          </div> 
+          <div class="listingblock"> 
+           <div class="content"> 
+            <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="predefined-type">List</span>&lt;T&gt; autoCompleteXxx(<span class="predefined-type">String</span> search) { ... }</code></pre> 
+           </div> 
+          </div> 
+          <div class="paragraph"> 
+           <p>(As for action parameters) it is also valid to return <code>T[]</code>, a <code>Set&lt;T&gt;</code> or a <code>Collection&lt;T&gt;</code>.</p> 
+          </div> 
+          <div class="paragraph"> 
+           <p>For example:</p> 
+          </div> 
+          <div class="listingblock"> 
+           <div class="content"> 
+            <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">ShoppingCartItem</span> {
     <span class="directive">public</span> Product getProduct() { ... }
     <span class="directive">public</span> <span class="type">void</span> setProduct(Product product) { ... }
 
@@ -1063,43 +1024,45 @@ RemoveFrom&#8230;&#8203;()</code></a></p></td>
         ...
     }
     ...
-}</code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td>the <a href="rgant.html#_rgant-MinLength"><code>@MinLength</code></a> annotation specifies the minimum number of characters that must be entered before a search is performed for matching objects</td>
-</tr>
-</table>
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_rgcms_methods_prefixes_choices">2.1.3. <code>choices&#8230;&#8203;()</code></h4>
-<div class="paragraph">
-<p>The <code>choices&#8230;&#8203;()</code> supporting method is called for both action parameters and for properties, to find objects from a drop-down list box.  Unlike <a href="#_rgcms_methods_prefixes_autoComplete"><code>autoComplete&#8230;&#8203;()</code></a>, the use case is when the number of objects is comparatively small and can be selected from a drop-down without any additional filtering.</p>
-</div>
-<div class="paragraph">
-<p>The signature of the supporting method depends on whether it is for an action parameter or a property.</p>
-</div>
-<div class="sect4">
-<h5 id="_parameters_2">Parameters</h5>
-<div class="paragraph">
-<p>For an action parameter in (0-based) position <em>N</em>, and of type <code>T</code>, the signature is:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="predefined-type">Collection</span>&lt;T&gt; choicesNXxx() { ... }</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>For example:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">ShoppingCartItem</span> {
+}</code></pre> 
+           </div> 
+          </div> 
+          <div class="colist arabic"> 
+           <table> 
+            <tbody>
+             <tr> 
+              <td><i class="conum" data-value="1"></i><b>1</b></td> 
+              <td>the <a href="rgant.html#_rgant-MinLength"><code>@MinLength</code></a> annotation specifies the minimum number of characters that must be entered before a search is performed for matching objects</td> 
+             </tr> 
+            </tbody>
+           </table> 
+          </div> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_rgcms_methods_prefixes_choices">2.1.3. <code>choices\u2026\u200b()</code></h4> 
+         <div class="paragraph"> 
+          <p>The <code>choices\u2026\u200b()</code> supporting method is called for both action parameters and for properties, to find objects from a drop-down list box. Unlike <a href="#_rgcms_methods_prefixes_autoComplete"><code>autoComplete\u2026\u200b()</code></a>, the use case is when the number of objects is comparatively small and can be selected from a drop-down without any additional filtering.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>The signature of the supporting method depends on whether it is for an action parameter or a property.</p> 
+         </div> 
+         <div class="sect4"> 
+          <h5 id="_parameters_2">Parameters</h5> 
+          <div class="paragraph"> 
+           <p>For an action parameter in (0-based) position <em>N</em>, and of type <code>T</code>, the signature is:</p> 
+          </div> 
+          <div class="listingblock"> 
+           <div class="content"> 
+            <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="predefined-type">Collection</span>&lt;T&gt; choicesNXxx() { ... }</code></pre> 
+           </div> 
+          </div> 
+          <div class="paragraph"> 
+           <p>For example:</p> 
+          </div> 
+          <div class="listingblock"> 
+           <div class="content"> 
+            <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">ShoppingCartItem</span> {
     <span class="annotation">@Property</span>(editing=Editing.DISABLED)
     <span class="directive">public</span> Product getProduct() { ... }
     <span class="directive">public</span> <span class="type">void</span> setProduct(Product product) { ... }
@@ -1111,7 +1074,7 @@ RemoveFrom&#8230;&#8203;()</code></a></p></td>
     <span class="annotation">@Action</span>(semantics=SemanticsOf.IDEMPOTENT)
     <span class="directive">public</span> ShoppingCartItem updateProduct(
         Product product,
-        <span class="annotation">@ParameterLayout</span>(named=<span class="string"><span class="delimiter">&quot;</span><span class="content">Quantity</span><span class="delimiter">&quot;</span></span>)
+        <span class="annotation">@ParameterLayout</span>(named=<span class="string"><span class="delimiter">"</span><span class="content">Quantity</span><span class="delimiter">"</span></span>)
         <span class="directive">final</span> <span class="predefined-type">Integer</span> quantity) {
         setProduct(product);
         setQuantity(quantity);
@@ -1120,31 +1083,31 @@ RemoveFrom&#8230;&#8203;()</code></a></p></td>
         <span class="keyword">return</span> <span class="predefined-type">Arrays</span>.asList(<span class="integer">1</span>,<span class="integer">2</span>,<span class="integer">3</span>,<span class="integer">5</span>,<span class="integer">10</span>,<span class="integer">25</span>,<span class="integer">50</span>,<span class="integer">100</span>);
     }
     ...
-}</code></pre>
-</div>
-</div>
-<div class="sect5">
-<h6 id="_dependent_choices">Dependent Choices</h6>
-<div class="paragraph">
-<p>Action parameters also support the notion of dependent choices, whereby the list of choices is dependent upon the value of some other argument.</p>
-</div>
-<div class="paragraph">
-<p>An example can be found in the (non-ASF) <a href="http://github.com/isisaddons/isis-app-todoapp">Isis addons' todoapp</a>, whereby `ToDoItem`s are categorized and then can also be subcategorized:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/reference-methods/prefixes/choices/dependent.png"><img src="images/reference-methods/prefixes/choices/dependent.png" alt="dependent" width="800px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>This functionality is actually implemented as a <a href="ugfun.html#_ugfun_how-tos_contributed-members">contributed action</a>, so the code for this is:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@DomainService</span>(nature = NatureOfService.VIEW_CONTRIBUTIONS_ONLY)
+}</code></pre> 
+           </div> 
+          </div> 
+          <div class="sect5"> 
+           <h6 id="_dependent_choices">Dependent Choices</h6> 
+           <div class="paragraph"> 
+            <p>Action parameters also support the notion of dependent choices, whereby the list of choices is dependent upon the value of some other argument.</p> 
+           </div> 
+           <div class="paragraph"> 
+            <p>An example can be found in the (non-ASF) <a href="http://github.com/isisaddons/isis-app-todoapp">Isis addons' todoapp</a>, whereby `ToDoItem`s are categorized and then can also be subcategorized:</p> 
+           </div> 
+           <div class="imageblock"> 
+            <div class="content"> 
+             <a class="image" href="images/reference-methods/prefixes/choices/dependent.png"><img src="images/reference-methods/prefixes/choices/dependent.png" alt="dependent" width="800px"></a> 
+            </div> 
+           </div> 
+           <div class="paragraph"> 
+            <p>This functionality is actually implemented as a <a href="ugfun.html#_ugfun_how-tos_contributed-members">contributed action</a>, so the code for this is:</p> 
+           </div> 
+           <div class="listingblock"> 
+            <div class="content"> 
+             <pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@DomainService</span>(nature = NatureOfService.VIEW_CONTRIBUTIONS_ONLY)
 <span class="directive">public</span> <span class="type">class</span> <span class="class">UpdateCategoryContributions</span> ... {
     <span class="annotation">@ActionLayout</span>(
-            describedAs = <span class="string"><span class="delimiter">&quot;</span><span class="content">Update category and subcategory</span><span class="delimiter">&quot;</span></span>
+            describedAs = <span class="string"><span class="delimiter">"</span><span class="content">Update category and subcategory</span><span class="delimiter">"</span></span>
     )
     <span class="annotation">@Action</span>(semantics = SemanticsOf.IDEMPOTENT)
     <span class="directive">public</span> Categorized updateCategory(
@@ -1162,40 +1125,42 @@ RemoveFrom&#8230;&#8203;()</code></a></p></td>
         <span class="keyword">return</span> Subcategory.listFor(category);
     }
     ...
-}</code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td><code>ToDoItem</code> implements <code>Categorized</code></td>
-</tr>
-<tr>
-<td><i class="conum" data-value="2"></i><b>2</b></td>
-<td>subcategory is the 2-th argument (0-based)</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="3"></i><b>3</b></td>
-<td>the item contributed to</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="4"></i><b>4</b></td>
-<td>the category selected</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>Dependent choices are not restricted to enums, however.  Going back to the shopping cart example shown above, the choices for the <code>quantity</code> parameter could be dependent upon the selected <code>Product</code>:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">ShoppingCartItem</span> {
+}</code></pre> 
+            </div> 
+           </div> 
+           <div class="colist arabic"> 
+            <table> 
+             <tbody>
+              <tr> 
+               <td><i class="conum" data-value="1"></i><b>1</b></td> 
+               <td><code>ToDoItem</code> implements <code>Categorized</code></td> 
+              </tr> 
+              <tr> 
+               <td><i class="conum" data-value="2"></i><b>2</b></td> 
+               <td>subcategory is the 2-th argument (0-based)</td> 
+              </tr> 
+              <tr> 
+               <td><i class="conum" data-value="3"></i><b>3</b></td> 
+               <td>the item contributed to</td> 
+              </tr> 
+              <tr> 
+               <td><i class="conum" data-value="4"></i><b>4</b></td> 
+               <td>the category selected</td> 
+              </tr> 
+             </tbody>
+            </table> 
+           </div> 
+           <div class="paragraph"> 
+            <p>Dependent choices are not restricted to enums, however. Going back to the shopping cart example shown above, the choices for the <code>quantity</code> parameter could be dependent upon the selected <code>Product</code>:</p> 
+           </div> 
+           <div class="listingblock"> 
+            <div class="content"> 
+             <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">ShoppingCartItem</span> {
     ...
     <span class="annotation">@Action</span>(semantics=SemanticsOf.IDEMPOTENT)
     <span class="directive">public</span> ShoppingCartItem updateProduct(
         Product product,
-        <span class="annotation">@ParameterLayout</span>(named=<span class="string"><span class="delimiter">&quot;</span><span class="content">Quantity</span><span class="delimiter">&quot;</span></span>)
+        <span class="annotation">@ParameterLayout</span>(named=<span class="string"><span class="delimiter">"</span><span class="content">Quantity</span><span class="delimiter">"</span></span>)
         <span class="directive">final</span> <span class="predefined-type">Integer</span> quantity) {
         setProduct(product);
         setQuantity(quantity);
@@ -1204,56 +1169,58 @@ RemoveFrom&#8230;&#8203;()</code></a></p></td>
         <span class="keyword">return</span> productService.quantityChoicesFor(product);                 <i class="conum" data-value="1"></i><b>(1)</b>
     }
     ...
-}</code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td><code>productService</code> is a (fictitous) injected service that knows what the quantity choices should be for any given product</td>
-</tr>
-</table>
-</div>
-</div>
-</div>
-<div class="sect4">
-<h5 id="_properties_2">Properties</h5>
-<div class="paragraph">
-<p>For a property of type <code>T</code>, the signature is:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="predefined-type">Collection</span>&lt;T&gt; choicesXxx() { ... }</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>For example:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">ShoppingCartItem</span> {
+}</code></pre> 
+            </div> 
+           </div> 
+           <div class="colist arabic"> 
+            <table> 
+             <tbody>
+              <tr> 
+               <td><i class="conum" data-value="1"></i><b>1</b></td> 
+               <td><code>productService</code> is a (fictitous) injected service that knows what the quantity choices should be for any given product</td> 
+              </tr> 
+             </tbody>
+            </table> 
+           </div> 
+          </div> 
+         </div> 
+         <div class="sect4"> 
+          <h5 id="_properties_2">Properties</h5> 
+          <div class="paragraph"> 
+           <p>For a property of type <code>T</code>, the signature is:</p> 
+          </div> 
+          <div class="listingblock"> 
+           <div class="content"> 
+            <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="predefined-type">Collection</span>&lt;T&gt; choicesXxx() { ... }</code></pre> 
+           </div> 
+          </div> 
+          <div class="paragraph"> 
+           <p>For example:</p> 
+          </div> 
+          <div class="listingblock"> 
+           <div class="content"> 
+            <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">ShoppingCartItem</span> {
     <span class="directive">public</span> Product getProduct() { ... }
     <span class="directive">public</span> <span class="type">void</span> setProduct(Product product) { ... }
 
     <span class="directive">public</span> <span class="predefined-type">Collection</span>&lt;Product&gt; choicesProduct() {
         ...
-    }</code></pre>
-</div>
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_rgcms_methods_prefixes_clear">2.1.4. <code>clear&#8230;&#8203;()</code></h4>
-<div class="paragraph">
-<p>The <code>clear&#8230;&#8203;()</code> supporting method is called&#8201;&#8212;&#8201;instead of the setter&#8201;&#8212;&#8201;whenever an (optional) property is to be set to <code>null</code>.  Its purpose is to allow additional business logic to be performed.</p>
-</div>
-<div class="paragraph">
-<p>For example:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">LibraryMember</span> {
+    }</code></pre> 
+           </div> 
+          </div> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_rgcms_methods_prefixes_clear">2.1.4. <code>clear\u2026\u200b()</code></h4> 
+         <div class="paragraph"> 
+          <p>The <code>clear\u2026\u200b()</code> supporting method is called\u2009\u2014\u2009instead of the setter\u2009\u2014\u2009whenever an (optional) property is to be set to <code>null</code>. Its purpose is to allow additional business logic to be performed.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>For example:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">LibraryMember</span> {
     <span class="directive">public</span> Title getFavoriteTitle() { ... }
     <span class="directive">public</span> <span class="type">void</span> setFavoriteTitle(Title title) { ... }
     <span class="directive">public</span> <span class="type">void</span> modifyFavoriteTitle(Title title) { ... }
@@ -1263,52 +1230,54 @@ RemoveFrom&#8230;&#8203;()</code></a></p></td>
         titleFavoritesService.decrement(title);         <i class="conum" data-value="2"></i><b>(2)</b>
     }
     ...
-}</code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td>update the property</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="2"></i><b>2</b></td>
-<td>perform some additional business logic</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>See also <a href="#_rgcms_methods_prefixes_modify"><code>modify&#8230;&#8203;()</code></a>`</p>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_rgcms_methods_prefixes_default">2.1.5. <code>default&#8230;&#8203;()</code></h4>
-<div class="paragraph">
-<p>The <code>default&#8230;&#8203;()</code> supporting method is called for action parameters to return the initial argument value.  This may be some sensible default (eg today&#8217;s date, or 0 or 1), or&#8201;&#8212;&#8201;for an action that is modifying the state of an object&#8201;&#8212;&#8201;might default to the current value of a corresponding property.</p>
-</div>
-<div class="paragraph">
-<p>The method is <em>also</em> called for properties in the case when an object is newly instantiated using <a href="rgsvc.html#_rgsvc_api_DomainObjectContainer"><code>DomainObjectContainer#newTransientInstance(&#8230;&#8203;)</code></a>.  This is a much less common use case.  If a default is not specified then properties are initialized to a default based on their type (eg 0 or <code>false</code>).</p>
-</div>
-<div class="paragraph">
-<p>The signature of the supporting method depends on whether it is for an action parameter or a property.</p>
-</div>
-<div class="sect4">
-<h5 id="_parameters_3">Parameters</h5>
-<div class="paragraph">
-<p>For an action parameter in (0-based position n), and of type <code>T</code>, the signature is:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> T defaultNXxx() { ... }</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>For example:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">ShoppingCartItem</span> {
+}</code></pre> 
+          </div> 
+         </div> 
+         <div class="colist arabic"> 
+          <table> 
+           <tbody>
+            <tr> 
+             <td><i class="conum" data-value="1"></i><b>1</b></td> 
+             <td>update the property</td> 
+            </tr> 
+            <tr> 
+             <td><i class="conum" data-value="2"></i><b>2</b></td> 
+             <td>perform some additional business logic</td> 
+            </tr> 
+           </tbody>
+          </table> 
+         </div> 
+         <div class="paragraph"> 
+          <p>See also <a href="#_rgcms_methods_prefixes_modify"><code>modify\u2026\u200b()</code></a>`</p> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_rgcms_methods_prefixes_default">2.1.5. <code>default\u2026\u200b()</code></h4> 
+         <div class="paragraph"> 
+          <p>The <code>default\u2026\u200b()</code> supporting method is called for action parameters to return the initial argument value. This may be some sensible default (eg today\u2019s date, or 0 or 1), or\u2009\u2014\u2009for an action that is modifying the state of an object\u2009\u2014\u2009might default to the current value of a corresponding property.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>The method is <em>also</em> called for properties in the case when an object is newly instantiated using <a href="rgsvc.html#_rgsvc_api_DomainObjectContainer"><code>DomainObjectContainer#newTransientInstance(\u2026\u200b)</code></a>. This is a much less common use case. If a default is not specified then properties are initialized to a default based on their type (eg 0 or <code>false</code>).</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>The signature of the supporting method depends on whether it is for an action parameter or a property.</p> 
+         </div> 
+         <div class="sect4"> 
+          <h5 id="_parameters_3">Parameters</h5> 
+          <div class="paragraph"> 
+           <p>For an action parameter in (0-based position n), and of type <code>T</code>, the signature is:</p> 
+          </div> 
+          <div class="listingblock"> 
+           <div class="content"> 
+            <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> T defaultNXxx() { ... }</code></pre> 
+           </div> 
+          </div> 
+          <div class="paragraph"> 
+           <p>For example:</p> 
+          </div> 
+          <div class="listingblock"> 
+           <div class="content"> 
+            <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">ShoppingCartItem</span> {
     <span class="annotation">@Property</span>(editing=Editing.DISABLED)
     <span class="directive">public</span> Product getProduct() { ... }
     <span class="directive">public</span> <span class="type">void</span> setProduct(Product product) { ... }
@@ -1320,7 +1289,7 @@ RemoveFrom&#8230;&#8203;()</code></a></p></td>
     <span class="annotation">@Action</span>(semantics=SemanticsOf.IDEMPOTENT)
     <span class="directive">public</span> ShoppingCartItem updateProduct(
         Product product,
-        <span class="annotation">@ParameterLayout</span>(named=<span class="string"><span class="delimiter">&quot;</span><span class="content">Quantity</span><span class="delimiter">&quot;</span></span>)
+        <span class="annotation">@ParameterLayout</span>(named=<span class="string"><span class="delimiter">"</span><span class="content">Quantity</span><span class="delimiter">"</span></span>)
         <span class="directive">final</span> <span class="predefined-type">Integer</span> quantity) {
         setProduct(product);
         setQuantity(quantity);
@@ -1332,30 +1301,32 @@ RemoveFrom&#8230;&#8203;()</code></a></p></td>
         <span class="keyword">return</span> getQuantity();
     }
     ...
-}</code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td>default the 0-th parameter using the current value of the <code>product</code> property</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="2"></i><b>2</b></td>
-<td>default the 1-th parameter using the current value of the <code>quantity</code> property</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>Defaults are also supported (of course) for <a href="ugfun.html#_ugfun_how-tos_contributed-members">contributed actions</a>.  For example, here is a contributed action for updating category/subcategory of the (non-ASF) <a href="http://github.com/isisaddons/isis-app-todoapp">Isis addons' todoapp</a>:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@DomainService</span>(nature = NatureOfService.VIEW_CONTRIBUTIONS_ONLY)
+}</code></pre> 
+           </div> 
+          </div> 
+          <div class="colist arabic"> 
+           <table> 
+            <tbody>
+             <tr> 
+              <td><i class="conum" data-value="1"></i><b>1</b></td> 
+              <td>default the 0-th parameter using the current value of the <code>product</code> property</td> 
+             </tr> 
+             <tr> 
+              <td><i class="conum" data-value="2"></i><b>2</b></td> 
+              <td>default the 1-th parameter using the current value of the <code>quantity</code> property</td> 
+             </tr> 
+            </tbody>
+           </table> 
+          </div> 
+          <div class="paragraph"> 
+           <p>Defaults are also supported (of course) for <a href="ugfun.html#_ugfun_how-tos_contributed-mem

<TRUNCATED>

[36/44] isis-site git commit: ISIS-1594: provide an 'edit' button

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/guides/rgant.pdf
----------------------------------------------------------------------
diff --git a/content/guides/rgant.pdf b/content/guides/rgant.pdf
index 48cfdf6..723307c 100644
--- a/content/guides/rgant.pdf
+++ b/content/guides/rgant.pdf
@@ -4,16 +4,16 @@
 << /Title (Annotations)
 /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:20170219154905+00'00')
-/ModDate (D:20170219154905+00'00')
+/CreationDate (D:20170307233833+00'00')
+/ModDate (D:20170307233833+00'00')
 >>
 endobj
 2 0 obj
 << /Type /Catalog
 /Pages 3 0 R
 /Names 20 0 R
-/Outlines 2146 0 R
-/PageLabels 2304 0 R
+/Outlines 2145 0 R
+/PageLabels 2303 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 178
-/Kids [7 0 R 10 0 R 12 0 R 14 0 R 16 0 R 18 0 R 42 0 R 45 0 R 66 0 R 81 0 R 105 0 R 146 0 R 170 0 R 205 0 R 228 0 R 249 0 R 273 0 R 289 0 R 292 0 R 294 0 R 308 0 R 317 0 R 330 0 R 336 0 R 345 0 R 351 0 R 354 0 R 367 0 R 376 0 R 385 0 R 389 0 R 393 0 R 397 0 R 418 0 R 426 0 R 433 0 R 440 0 R 457 0 R 468 0 R 476 0 R 493 0 R 501 0 R 507 0 R 516 0 R 531 0 R 537 0 R 540 0 R 556 0 R 563 0 R 570 0 R 574 0 R 587 0 R 602 0 R 613 0 R 629 0 R 640 0 R 651 0 R 658 0 R 664 0 R 666 0 R 674 0 R 679 0 R 688 0 R 690 0 R 695 0 R 710 0 R 714 0 R 732 0 R 756 0 R 765 0 R 768 0 R 781 0 R 794 0 R 799 0 R 803 0 R 809 0 R 813 0 R 816 0 R 822 0 R 826 0 R 833 0 R 844 0 R 848 0 R 864 0 R 873 0 R 885 0 R 889 0 R 899 0 R 904 0 R 910 0 R 913 0 R 933 0 R 939 0 R 946 0 R 963 0 R 973 0 R 979 0 R 995 0 R 1005 0 R 1019 0 R 1031 0 R 1043 0 R 1049 0 R 1055 0 R 1065 0 R 1070 0 R 1080 0 R 1087 0 R 1097 0 R 1103 0 R 1109 0 R 1120 0 R 1124 0 R 1133 0 R 1136 0 R 1142 0 R 1146 0 R 1158 0 R 1164 0 R 1167 0 R 1173 0 R 1183 0 R 1
 191 0 R 1193 0 R 1202 0 R 1206 0 R 1212 0 R 1222 0 R 1230 0 R 1238 0 R 1242 0 R 1247 0 R 1249 0 R 1263 0 R 1276 0 R 1286 0 R 1300 0 R 1308 0 R 1313 0 R 1326 0 R 1332 0 R 1343 0 R 1347 0 R 1357 0 R 1364 0 R 1369 0 R 1387 0 R 1394 0 R 1406 0 R 1408 0 R 1413 0 R 1426 0 R 1433 0 R 1441 0 R 1446 0 R 1452 0 R 1459 0 R 1462 0 R 1465 0 R 1470 0 R 1485 0 R 1500 0 R 1514 0 R 1530 0 R 1536 0 R 1549 0 R 1558 0 R 1560 0 R 1566 0 R 1571 0 R 1573 0 R 1580 0 R 1597 0 R 1614 0 R 1633 0 R 1644 0 R 1649 0 R 1664 0 R]
+/Kids [7 0 R 10 0 R 12 0 R 14 0 R 16 0 R 18 0 R 42 0 R 45 0 R 66 0 R 81 0 R 105 0 R 146 0 R 170 0 R 205 0 R 228 0 R 249 0 R 273 0 R 289 0 R 292 0 R 294 0 R 308 0 R 316 0 R 329 0 R 335 0 R 344 0 R 350 0 R 353 0 R 366 0 R 375 0 R 384 0 R 388 0 R 392 0 R 396 0 R 417 0 R 425 0 R 432 0 R 439 0 R 456 0 R 467 0 R 475 0 R 492 0 R 500 0 R 506 0 R 515 0 R 530 0 R 536 0 R 539 0 R 555 0 R 562 0 R 569 0 R 573 0 R 586 0 R 601 0 R 612 0 R 628 0 R 639 0 R 650 0 R 657 0 R 663 0 R 665 0 R 673 0 R 678 0 R 687 0 R 689 0 R 694 0 R 709 0 R 713 0 R 731 0 R 755 0 R 764 0 R 767 0 R 780 0 R 793 0 R 798 0 R 802 0 R 808 0 R 812 0 R 815 0 R 821 0 R 825 0 R 832 0 R 843 0 R 847 0 R 863 0 R 872 0 R 884 0 R 888 0 R 898 0 R 903 0 R 909 0 R 912 0 R 932 0 R 938 0 R 945 0 R 962 0 R 972 0 R 978 0 R 994 0 R 1004 0 R 1018 0 R 1030 0 R 1042 0 R 1048 0 R 1054 0 R 1064 0 R 1069 0 R 1079 0 R 1086 0 R 1096 0 R 1102 0 R 1108 0 R 1119 0 R 1123 0 R 1132 0 R 1135 0 R 1141 0 R 1145 0 R 1157 0 R 1163 0 R 1166 0 R 1172 0 R 1182 0 R 1
 190 0 R 1192 0 R 1201 0 R 1205 0 R 1211 0 R 1221 0 R 1229 0 R 1237 0 R 1241 0 R 1246 0 R 1248 0 R 1262 0 R 1275 0 R 1285 0 R 1299 0 R 1307 0 R 1312 0 R 1325 0 R 1331 0 R 1342 0 R 1346 0 R 1356 0 R 1363 0 R 1368 0 R 1386 0 R 1393 0 R 1405 0 R 1407 0 R 1412 0 R 1425 0 R 1432 0 R 1440 0 R 1445 0 R 1451 0 R 1458 0 R 1461 0 R 1464 0 R 1469 0 R 1484 0 R 1499 0 R 1513 0 R 1529 0 R 1535 0 R 1548 0 R 1557 0 R 1559 0 R 1565 0 R 1570 0 R 1572 0 R 1579 0 R 1596 0 R 1613 0 R 1632 0 R 1643 0 R 1648 0 R 1663 0 R]
 >>
 endobj
 4 0 obj
@@ -78,13 +78,13 @@ endobj
 endobj
 8 0 obj
 << /Type /Font
-/BaseFont /AAAAAR+NotoSerif
+/BaseFont /AAAAAP+NotoSerif
 /Subtype /TrueType
-/FontDescriptor 2306 0 R
+/FontDescriptor 2305 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 2308 0 R
-/ToUnicode 2307 0 R
+/Widths 2307 0 R
+/ToUnicode 2306 0 R
 >>
 endobj
 9 0 obj
@@ -1937,7 +1937,7 @@ endobj
 /F3.0 40 0 R
 >>
 >>
-/Annots [1670 0 R 1671 0 R 1672 0 R 1673 0 R 1674 0 R 1675 0 R 1676 0 R 1677 0 R 1678 0 R 1679 0 R 1680 0 R 1681 0 R 1682 0 R 1683 0 R 1684 0 R 1685 0 R 1686 0 R 1687 0 R 1688 0 R 1689 0 R 1690 0 R 1691 0 R 1692 0 R 1693 0 R 1694 0 R 1695 0 R 1696 0 R 1697 0 R 1698 0 R 1699 0 R 1700 0 R 1701 0 R 1702 0 R 1703 0 R 1704 0 R 1705 0 R 1706 0 R 1707 0 R 1708 0 R 1709 0 R 1710 0 R 1711 0 R 1712 0 R 1713 0 R 1714 0 R 1715 0 R 1716 0 R 1717 0 R 1718 0 R 1719 0 R 1720 0 R 1721 0 R 1722 0 R 1723 0 R 1724 0 R 1725 0 R 1726 0 R 1727 0 R 1728 0 R 1729 0 R 1730 0 R 1731 0 R 1732 0 R 1733 0 R 1734 0 R 1735 0 R 1736 0 R 1737 0 R 1738 0 R 1739 0 R 1740 0 R 1741 0 R 1742 0 R 1743 0 R 1744 0 R 1745 0 R 1746 0 R 1747 0 R 1748 0 R 1749 0 R 1750 0 R 1751 0 R 1752 0 R 1753 0 R 1754 0 R 1755 0 R 1756 0 R 1757 0 R 1758 0 R 1759 0 R 1760 0 R 1761 0 R 1762 0 R 1763 0 R 1764 0 R 1765 0 R 1766 0 R 1767 0 R 1768 0 R 1769 0 R 1770 0 R 1771 0 R 1772 0 R]
+/Annots [1669 0 R 1670 0 R 1671 0 R 1672 0 R 1673 0 R 1674 0 R 1675 0 R 1676 0 R 1677 0 R 1678 0 R 1679 0 R 1680 0 R 1681 0 R 1682 0 R 1683 0 R 1684 0 R 1685 0 R 1686 0 R 1687 0 R 1688 0 R 1689 0 R 1690 0 R 1691 0 R 1692 0 R 1693 0 R 1694 0 R 1695 0 R 1696 0 R 1697 0 R 1698 0 R 1699 0 R 1700 0 R 1701 0 R 1702 0 R 1703 0 R 1704 0 R 1705 0 R 1706 0 R 1707 0 R 1708 0 R 1709 0 R 1710 0 R 1711 0 R 1712 0 R 1713 0 R 1714 0 R 1715 0 R 1716 0 R 1717 0 R 1718 0 R 1719 0 R 1720 0 R 1721 0 R 1722 0 R 1723 0 R 1724 0 R 1725 0 R 1726 0 R 1727 0 R 1728 0 R 1729 0 R 1730 0 R 1731 0 R 1732 0 R 1733 0 R 1734 0 R 1735 0 R 1736 0 R 1737 0 R 1738 0 R 1739 0 R 1740 0 R 1741 0 R 1742 0 R 1743 0 R 1744 0 R 1745 0 R 1746 0 R 1747 0 R 1748 0 R 1749 0 R 1750 0 R 1751 0 R 1752 0 R 1753 0 R 1754 0 R 1755 0 R 1756 0 R 1757 0 R 1758 0 R 1759 0 R 1760 0 R 1761 0 R 1762 0 R 1763 0 R 1764 0 R 1765 0 R 1766 0 R 1767 0 R 1768 0 R 1769 0 R 1770 0 R 1771 0 R]
 >>
 endobj
 11 0 obj
@@ -4063,7 +4063,7 @@ endobj
 /F3.0 40 0 R
 >>
 >>
-/Annots [1773 0 R 1774 0 R 1775 0 R 1776 0 R 1777 0 R 1778 0 R 1779 0 R 1780 0 R 1781 0 R 1782 0 R 1783 0 R 1784 0 R 1785 0 R 1786 0 R 1787 0 R 1788 0 R 1789 0 R 1790 0 R 1791 0 R 1792 0 R 1793 0 R 1794 0 R 1795 0 R 1796 0 R 1797 0 R 1798 0 R 1799 0 R 1800 0 R 1801 0 R 1802 0 R 1803 0 R 1804 0 R 1805 0 R 1806 0 R 1807 0 R 1808 0 R 1809 0 R 1810 0 R 1811 0 R 1812 0 R 1813 0 R 1814 0 R 1815 0 R 1816 0 R 1817 0 R 1818 0 R 1819 0 R 1820 0 R 1821 0 R 1822 0 R 1823 0 R 1824 0 R 1825 0 R 1826 0 R 1827 0 R 1828 0 R 1829 0 R 1830 0 R 1831 0 R 1832 0 R 1833 0 R 1834 0 R 1835 0 R 1836 0 R 1837 0 R 1838 0 R 1839 0 R 1840 0 R 1841 0 R 1842 0 R 1843 0 R 1844 0 R 1845 0 R 1846 0 R 1847 0 R 1848 0 R 1849 0 R 1850 0 R 1851 0 R 1852 0 R 1853 0 R 1854 0 R 1855 0 R 1856 0 R 1857 0 R 1858 0 R 1859 0 R 1860 0 R 1861 0 R 1862 0 R 1863 0 R 1864 0 R 1865 0 R 1866 0 R 1867 0 R 1868 0 R 1869 0 R 1870 0 R 1871 0 R 1872 0 R 1873 0 R 1874 0 R 1875 0 R 1876 0 R 1877 0 R 1878 0 R 1879 0 R 1880 0 R 1881 0 R 1882 0 
 R 1883 0 R 1884 0 R 1885 0 R 1886 0 R 1887 0 R 1888 0 R 1889 0 R 1890 0 R 1891 0 R 1892 0 R 1893 0 R 1894 0 R 1895 0 R 1896 0 R]
+/Annots [1772 0 R 1773 0 R 1774 0 R 1775 0 R 1776 0 R 1777 0 R 1778 0 R 1779 0 R 1780 0 R 1781 0 R 1782 0 R 1783 0 R 1784 0 R 1785 0 R 1786 0 R 1787 0 R 1788 0 R 1789 0 R 1790 0 R 1791 0 R 1792 0 R 1793 0 R 1794 0 R 1795 0 R 1796 0 R 1797 0 R 1798 0 R 1799 0 R 1800 0 R 1801 0 R 1802 0 R 1803 0 R 1804 0 R 1805 0 R 1806 0 R 1807 0 R 1808 0 R 1809 0 R 1810 0 R 1811 0 R 1812 0 R 1813 0 R 1814 0 R 1815 0 R 1816 0 R 1817 0 R 1818 0 R 1819 0 R 1820 0 R 1821 0 R 1822 0 R 1823 0 R 1824 0 R 1825 0 R 1826 0 R 1827 0 R 1828 0 R 1829 0 R 1830 0 R 1831 0 R 1832 0 R 1833 0 R 1834 0 R 1835 0 R 1836 0 R 1837 0 R 1838 0 R 1839 0 R 1840 0 R 1841 0 R 1842 0 R 1843 0 R 1844 0 R 1845 0 R 1846 0 R 1847 0 R 1848 0 R 1849 0 R 1850 0 R 1851 0 R 1852 0 R 1853 0 R 1854 0 R 1855 0 R 1856 0 R 1857 0 R 1858 0 R 1859 0 R 1860 0 R 1861 0 R 1862 0 R 1863 0 R 1864 0 R 1865 0 R 1866 0 R 1867 0 R 1868 0 R 1869 0 R 1870 0 R 1871 0 R 1872 0 R 1873 0 R 1874 0 R 1875 0 R 1876 0 R 1877 0 R 1878 0 R 1879 0 R 1880 0 R 1881 0 
 R 1882 0 R 1883 0 R 1884 0 R 1885 0 R 1886 0 R 1887 0 R 1888 0 R 1889 0 R 1890 0 R 1891 0 R 1892 0 R 1893 0 R 1894 0 R 1895 0 R]
 >>
 endobj
 13 0 obj
@@ -6310,7 +6310,7 @@ endobj
 /F3.0 40 0 R
 >>
 >>
-/Annots [1897 0 R 1898 0 R 1899 0 R 1900 0 R 1901 0 R 1902 0 R 1903 0 R 1904 0 R 1905 0 R 1906 0 R 1907 0 R 1908 0 R 1909 0 R 1910 0 R 1911 0 R 1912 0 R 1913 0 R 1914 0 R 1915 0 R 1916 0 R 1917 0 R 1918 0 R 1919 0 R 1920 0 R 1921 0 R 1922 0 R 1923 0 R 1924 0 R 1925 0 R 1926 0 R 1927 0 R 1928 0 R 1929 0 R 1930 0 R 1931 0 R 1932 0 R 1933 0 R 1934 0 R 1935 0 R 1936 0 R 1937 0 R 1938 0 R 1939 0 R 1940 0 R 1941 0 R 1942 0 R 1943 0 R 1944 0 R 1945 0 R 1946 0 R 1947 0 R 1948 0 R 1949 0 R 1950 0 R 1951 0 R 1952 0 R 1953 0 R 1954 0 R 1955 0 R 1956 0 R 1957 0 R 1958 0 R 1959 0 R 1960 0 R 1961 0 R 1962 0 R 1963 0 R 1964 0 R 1965 0 R 1966 0 R 1967 0 R 1968 0 R 1969 0 R 1970 0 R 1971 0 R 1972 0 R 1973 0 R 1974 0 R 1975 0 R 1976 0 R 1977 0 R 1978 0 R 1979 0 R 1980 0 R 1981 0 R 1982 0 R 1983 0 R 1984 0 R 1985 0 R 1986 0 R 1987 0 R 1988 0 R 1989 0 R 1990 0 R 1991 0 R 1992 0 R 1993 0 R 1994 0 R 1995 0 R 1996 0 R 1997 0 R 1998 0 R 1999 0 R 2000 0 R 2001 0 R 2002 0 R 2003 0 R 2004 0 R 2005 0 R 2006 0 
 R 2007 0 R 2008 0 R 2009 0 R 2010 0 R 2011 0 R 2012 0 R 2013 0 R 2014 0 R 2015 0 R 2016 0 R 2017 0 R 2018 0 R 2019 0 R 2020 0 R 2021 0 R 2022 0 R 2023 0 R 2024 0 R 2025 0 R 2026 0 R 2027 0 R 2028 0 R 2029 0 R 2030 0 R 2031 0 R]
+/Annots [1896 0 R 1897 0 R 1898 0 R 1899 0 R 1900 0 R 1901 0 R 1902 0 R 1903 0 R 1904 0 R 1905 0 R 1906 0 R 1907 0 R 1908 0 R 1909 0 R 1910 0 R 1911 0 R 1912 0 R 1913 0 R 1914 0 R 1915 0 R 1916 0 R 1917 0 R 1918 0 R 1919 0 R 1920 0 R 1921 0 R 1922 0 R 1923 0 R 1924 0 R 1925 0 R 1926 0 R 1927 0 R 1928 0 R 1929 0 R 1930 0 R 1931 0 R 1932 0 R 1933 0 R 1934 0 R 1935 0 R 1936 0 R 1937 0 R 1938 0 R 1939 0 R 1940 0 R 1941 0 R 1942 0 R 1943 0 R 1944 0 R 1945 0 R 1946 0 R 1947 0 R 1948 0 R 1949 0 R 1950 0 R 1951 0 R 1952 0 R 1953 0 R 1954 0 R 1955 0 R 1956 0 R 1957 0 R 1958 0 R 1959 0 R 1960 0 R 1961 0 R 1962 0 R 1963 0 R 1964 0 R 1965 0 R 1966 0 R 1967 0 R 1968 0 R 1969 0 R 1970 0 R 1971 0 R 1972 0 R 1973 0 R 1974 0 R 1975 0 R 1976 0 R 1977 0 R 1978 0 R 1979 0 R 1980 0 R 1981 0 R 1982 0 R 1983 0 R 1984 0 R 1985 0 R 1986 0 R 1987 0 R 1988 0 R 1989 0 R 1990 0 R 1991 0 R 1992 0 R 1993 0 R 1994 0 R 1995 0 R 1996 0 R 1997 0 R 1998 0 R 1999 0 R 2000 0 R 2001 0 R 2002 0 R 2003 0 R 2004 0 R 2005 0 
 R 2006 0 R 2007 0 R 2008 0 R 2009 0 R 2010 0 R 2011 0 R 2012 0 R 2013 0 R 2014 0 R 2015 0 R 2016 0 R 2017 0 R 2018 0 R 2019 0 R 2020 0 R 2021 0 R 2022 0 R 2023 0 R 2024 0 R 2025 0 R 2026 0 R 2027 0 R 2028 0 R 2029 0 R 2030 0 R]
 >>
 endobj
 15 0 obj
@@ -8207,7 +8207,7 @@ endobj
 /F3.0 40 0 R
 >>
 >>
-/Annots [2032 0 R 2033 0 R 2034 0 R 2035 0 R 2036 0 R 2037 0 R 2038 0 R 2039 0 R 2040 0 R 2041 0 R 2042 0 R 2043 0 R 2044 0 R 2045 0 R 2046 0 R 2047 0 R 2048 0 R 2049 0 R 2050 0 R 2051 0 R 2052 0 R 2053 0 R 2054 0 R 2055 0 R 2056 0 R 2057 0 R 2058 0 R 2059 0 R 2060 0 R 2061 0 R 2062 0 R 2063 0 R 2064 0 R 2065 0 R 2066 0 R 2067 0 R 2068 0 R 2069 0 R 2070 0 R 2071 0 R 2072 0 R 2073 0 R 2074 0 R 2075 0 R 2076 0 R 2077 0 R 2078 0 R 2079 0 R 2080 0 R 2081 0 R 2082 0 R 2083 0 R 2084 0 R 2085 0 R 2086 0 R 2087 0 R 2088 0 R 2089 0 R 2090 0 R 2091 0 R 2092 0 R 2093 0 R 2094 0 R 2095 0 R 2096 0 R 2097 0 R 2098 0 R 2099 0 R 2100 0 R 2101 0 R 2102 0 R 2103 0 R 2104 0 R 2105 0 R 2106 0 R 2107 0 R 2108 0 R 2109 0 R 2110 0 R 2111 0 R 2112 0 R 2113 0 R 2114 0 R 2115 0 R 2116 0 R 2117 0 R 2118 0 R 2119 0 R 2120 0 R 2121 0 R 2122 0 R 2123 0 R 2124 0 R 2125 0 R 2126 0 R 2127 0 R 2128 0 R 2129 0 R 2130 0 R 2131 0 R 2132 0 R 2133 0 R 2134 0 R 2135 0 R 2136 0 R 2137 0 R 2138 0 R 2139 0 R 2140 0 R 2141 0 
 R 2142 0 R 2143 0 R 2144 0 R]
+/Annots [2031 0 R 2032 0 R 2033 0 R 2034 0 R 2035 0 R 2036 0 R 2037 0 R 2038 0 R 2039 0 R 2040 0 R 2041 0 R 2042 0 R 2043 0 R 2044 0 R 2045 0 R 2046 0 R 2047 0 R 2048 0 R 2049 0 R 2050 0 R 2051 0 R 2052 0 R 2053 0 R 2054 0 R 2055 0 R 2056 0 R 2057 0 R 2058 0 R 2059 0 R 2060 0 R 2061 0 R 2062 0 R 2063 0 R 2064 0 R 2065 0 R 2066 0 R 2067 0 R 2068 0 R 2069 0 R 2070 0 R 2071 0 R 2072 0 R 2073 0 R 2074 0 R 2075 0 R 2076 0 R 2077 0 R 2078 0 R 2079 0 R 2080 0 R 2081 0 R 2082 0 R 2083 0 R 2084 0 R 2085 0 R 2086 0 R 2087 0 R 2088 0 R 2089 0 R 2090 0 R 2091 0 R 2092 0 R 2093 0 R 2094 0 R 2095 0 R 2096 0 R 2097 0 R 2098 0 R 2099 0 R 2100 0 R 2101 0 R 2102 0 R 2103 0 R 2104 0 R 2105 0 R 2106 0 R 2107 0 R 2108 0 R 2109 0 R 2110 0 R 2111 0 R 2112 0 R 2113 0 R 2114 0 R 2115 0 R 2116 0 R 2117 0 R 2118 0 R 2119 0 R 2120 0 R 2121 0 R 2122 0 R 2123 0 R 2124 0 R 2125 0 R 2126 0 R 2127 0 R 2128 0 R 2129 0 R 2130 0 R 2131 0 R 2132 0 R 2133 0 R 2134 0 R 2135 0 R 2136 0 R 2137 0 R 2138 0 R 2139 0 R 2140 0 
 R 2141 0 R 2142 0 R 2143 0 R]
 >>
 endobj
 17 0 obj
@@ -8930,7 +8930,7 @@ endobj
 /F1.0 8 0 R
 /F3.0 40 0 R
 >>
-/XObject << /Stamp1 2145 0 R
+/XObject << /Stamp1 2144 0 R
 >>
 >>
 /Annots [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 33 0 R 34 0 R 35 0 R 36 0 R 37 0 R 38 0 R]
@@ -8945,18 +8945,18 @@ endobj
 >>
 endobj
 21 0 obj
-<< /Kids [369 0 R 480 0 R 605 0 R 716 0 R 1034 0 R 835 0 R 1089 0 R 1189 0 R 1251 0 R 1349 0 R 1448 0 R 1554 0 R 1641 0 R 370 0 R 1007 0 R 683 0 R 894 0 R 1401 0 R]
+<< /Kids [368 0 R 479 0 R 604 0 R 715 0 R 1033 0 R 834 0 R 1088 0 R 1188 0 R 1250 0 R 1348 0 R 1447 0 R 1553 0 R 1640 0 R 369 0 R 1006 0 R 682 0 R 893 0 R 1400 0 R]
 >>
 endobj
 22 0 obj
 << /Type /Font
-/BaseFont /AAAAAS+NotoSerif-Bold
+/BaseFont /AAAAAQ+NotoSerif-Bold
 /Subtype /TrueType
-/FontDescriptor 2310 0 R
+/FontDescriptor 2309 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 2312 0 R
-/ToUnicode 2311 0 R
+/Widths 2311 0 R
+/ToUnicode 2310 0 R
 >>
 endobj
 23 0 obj
@@ -9129,13 +9129,13 @@ endobj
 endobj
 40 0 obj
 << /Type /Font
-/BaseFont /AAAAAT+mplus1mn-regular
+/BaseFont /AAAAAR+mplus1mn-regular
 /Subtype /TrueType
-/FontDescriptor 2314 0 R
+/FontDescriptor 2313 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 2316 0 R
-/ToUnicode 2315 0 R
+/Widths 2315 0 R
+/ToUnicode 2314 0 R
 >>
 endobj
 41 0 obj
@@ -9498,20 +9498,20 @@ endobj
 /F1.0 8 0 R
 /F4.0 43 0 R
 >>
-/XObject << /Stamp1 2145 0 R
+/XObject << /Stamp1 2144 0 R
 >>
 >>
 >>
 endobj
 43 0 obj
 << /Type /Font
-/BaseFont /AAAAAU+mplus-1p-regular
+/BaseFont /AAAAAS+mplus-1p-regular
 /Subtype /TrueType
-/FontDescriptor 2318 0 R
+/FontDescriptor 2317 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 2320 0 R
-/ToUnicode 2319 0 R
+/Widths 2319 0 R
+/ToUnicode 2318 0 R
 >>
 endobj
 44 0 obj
@@ -11890,7 +11890,7 @@ endobj
 /F5.1 48 0 R
 /F6.0 50 0 R
 >>
-/XObject << /Stamp1 2145 0 R
+/XObject << /Stamp1 2144 0 R
 >>
 >>
 /Annots [49 0 R 51 0 R 52 0 R 53 0 R 54 0 R 55 0 R 56 0 R 57 0 R 58 0 R 59 0 R 60 0 R 61 0 R 62 0 R 63 0 R 64 0 R]
@@ -11904,13 +11904,13 @@ endobj
 endobj
 48 0 obj
 << /Type /Font
-/BaseFont /AAAAAV+FontAwesome
+/BaseFont /AAAAAT+FontAwesome
 /Subtype /TrueType
-/FontDescriptor 2322 0 R
+/FontDescriptor 2321 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 2324 0 R
-/ToUnicode 2323 0 R
+/Widths 2323 0 R
+/ToUnicode 2322 0 R
 >>
 endobj
 49 0 obj
@@ -11926,13 +11926,13 @@ endobj
 endobj
 50 0 obj
 << /Type /Font
-/BaseFont /AAAAAW+NotoSerif-Italic
+/BaseFont /AAAAAU+NotoSerif-Italic
 /Subtype /TrueType
-/FontDescriptor 2326 0 R
+/FontDescriptor 2325 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 2328 0 R
-/ToUnicode 2327 0 R
+/Widths 2327 0 R
+/ToUnicode 2326 0 R
 >>
 endobj
 51 0 obj
@@ -13928,7 +13928,7 @@ endobj
 /F6.0 50 0 R
 /F5.1 48 0 R
 >>
-/XObject << /Stamp1 2145 0 R
+/XObject << /Stamp1 2144 0 R
 >>
 >>
 /Annots [67 0 R 68 0 R 69 0 R 70 0 R 72 0 R 73 0 R 74 0 R 75 0 R 76 0 R 77 0 R 78 0 R]
@@ -16250,7 +16250,7 @@ endobj
 /F2.0 22 0 R
 /F3.0 40 0 R
 >>
-/XObject << /Stamp1 2145 0 R
+/XObject << /Stamp1 2144 0 R
 >>
 >>
 /Annots [82 0 R 83 0 R 84 0 R 85 0 R 86 0 R 87 0 R 88 0 R 89 0 R 90 0 R 91 0 R 92 0 R 93 0 R 94 0 R 95 0 R 96 0 R 97 0 R 98 0 R 99 0 R 100 0 R 101 0 R 102 0 R 103 0 R]
@@ -18454,7 +18454,7 @@ endobj
 /F6.0 50 0 R
 /F3.0 40 0 R
 >>
-/XObject << /Stamp1 2145 0 R
+/XObject << /Stamp1 2144 0 R
 >>
 >>
 /Annots [107 0 R 108 0 R 109 0 R 110 0 R 111 0 R 112 0 R 113 0 R 114 0 R 115 0 R 116 0 R 117 0 R 118 0 R 119 0 R 120 0 R 121 0 R 122 0 R 123 0 R 124 0 R 125 0 R 126 0 R 127 0 R 128 0 R 129 0 R 130 0 R 131 0 R 132 0 R 133 0 R 134 0 R 135 0 R 136 0 R 137 0 R 138 0 R 139 0 R 140 0 R 141 0 R 142 0 R 143 0 R]
@@ -21340,7 +21340,7 @@ endobj
 /F2.0 22 0 R
 /F3.0 40 0 R
 >>
-/XObject << /Stamp1 2145 0 R
+/XObject << /Stamp1 2144 0 R
 >>
 >>
 /Annots [147 0 R 148 0 R 149 0 R 150 0 R 151 0 R 152 0 R 153 0 R 154 0 R 155 0 R 156 0 R 157 0 R 158 0 R 159 0 R 160 0 R 161 0 R 162 0 R 163 0 R 164 0 R 165 0 R 166 0 R 167 0 R 168 0 R]
@@ -24318,7 +24318,7 @@ endobj
 /F3.0 40 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 2145 0 R
+/XObject << /Stamp1 2144 0 R
 >>
 >>
 /Annots [171 0 R 172 0 R 173 0 R 174 0 R 175 0 R 176 0 R 177 0 R 178 0 R 179 0 R 180 0 R 181 0 R 182 0 R 183 0 R 184 0 R 185 0 R 186 0 R 187 0 R 188 0 R 189 0 R 190 0 R 191 0 R 192 0 R 193 0 R 194 0 R 195 0 R 196 0 R 197 0 R 198 0 R 199 0 R 200 0 R 201 0 R 202 0 R 203 0 R]
@@ -27123,7 +27123,7 @@ endobj
 /F3.0 40 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 2145 0 R
+/XObject << /Stamp1 2144 0 R
 >>
 >>
 /Annots [206 0 R 207 0 R 208 0 R 209 0 R 210 0 R 211 0 R 212 0 R 213 0 R 214 0 R 215 0 R 216 0 R 217 0 R 218 0 R 219 0 R 220 0 R 221 0 R 222 0 R 223 0 R 224 0 R 225 0 R 226 0 R]
@@ -29493,7 +29493,7 @@ endobj
 /F3.0 40 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 2145 0 R
+/XObject << /Stamp1 2144 0 R
 >>
 >>
 /Annots [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 241 0 R 242 0 R 243 0 R 244 0 R 245 0 R 246 0 R 247 0 R]
@@ -32707,7 +32707,7 @@ endobj
 /F3.0 40 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 2145 0 R
+/XObject << /Stamp1 2144 0 R
 >>
 >>
 /Annots [250 0 R 251 0 R 252 0 R 253 0 R 254 0 R 255 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 267 0 R 268 0 R 269 0 R 270 0 R 271 0 R]
@@ -34546,7 +34546,7 @@ endobj
 /F1.0 8 0 R
 /F6.0 50 0 R
 >>
-/XObject << /Stamp1 2145 0 R
+/XObject << /Stamp1 2144 0 R
 >>
 >>
 /Annots [274 0 R 275 0 R 276 0 R 277 0 R 278 0 R 279 0 R 280 0 R 281 0 R 282 0 R 283 0 R 284 0 R 285 0 R 286 0 R]
@@ -35586,7 +35586,7 @@ endobj
 /F3.0 40 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 2145 0 R
+/XObject << /Stamp1 2144 0 R
 >>
 >>
 /Annots [290 0 R]
@@ -36274,7 +36274,7 @@ endobj
 /F3.0 40 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 2145 0 R
+/XObject << /Stamp1 2144 0 R
 >>
 >>
 >>
@@ -38489,7 +38489,7 @@ endobj
 /F1.0 8 0 R
 /F6.0 50 0 R
 >>
-/XObject << /Stamp1 2145 0 R
+/XObject << /Stamp1 2144 0 R
 >>
 >>
 /Annots [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]
@@ -38602,7 +38602,7 @@ endobj
 >>
 endobj
 307 0 obj
-<< /Length 33066
+<< /Length 33492
 >>
 stream
 q
@@ -39270,12 +39270,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24 538.499 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -39292,12 +39292,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 538.499 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -39314,12 +39314,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 538.499 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <546f446f4974656d> Tj
 ET
 
@@ -39358,12 +39358,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 523.759 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -39380,12 +39380,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 119.74000000000001 523.759 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <737461746963> Tj
 ET
 
@@ -39402,12 +39402,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 158.24 523.759 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -39424,12 +39424,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 191.24 523.759 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <436f6d706c657465644576656e74> Tj
 ET
 
@@ -39446,12 +39446,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 273.74 523.759 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <657874656e6473> Tj
 ET
 
@@ -39567,8 +39567,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 509.01899999999995 Td
@@ -39644,8 +39644,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 251.74 494.27899999999994 Td
@@ -39721,8 +39721,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 290.24 479.53899999999993 Td
@@ -39820,8 +39820,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 312.24 464.799 Td
@@ -39919,8 +39919,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 251.74 450.05899999999997 Td
@@ -40018,8 +40018,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 185.74 435.31899999999996 Td
@@ -40139,8 +40139,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 213.24 420.57899999999995 Td
@@ -40260,8 +40260,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 235.24 405.83899999999994 Td
@@ -40359,8 +40359,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 235.24 391.09899999999993 Td
@@ -40403,12 +40403,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 361.6189999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -40464,7 +40464,18 @@ ET
 BT
 218.74 361.6189999999999 Td
 /F3.0 11 Tf
-<2829> Tj
+<28> 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
+224.24 361.6189999999999 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -40508,7 +40519,29 @@ ET
 BT
 246.24 361.6189999999999 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+251.74 361.6189999999999 Td
+/F3.0 11 Tf
+<2e> 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
+257.24 361.6189999999999 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -40963,13 +40996,12 @@ endobj
 /F3.0 40 0 R
 /F1.0 8 0 R
 /F4.0 43 0 R
-/F7.0 312 0 R
-/F3.1 313 0 R
+/F3.1 312 0 R
 >>
-/XObject << /Stamp1 2145 0 R
+/XObject << /Stamp1 2144 0 R
 >>
 >>
-/Annots [309 0 R 310 0 R 311 0 R 315 0 R]
+/Annots [309 0 R 310 0 R 311 0 R 314 0 R]
 >>
 endobj
 309 0 obj
@@ -41001,30 +41033,19 @@ endobj
 endobj
 312 0 obj
 << /Type /Font
-/BaseFont /AAAAAX+mplus1mn-bold
+/BaseFont /AAAAAV+mplus1mn-regular
 /Subtype /TrueType
-/FontDescriptor 2330 0 R
+/FontDescriptor 2329 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 2332 0 R
-/ToUnicode 2331 0 R
+/Widths 2331 0 R
+/ToUnicode 2330 0 R
 >>
 endobj
 313 0 obj
-<< /Type /Font
-/BaseFont /AAAAAY+mplus1mn-regular
-/Subtype /TrueType
-/FontDescriptor 2334 0 R
-/FirstChar 32
-/LastChar 255
-/Widths 2336 0 R
-/ToUnicode 2335 0 R
->>
-endobj
-314 0 obj
 [308 0 R /XYZ 0 233.84400000000002 null]
 endobj
-315 0 obj
+314 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -41035,7 +41056,7 @@ endobj
 /Type /Annot
 >>
 endobj
-316 0 obj
+315 0 obj
 << /Length 20065
 >>
 stream
@@ -42351,23 +42372,23 @@ Q
 
 endstream
 endobj
-317 0 obj
+316 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 316 0 R
+/Contents 315 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F3.0 40 0 R
 /F5.1 48 0 R
 >>
-/XObject << /Stamp1 2145 0 R
+/XObject << /Stamp1 2144 0 R
 >>
 >>
-/Annots [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]
+/Annots [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]
 >>
 endobj
-318 0 obj
+317 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -42378,7 +42399,7 @@ endobj
 /Type /Annot
 >>
 endobj
-319 0 obj
+318 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -42389,7 +42410,7 @@ endobj
 /Type /Annot
 >>
 endobj
-320 0 obj
+319 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -42400,7 +42421,7 @@ endobj
 /Type /Annot
 >>
 endobj
-321 0 obj
+320 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -42411,7 +42432,7 @@ endobj
 /Type /Annot
 >>
 endobj
-322 0 obj
+321 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -42422,7 +42443,7 @@ endobj
 /Type /Annot
 >>
 endobj
-323 0 obj
+322 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -42433,7 +42454,7 @@ endobj
 /Type /Annot
 >>
 endobj
-324 0 obj
+323 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -42444,7 +42465,7 @@ endobj
 /Type /Annot
 >>
 endobj
-325 0 obj
+324 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -42455,7 +42476,7 @@ endobj
 /Type /Annot
 >>
 endobj
-326 0 obj
+325 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -42466,7 +42487,7 @@ endobj
 /Type /Annot
 >>
 endobj
-327 0 obj
+326 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -42477,7 +42498,7 @@ endobj
 /Type /Annot
 >>
 endobj
-328 0 obj
+327 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -42488,8 +42509,8 @@ endobj
 /Type /Annot
 >>
 endobj
-329 0 obj
-<< /Length 29514
+328 0 obj
+<< /Length 32022
 >>
 stream
 q
@@ -42523,13 +42544,13 @@ h
 S
 Q
 /DeviceRGB cs
-0.000 0.533 0.000 scn
+0.000 0.400 0.600 scn
 /DeviceRGB CS
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 SCN
 
 BT
 59.24 783.0649999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -42546,12 +42567,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 783.0649999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -42568,12 +42589,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 783.0649999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <4f72646572> Tj
 ET
 
@@ -42612,8 +42633,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 768.3249999999999 Td
@@ -42678,8 +42699,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 273.74 768.3249999999999 Td
@@ -42711,12 +42732,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 753.585 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -42772,7 +42793,51 @@ ET
 BT
 246.24 753.585 Td
 /F3.0 11 Tf
-<282e2e2e29> Tj
+<28> 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
+251.74 753.585 Td
+/F3.0 11 Tf
+<2e> 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
+257.24 753.585 Td
+/F3.0 11 Tf
+<2e> 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
+262.74 753.585 Td
+/F3.0 11 Tf
+<2e> 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
+268.24 753.585 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -42816,7 +42881,29 @@ ET
 BT
 290.24 753.585 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+295.74 753.585 Td
+/F3.0 11 Tf
+<2e> 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
+301.24 753.585 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -43059,12 +43146,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24 541.9250000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -43081,12 +43168,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 541.9250000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -43103,12 +43190,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 541.9250000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <4f72646572> Tj
 ET
 
@@ -43147,8 +43234,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 527.1850000000002 Td
@@ -43224,8 +43311,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 251.74 512.4450000000002 Td
@@ -43301,8 +43388,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 312.24 497.7050000000002 Td
@@ -43345,12 +43432,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 468.22500000000025 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -43406,7 +43493,51 @@ ET
 BT
 246.24 468.22500000000025 Td
 /F3.0 11 Tf
-<282e2e2e29> Tj
+<28> 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
+251.74 468.22500000000025 Td
+/F3.0 11 Tf
+<2e> 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
+257.24 468.22500000000025 Td
+/F3.0 11 Tf
+<2e> 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
+262.74 468.22500000000025 Td
+/F3.0 11 Tf
+<2e> 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
+268.24 468.22500000000025 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -43450,7 +43581,29 @@ ET
 BT
 290.24 468.22500000000025 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+295.74 468.22500000000025 Td
+/F3.0 11 Tf
+<2e> 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
+301.24 468.22500000000025 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -43664,12 +43817,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24 333.40500000000026 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -43686,12 +43839,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 333.40500000000026 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -43708,12 +43861,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 333.40500000000026 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <4f72646572> Tj
 ET
 
@@ -43752,8 +43905,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 318.66500000000025 Td
@@ -43829,8 +43982,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 251.74 303.92500000000024 Td
@@ -43906,8 +44059,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 290.24 289.18500000000023 Td
@@ -43983,8 +44136,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 312.24 274.4450000000002 Td
@@ -44027,12 +44180,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 244.96500000000026 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -44088,7 +44241,51 @@ ET
 BT
 246.24 244.96500000000026 Td
 /F3.0 11 Tf
-<282e2e2e29> Tj
+<28> 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
+251.74 244.96500000000026 Td
+/F3.0 11 Tf
+<2e> 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
+257.24 244.96500000000026 Td
+/F3.0 11 Tf
+<2e> 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
+262.74 244.96500000000026 Td
+/F3.0 11 Tf
+<2e> 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
+268.24 244.96500000000026 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -44132,7 +44329,29 @@ ET
 BT
 290.24 244.96500000000026 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+295.74 244.96500000000026 Td
+/F3.0 11 Tf
+<2e> 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
+301.24 244.96500000000026 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -44478,28 +44697,27 @@ Q
 
 endstream
 endobj
-330 0 obj
+329 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 329 0 R
+/Contents 328 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F7.0 312 0 R
-/F3.0 40 0 R
+/Font << /F3.0 40 0 R
 /F1.0 8 0 R
 /F2.0 22 0 R
 /F6.0 50 0 R
 >>
-/XObject << /Stamp1 2145 0 R
+/XObject << /Stamp1 2144 0 R
 >>
 >>
-/Annots [332 0 R 334 0 R]
+/Annots [331 0 R 333 0 R]
 >>
 endobj
-331 0 obj
-[330 0 R /XYZ 0 669.37 null]
+330 0 obj
+[329 0 R /XYZ 0 669.37 null]
 endobj
-332 0 obj
+331 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -44510,10 +44728,10 @@ endobj
 /Type /Annot
 >>
 endobj
-333 0 obj
-[330 0 R /XYZ 0 160.75000000000023 null]
+332 0 obj
+[329 0 R /XYZ 0 160.75000000000023 null]
 endobj
-334 0 obj
+333 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -44524,8 +44742,8 @@ endobj
 /Type /Annot
 >>
 endobj
-335 0 obj
-<< /Length 21003
+334 0 obj
+<< /Length 22746
 >>
 stream
 q
@@ -44602,12 +44820,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24 728.255 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -44624,12 +44842,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 728.255 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -44646,12 +44864,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 728.255 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <4f72646572> Tj
 ET
 
@@ -44690,8 +44908,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 713.515 Td
@@ -44767,8 +44985,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 251.74 698.7750000000001 Td
@@ -44844,8 +45062,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 290.24 684.0350000000001 Td
@@ -44877,12 +45095,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 669.2950000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -44938,7 +45156,51 @@ ET
 BT
 246.24 669.2950000000001 Td
 /F3.0 11 Tf
-<282e2e2e29> Tj
+<28> 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
+251.74 669.2950000000001 Td
+/F3.0 11 Tf
+<2e> 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
+257.24 669.2950000000001 Td
+/F3.0 11 Tf
+<2e> 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
+262.74 669.2950000000001 Td
+/F3.0 11 Tf
+<2e> 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
+268.24 669.2950000000001 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -44982,7 +45244,29 @@ ET
 BT
 290.24 669.2950000000001 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+295.74 669.2950000000001 Td
+/F3.0 11 Tf
+<2e> 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
+301.24 669.2950000000001 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -45454,12 +45738,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24000000000001 276.59500000000014 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -45476,12 +45760,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 276.59500000000014 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -45498,12 +45782,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 276.59500000000014 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <546f446f4974656d> Tj
 ET
 
@@ -45542,8 +45826,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 261.8550000000002 Td
@@ -45559,7 +45843,18 @@ ET
 BT
 119.74000000000001 261.8550000000002 Td
 /F3.0 11 Tf
-<2829> Tj
+<28> 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
+125.24000000000001 261.8550000000002 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -45575,12 +45870,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 247.11500000000018 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -45636,7 +45931,18 @@ ET
 BT
 218.74 247.11500000000018 Td
 /F3.0 11 Tf
-<2829> Tj
+<28> 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
+224.24 247.11500000000018 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -45680,7 +45986,29 @@ ET
 BT
 246.24 247.11500000000018 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+251.74 247.11500000000018 Td
+/F3.0 11 Tf
+<2e> 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
+257.24 247.11500000000018 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -45724,7 +46052,29 @@ ET
 BT
 81.24000000000001 232.37500000000017 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+86.74000000000001 232.37500000000017 Td
+/F3.0 11 Tf
+<2e> 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
+92.24000000000001 232.37500000000017 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -45879,24 +46229,23 @@ Q
 
 endstream
 endobj
-336 0 obj
+335 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 335 0 R
+/Contents 334 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
-/F7.0 312 0 R
 /F3.0 40 0 R
 /F2.0 22 0 R
 >>
-/XObject << /Stamp1 2145 0 R
+/XObject << /Stamp1 2144 0 R
 >>
 >>
-/Annots [337 0 R 339 0 R 340 0 R 341 0 R 342 0 R 343 0 R]
+/Annots [336 0 R 338 0 R 339 0 R 340 0 R 341 0 R 342 0 R]
 >>
 endobj
-337 0 obj
+336 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -45907,10 +46256,10 @@ endobj
 /Type /Annot
 >>
 endobj
-338 0 obj
-[336 0 R /XYZ 0 585.08 null]
+337 0 obj
+[335 0 R /XYZ 0 585.08 null]
 endobj
-339 0 obj
+338 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -45921,7 +46270,7 @@ endobj
 /Type /Annot
 >>
 endobj
-340 0 obj
+339 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -45932,7 +46281,7 @@ endobj
 /Type /Annot
 >>
 endobj
-341 0 obj
+340 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -45943,7 +46292,7 @@ endobj
 /Type /Annot
 >>
 endobj
-342 0 obj
+341 0 obj
 << /Border [0 0 0]
 /Dest (_rgant-Collection_domainEvent)
 /Subtype /Link
@@ -45951,7 +46300,7 @@ endobj
 /Type /Annot
 >>
 endobj
-343 0 obj
+342 0 obj
 << /Border [0 0 0]
 /Dest (_rgant-Property_domainEvent)
 /Subtype /Link
@@ -45959,8 +46308,8 @@ endobj
 /Type /Annot
 >>
 endobj
-344 0 obj
-<< /Length 31536
+343 0 obj
+<< /Length 32530
 >>
 stream
 q
@@ -45994,13 +46343,13 @@ h
 S
 Q
 /DeviceRGB cs
-0.000 0.533 0.000 scn
+0.000 0.400 0.600 scn
 /DeviceRGB CS
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 SCN
 
 BT
 59.24 783.0649999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -46017,12 +46366,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 783.0649999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -46039,12 +46388,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 783.0649999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <546f446f4974656d> Tj
 ET
 
@@ -46083,12 +46432,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 768.3249999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -46105,12 +46454,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 119.74000000000001 768.3249999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <737461746963> Tj
 ET
 
@@ -46127,12 +46476,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 158.24 768.3249999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -46149,12 +46498,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 191.24 768.3249999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <436f6d706c657465644576656e74> Tj
 ET
 
@@ -46171,12 +46520,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 273.74 768.3249999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <657874656e6473> Tj
 ET
 
@@ -46314,8 +46663,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 753.585 Td
@@ -46380,8 +46729,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 273.74 753.585 Td
@@ -46413,12 +46762,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 738.845 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -46474,7 +46823,18 @@ ET
 BT
 218.74 738.845 Td
 /F3.0 11 Tf
-<2829> Tj
+<28> 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
+224.24 738.845 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -46518,7 +46878,29 @@ ET
 BT
 246.24 738.845 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+251.74 738.845 Td
+/F3.0 11 Tf
+<2e> 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
+257.24 738.845 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -46825,8 +47207,8 @@ f
 h
 S
 Q
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 59.24000000000001 459.8450000000001 Td
@@ -46891,8 +47273,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 268.24 459.8450000000001 Td
@@ -46913,12 +47295,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24000000000001 445.1050000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -46935,12 +47317,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 445.1050000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -46957,12 +47339,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 445.1050000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <536f6d6553756273637269626572> Tj
 ET
 
@@ -46979,12 +47361,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 213.24 445.1050000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <657874656e6473> Tj
 ET
 
@@ -47045,8 +47427,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 430.36500000000007 Td
@@ -47067,8 +47449,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 108.74000000000001 430.36500000000007 Td
@@ -47089,8 +47471,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 147.24 430.36500000000007 Td
@@ -47111,8 +47493,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 185.74 430.36500000000007 Td
@@ -47133,8 +47515,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 235.24 430.36500000000007 Td
@@ -47155,12 +47537,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 415.62500000000006 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -47177,12 +47559,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 415.62500000000006 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <766f6964> Tj
 ET
 
@@ -47304,7 +47686,29 @@ ET
 BT
 103.24000000000001 400.88500000000005 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+108.74000000000001 400.88500000000005 Td
+/F3.0 11 Tf
+<2e> 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
+114.24000000000001 400.88500000000005 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -47380,8 +47784,8 @@ f
 h
 S
 Q
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 59.24000000000001 294.885 Td
@@ -47446,8 +47850,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 268.24 294.885 Td
@@ -47468,12 +47872,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24000000000001 280.14500000000004 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -47490,12 +47894,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 280.14500000000004 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -47512,12 +47916,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 280.14500000000004 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <536f6d6553756273637269626572> Tj
 ET
 
@@ -47534,12 +47938,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 213.24 280.14500000000004 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <657874656e6473> Tj
 ET
 
@@ -47600,8 +48004,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 265.40500000000003 Td
@@ -47622,8 +48026,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 108.74000000000001 265.40500000000003 Td
@@ -47644,8 +48048,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 147.24 265.40500000000003 Td
@@ -47666,8 +48070,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 185.74 265.40500000000003 Td
@@ -47688,8 +48092,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 235.24 265.40500000000003 Td
@@ -47710,12 +48114,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 250.66500000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -47732,12 +48136,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 250.66500000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <766f6964> Tj
 ET
 
@@ -47798,8 +48202,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 213.24 250.66500000000002 Td
@@ -47881,7 +48285,29 @@ ET
 BT
 103.24000000000001 235.925 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+108.74000000000001 235.925 Td
+/F3.0 11 Tf
+<2e> 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
+114.24000000000001 235.925 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -48095,29 +48521,28 @@ Q
 
 endstream
 endobj
-345 0 obj
+344 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 344 0 R
+/Contents 343 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F7.0 312 0 R
-/F3.0 40 0 R
-/F3.1 313 0 R
+/Font << /F3.0 40 0 R
+/F3.1 312 0 R
 /F1.0 8 0 R
 /F5.1 48 0 R
 /F2.0 22 0 R
 >>
-/XObject << /Stamp1 2145 0 R
+/XObject << /Stamp1 2144 0 R
 >>
 >>
-/Annots [347 0 R 348 0 R 349 0 R]
+/Annots [346 0 R 347 0 R 348 0 R]
 >>
 endobj
-346 0 obj
-[345 0 R /XYZ 0 603.0699999999999 null]
+345 0 obj
+[344 0 R /XYZ 0 603.0699999999999 null]
 endobj
-347 0 obj
+346 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -48128,7 +48553,7 @@ endobj
 /Type /Annot
 >>
 endobj
-348 0 obj
+347 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -48139,7 +48564,7 @@ endobj
 /Type /Annot
 >>
 endobj
-349 0 obj
+348 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -48150,8 +48575,8 @@ endobj
 /Type /Annot
 >>
 endobj
-350 0 obj
-<< /Length 22671
+349 0 obj
+<< /Length 23656
 >>
 stream
 q
@@ -48295,8 +48720,8 @@ f
 h
 S
 Q
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 59.24000000000001 683.945 Td
@@ -48306,8 +48731,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 59.24000000000001 669.205 Td
@@ -48328,8 +48753,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 86.74000000000001 669.205 Td
@@ -48350,8 +48775,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 125.24000000000001 669.205 Td
@@ -48372,8 +48797,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 163.74 669.205 Td
@@ -48394,8 +48819,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 213.24 669.205 Td
@@ -48405,12 +48830,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24000000000001 654.4650000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -48427,12 +48852,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 654.4650000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <766f6964> Tj
 ET
 
@@ -48449,12 +48874,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.400 0.733 scn
-0.000 0.400 0.733 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 125.24000000000001 654.4650000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <6f6e> Tj
 ET
 
@@ -48548,12 +48973,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 639.7250000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <737769746368> Tj
 ET
 
@@ -48592,8 +49017,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 136.24 639.7250000000001 Td
@@ -48609,7 +49034,29 @@ ET
 BT
 207.74 639.7250000000001 Td
 /F3.0 11 Tf
-<282929> Tj
+<28> 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.24 639.7250000000001 Td
+/F3.0 11 Tf
+<29> 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
+218.74 639.7250000000001 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -48647,12 +49094,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 103.24000000000001 624.9850000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <63617365> Tj
 ET
 
@@ -48669,13 +49116,24 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 130.74 624.9850000000001 Td
 /F3.0 11 Tf
-<484944453a> Tj
+<48494445> 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
+152.74 624.9850000000001 Td
+/F3.0 11 Tf
+<3a> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -48691,8 +49149,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.600 0.600 0.600 scn
+0.600 0.600 0.600 SCN
 
 BT
 125.24000000000001 610.2450000000001 Td
@@ -48713,12 +49171,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 125.24000000000001 595.5050000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <627265616b> Tj
 ET
 
@@ -48746,12 +49204,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 103.24000000000001 580.7650000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <63617365> Tj
 ET
 
@@ -48768,13 +49226,24 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 130.74 580.7650000000001 Td
 /F3.0 11 Tf
-<44495341424c453a> Tj
+<44495341424c45> 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
+169.24 580.7650000000001 Td
+/F3.0 11 Tf
+<3a> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -48790,8 +49259,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.600 0.600 0.600 scn
+0.600 0.600 0.600 SCN
 
 BT
 125.24000000000001 566.0250000000001 Td
@@ -48812,12 +49281,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 125.24000000000001 551.2850000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <627265616b> Tj
 ET
 
@@ -48845,12 +49314,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 103.24000000000001 536.5450000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <63617365> Tj
 ET
 
@@ -48867,13 +49336,24 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 130.74 536.5450000000001 Td
 /F3.0 11 Tf
-<56414c49444154453a> Tj
+<56414c4944415445> 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
+174.74 536.5450000000001 Td
+/F3.0 11 Tf
+<3a> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -48889,8 +49369,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.600 0.600 0.600 scn
+0.600 0.600 0.600 SCN
 
 BT
 125.24000000000001 521.8050000000001 Td
@@ -48911,8 +49391,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.600 0.600 0.600 scn
+0.600 0.600 0.600 SCN
 
 BT
 125.24000000000001 507.06500000000005 Td
@@ -48933,12 +49413,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 125.24000000000001 492.32500000000005 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <627265616b> Tj
 ET
 
@@ -48966,12 +49446,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 103.24000000000001 477.58500000000004 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <63617365> Tj
 ET
 
@@ -48988,13 +49468,24 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 130.74 477.58500000000004 Td
 /F3.0 11 Tf
-<455845435554494e473a> Tj
+<455845435554494e47> 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
+180.24 477.58500000000004 Td
+/F3.0 11 Tf
+<3a> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -49010,12 +49501,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 125.24000000000001 462.845 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <627265616b> Tj
 ET
 
@@ -49043,12 +49534,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 103.24000000000001 448.105 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <63617365> Tj
 ET
 
@@ -49065,13 +49556,24 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 130.74 448.105 Td
 /F3.0 11 Tf
-<45584543555445443a> Tj
+<4558454355544544> 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
+174.74 448.105 Td
+/F3.0 11 Tf
+<3a> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -49087,12 +49589,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 125.24000000000001 433.36500000000007 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <627265616b> Tj
 ET
 
@@ -49586,27 +50088,26 @@ Q
 
 endstream
 endobj
-351 0 obj
+350 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 350 0 R
+/Contents 349 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F3.0 40 0 R
-/F7.0 312 0 R
 /F2.0 22 0 R
 >>
-/XObject << /Stamp1 2145 0 R
+/XObject << /Stamp1 2144 0 R
 >>
 >>
 >>
 endobj
-352 0 obj
-[351 0 R /XYZ 0 318.63 null]
+351 0 obj
+[350 0 R /XYZ 0 318.63 null]
 endobj
-353 0 obj
-<< /Length 17832
+352 0 obj
+<< /Length 18564
 >>
 stream
 q
@@ -49999,12 +50500,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24000000000001 484.92500000000024 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -50021,12 +50522,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 484.92500000000024 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -50043,12 +50544,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 484.92500000000024 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <437573746f6d6572> Tj
 ET
 
@@ -50087,8 +50588,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 470.18500000000023 Td
@@ -50153,8 +50654,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 196.74 470.18500000000023 Td
@@ -50186,12 +50687,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 455.4450000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -50208,12 +50709,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 455.4450000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <766f6964> Tj
 ET
 
@@ -50247,7 +50748,18 @@ ET
 BT
 213.24 455.4450000000002 Td
 /F3.0 11 Tf
-<2829> Tj
+<28> 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
+218.74 455.4450000000002 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -50291,7 +50803,29 @@ ET
 BT
 240.74 455.4450000000002 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+246.24 455.4450000000002 Td
+/F3.0 11 Tf
+<2e> 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
+251.74 455.4450000000002 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -50335,7 +50869,29 @@ ET
 BT
 81.24000000000001 440.7050000000002 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+86.74000000000001 440.7050000000002 Td
+/F3.0 11 Tf
+<2e> 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
+92.24000000000001 440.7050000000002 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -50715,28 +51271,27 @@ Q
 
 endstream
 endobj
-354 0 obj
+353 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 353 0 R
+/Contents 352 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 22 0 R
 /F1.0 8 0 R
 /F3.0 40 0 R
 /F5.1 48 0 R
-/F7.0 312 0 R
 >>
-/XObject << /Stamp1 2145 0 R
+/XObject << /Stamp1 2144 0 R
 >>
 >>
-/Annots [356 0 R 357 0 R 359 0 R 360 0 R 361 0 R 362 0 R 363 0 R 364 0 R]
+/Annots [355 0 R 356 0 R 358 0 R 359 0 R 360 0 R 361 0 R 362 0 R 363 0 R]
 >>
 endobj
-355 0 obj
-[354 0 R /XYZ 0 841.89 null]
+354 0 obj
+[353 0 R /XYZ 0 841.89 null]
 endobj
-356 0 obj
+355 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -50747,7 +51302,7 @@ endobj
 /Type /Annot
 >>
 endobj
-357 0 obj
+356 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -50758,10 +51313,10 @@ endobj
 /Type /Annot
 >>
 endobj
-358 0 obj
-[354 0 R /XYZ 0 718.07 null]
+357 0 obj
+[353 0 R /XYZ 0 718.07 null]
 endobj
-359 0 obj
+358 0 obj
 << /Border [0 0 0]
 /Dest (_rgant-Property_hidden)
 /Subtype /Link
@@ -50769,7 +51324,7 @@ endobj
 /Type /Annot
 >>
 endobj
-360 0 obj
+359 0 obj
 << /Border [0 0 0]
 /Dest (_rgant-Collection_hidden)
 /Subtype /Link
@@ -50777,7 +51332,7 @@ endobj
 /Type /Annot
 >>
 endobj
-361 0 obj
+360 0 obj
 << /Border [0 0 0]
 /Dest (_rgant-ActionLayout_hidden)
 /Subtype /Link
@@ -50785,7 +51340,7 @@ endobj
 /Type /Annot
 >>
 endobj
-362 0 obj
+361 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -50796,7 +51351,7 @@ endobj
 /Type /Annot
 >>
 endobj
-363 0 obj
+362 0 obj
 << /Border [0 0 0]
 /Dest (_rgant-DomainService_nature)
 /Subtype /Link
@@ -50804,7 +51359,7 @@ endobj
 /Type /Annot
 >>
 endobj
-364 0 obj
+363 0 obj
 << /Border [0 0 0]
 /Dest (_rgant-ActionLayout_contributedAs)
 /Subtype /Link
@@ -50812,11 +51367,11 @@ endobj
 /Type /Annot
 >>
 endobj
-365 0 obj
-[354 0 R /XYZ 0 160.0300000000003 null]
+364 0 obj
+[353 0 R /XYZ 0 160.0300000000003 null]
 endobj
-366 0 obj
-<< /Length 25495
+365 0 obj
+<< /Length 27184
 >>
 stream
 q
@@ -50850,13 +51405,13 @@ h
 S
 Q
 /DeviceRGB cs
-0.000 0.533 0.000 scn
+0.000 0.400 0.600 scn
 /DeviceRGB CS
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 SCN
 
 BT
 59.24 783.0649999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -50873,12 +51428,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 783.0649999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -50895,12 +51450,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 783.0649999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <546f446f4974656d> Tj
 ET
 
@@ -50939,8 +51494,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 768.3249999999999 Td
@@ -51005,8 +51560,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 224.24 768.3249999999999 Td
@@ -51038,12 +51593,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 753.585 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -51060,12 +51615,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 753.585 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <766f6964> Tj
 ET
 
@@ -51099,7 +51654,18 @@ ET
 BT
 229.74 753.585 Td
 /F3.0 11 Tf
-<2829> Tj
+<28> 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
+235.24 753.585 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -51159,12 +51725,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 174.74 738.845 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <74727565> Tj
 ET
 
@@ -51176,7 +51742,18 @@ ET
 BT
 196.74 738.845 Td
 /F3.0 11 Tf
-<293b> Tj
+<29> 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
+202.24 738.845 Td
+/F3.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -51220,7 +51797,29 @@ ET
 BT
 81.24000000000001 709.365 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+86.74000000000001 709.365 Td
+/F3.0 11 Tf
+<2e> 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
+92.24000000000001 709.365 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -51419,8 +52018,8 @@ f
 h
 S
 Q
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 59.24000000000001 475.42500000000024 Td
@@ -51485,8 +52084,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 202.24 475.42500000000024 Td
@@ -51507,12 +52106,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24000000000001 460.68500000000023 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -51529,12 +52128,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 460.68500000000023 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <766f6964> Tj
 ET
 
@@ -51551,12 +52150,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.400 0.733 scn
-0.000 0.400 0.733 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 125.24000000000001 460.68500000000023 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <6d61726b4173436f6d706c65746564> Tj
 ET
 
@@ -51639,12 +52238,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 152.74 445.9450000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <74727565> Tj
 ET
 
@@ -51656,7 +52255,18 @@ ET
 BT
 174.74 445.9450000000002 Td
 /F3.0 11 Tf
-<293b> Tj
+<29> 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
+180.24 445.9450000000002 Td
+/F3.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -51694,8 +52304,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 158.24 431.2050000000002 Td
@@ -51711,7 +52321,29 @@ ET
 BT
 290.24 431.2050000000002 Td
 /F3.0 11 Tf
-<28293b> Tj
+<28> 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
+295.74 431.2050000000002 Td
+/F3.0 11 Tf
+<29> 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
+301.24 431.2050000000002 Td
+/F3.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -51765,8 +52397,8 @@ f
 h
 S
 Q
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 59.24000000000001 339.9450000000002 Td
@@ -51831,8 +52463,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 202.24 339.9450000000002 Td
@@ -51853,12 +52485,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24000000000001 325.2050000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -51875,12 +52507,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 325.2050000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <766f6964> Tj
 ET
 
@@ -51897,12 +52529,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.400 0.733 scn
-0.000 0.400 0.733 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 125.24000000000001 325.2050000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <6d61726b4173436f6d706c65746564> Tj
 ET
 
@@ -51963,12 +52595,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 310.4650000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <6966> Tj
 ET
 
@@ -52002,7 +52634,29 @@ ET
 BT
 158.24 310.4650000000002 Td
 /F3.0 11 Tf
-<282929> Tj
+<28> 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
+163.74 310.4650000000002 Td
+/F3.0 11 Tf
+<29> 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
+169.24 310.4650000000002 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -52040,12 +52694,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 103.24000000000001 295.7250000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <72657475726e> Tj
 ET
 
@@ -52117,12 +52771,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 152.74 266.24500000000023 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <74727565> Tj
 ET
 
@@ -52134,7 +52788,18 @@ ET
 BT
 174.74 266.24500000000023 Td
 /F3.0 11 Tf
-<293b> Tj
+<29> 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
+180.24 266.24500000000023 Td
+/F3.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -52172,8 +52837,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 158.24 251.50500000000022 Td
@@ -52189,7 +52854,29 @@ ET
 BT
 290.24 251.50500000000022 Td
 /F3.0 11 Tf
-<28293b> Tj
+<28> 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
+295.74 251.50500000000022 Td
+/F3.0 11 Tf
+<29> 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
+301.24 251.50500000000022 Td
+/F3.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -52482,38 +53169,37 @@ Q
 
 endstream
 endobj
-367 0 obj
+366 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 366 0 R
+/Contents 365 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F7.0 312 0 R
-/F3.0 40 0 R
+/Font << /F3.0 40 0 R
 /F1.0 8 0 R
 /F5.1 48 0 R
 /F2.0 22 0 R
 >>
-/XObject << /Stamp1 2145 0 R
+/XObject << /Stamp1 2144 0 R
 >>
 >>
-/Annots [371 0 R 372 0 R 373 0 R 374 0 R]
+/Annots [370 0 R 371 0 R 372 0 R 373 0 R]
 >>
 endobj
-368 0 obj
-[367 0 R /XYZ 0 175.0700000000002 null]
+367 0 obj
+[366 0 R /XYZ 0 175.0700000000002 null]
 endobj
-369 0 obj
+368 0 obj
 << /Limits [(_rgant) (_rgant-ActionLayout_named)]
-/Names [(_rgant) 19 0 R (_rgant-Action) 295 0 R (_rgant-ActionLayout) 398 0 R (_rgant-ActionLayout_bookmarking) 420 0 R (_rgant-ActionLayout_contributedAs) 434 0 R (_rgant-ActionLayout_cssClass) 442 0 R (_rgant-ActionLayout_cssClassFa) 452 0 R (_rgant-ActionLayout_describedAs) 460 0 R (_rgant-ActionLayout_hidden) 470 0 R (_rgant-ActionLayout_named) 479 0 R]
+/Names [(_rgant) 19 0 R (_rgant-Action) 295 0 R (_rgant-ActionLayout) 397 0 R (_rgant-ActionLayout_bookmarking) 419 0 R (_rgant-ActionLayout_contributedAs) 433 0 R (_rgant-ActionLayout_cssClass) 441 0 R (_rgant-ActionLayout_cssClassFa) 451 0 R (_rgant-ActionLayout_describedAs) 459 0 R (_rgant-ActionLayout_hidden) 469 0 R (_rgant-ActionLayout_named) 478 0 R]
 >>
 endobj
-370 0 obj
+369 0 obj
 << /Limits [(_rgant_aaa_jee) (default-doop-and-noop-events)]
-/Names [(_rgant_aaa_jee) 79 0 R (_rgant_aaa_main) 47 0 R (_rgant_aaa_other) 71 0 R (_rgant_aaa_partial) 287 0 R (alternative-syntaxes) 1156 0 R (code-autocompleteaction-code) 766 0 R (code-commandexecutein-code) 333 0 R (code-commandpersistence-code) 331 0 R (code-publishingpayloadfactory-code) 379 0 R (code-publishingpayloadfactory-code-2) 871 0 R (default-doop-and-noop-events) 352 0 R]
+/Names [(_rgant_aaa_jee) 79 0 R (_rgant_aaa_main) 47 0 R (_rgant_aaa_other) 71 0 R (_rgant_aaa_partial) 287 0 R (alternative-syntaxes) 1155 0 R (code-autocompleteaction-code) 765 0 R (code-commandexecutein-code) 332 0 R (code-commandpersistence-code) 330 0 R (code-publishingpayloadfactory-code) 378 0 R (code-publishingpayloadfactory-code-2) 870 0 R (default-doop-and-noop-events) 351 0 R]
 >>
 endobj
-371 0 obj
+370 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -52524,7 +53210,7 @@ endobj
 /Type /Annot
 >>
 endobj
-372 0 obj
+371 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -52535,7 +53221,7 @@ endobj
 /Type /Annot
 >>
 endobj
-373 0 obj
+372 0 obj
 << /Border [0 0 0]
 /Dest (_rgant-DomainObject_publishing)
 /Subtype /Link
@@ -52543,7 +53229,7 @@ endobj
 /Type /Annot
 >>
 endobj
-374 0 obj
+373 0 obj
 << /Border [0 0 0]
 /Dest (_rgant_Property_publishing)
 /Subtype /Link
@@ -52551,8 +53237,8 @@ endobj
 /Type /Annot
 >>
 endobj
-375 0 obj
-<< /Length 19923
+374 0 obj
+<< /Length 20781
 >>
 stream
 q
@@ -53060,12 +53746,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24000000000001 421.1150000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -53082,12 +53768,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 421.1150000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -53104,12 +53790,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 421.1150000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <4f72646572> Tj
 ET
 
@@ -53148,8 +53834,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 406.37500000000017 Td
@@ -53214,8 +53900,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 246.24 406.37500000000017 Td
@@ -53269,12 +53955,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 391.63500000000016 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -53330,7 +54016,51 @@ ET
 BT
 246.24 391.63500000000016 Td
 /F3.0 11 Tf
-<282e2e2e29> Tj
+<28> 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
+251.74 391.63500000000016 Td
+/F3.0 11 Tf
+<2e> 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
+257.24 391.63500000000016 Td
+/F3.0 11 Tf
+<2e> 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
+262.74 391.63500000000016 Td
+/F3.0 11 Tf
+<2e> 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
+268.24 391.63500000000016 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -53374,7 +54104,29 @@ ET
 BT
 290.24 391.63500000000016 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+295.74 391.63500000000016 Td
+/F3.0 11 Tf
+<2e> 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
+301.24 391.63500000000016 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -53789,27 +54541,26 @@ Q
 
 endstream
 endobj
-376 0 obj
+375 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 375 0 R
+/Contents 374 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F3.0 40 0 R
 /F6.0 50 0 R
-/F7.0 312 0 R
-/F3.1 313 0 R
+/F3.1 312 0 R
 /F2.0 22 0 R
 /F5.1 48 0 R
 >>
-/XObject << /Stamp1 2145 0 R
+/XObject << /Stamp1 2144 0 R
 >>
 >>
-/Annots [377 0 R 378 0 R 380 0 R 381 0 R 383 0 R]
+/Annots [376 0 R 377 0 R 379 0 R 380 0 R 382 0 R]
 >>
 endobj
-377 0 obj
+376 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -53820,7 +54571,7 @@ endobj
 /Type /Annot
 >>
 endobj
-378 0 obj
+377 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -53831,10 +54582,10 @@ endobj
 /Type /Annot
 >>
 endobj
-379 0 obj
-[376 0 R /XYZ 0 329.20000000000016 null]
+378 0 obj
+[375 0 R /XYZ 0 329.20000000000016 null]
 endobj
-380 0 obj
+379 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -53845,7 +54596,7 @@ endobj
 /Type /Annot
 >>
 endobj
-381 0 obj
+380 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -53856,10 +54607,10 @@ endobj
 /Type /Annot
 >>
 endobj
-382 0 obj
-[376 0 R /XYZ 0 109.90000000000012 null]
+381 0 obj
+[375 0 R /XYZ 0 109.90000000000012 null]
 endobj
-383 0 obj
+382 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -53870,8 +54621,8 @@ endobj
 /Type /Annot
 >>
 endobj
-384 0 obj
-<< /Length 27553
+383 0 obj
+<< /Length 29087
 >>
 stream
 q
@@ -53926,12 +54677,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24 728.255 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -53948,12 +54699,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 728.255 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -53970,12 +54721,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 728.255 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <437573746f6d6572> Tj
 ET
 
@@ -54014,12 +54765,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 713.515 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -54075,7 +54826,18 @@ ET
 BT
 224.24 713.515 Td
 /F3.0 11 Tf
-<2829> Tj
+<28> 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
+229.74 713.515 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -54119,7 +54881,29 @@ ET
 BT
 251.74 713.515 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+257.24 713.515 Td
+/F3.0 11 Tf
+<2e> 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
+262.74 713.515 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -54157,12 +54941,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 698.7750000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -54179,8 +54963,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 698.7750000000001 Td
@@ -54251,7 +55035,18 @@ ET
 BT
 273.74 698.7750000000001 Td
 /F3.0 11 Tf
-<2829> Tj
+<28> 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
+279.24 698.7750000000001 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -54295,7 +55090,29 @@ ET
 BT
 301.24 698.7750000000001 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+306.74 698.7750000000001 Td
+/F3.0 11 Tf
+<2e> 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
+312.24 698.7750000000001 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -54333,8 +55150,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 669.2950000000001 Td
@@ -54399,8 +55216,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 246.24 669.2950000000001 Td
@@ -54432,12 +55249,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 654.5550000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -54454,8 +55271,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 654.5550000000001 Td
@@ -54526,7 +55343,18 @@ ET
 BT
 257.24 654.5550000000001 Td
 /F3.0 11 Tf
-<2829> Tj
+<28> 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
+262.74 654.5550000000001 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -54570,7 +55398,29 @@ ET
 BT
 284.74 654.5550000000001 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+290.24 654.5550000000001 Td
+/F3.0 11 Tf
+<2e> 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
+295.74 654.5550000000001 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -54614,7 +55464,29 @@ ET
 BT
 81.24000000000001 639.815 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+86.74000000000001 639.815 Td
+/F3.0 11 Tf
+<2e> Tj
+ET
+
+0.000 0.000 0.000 SCN

<TRUNCATED>

[17/44] isis-site git commit: ISIS-1594: provide an 'edit' button

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/guides/ugsec.html
----------------------------------------------------------------------
diff --git a/content/guides/ugsec.html b/content/guides/ugsec.html
index 564715f..5242b89 100644
--- a/content/guides/ugsec.html
+++ b/content/guides/ugsec.html
@@ -1,12 +1,10 @@
 <!doctype html>
 <html class="no-js" lang="en">
-<head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-
-    <title>Security</title>
-
-    <!--
+ <head> 
+  <meta charset="utf-8"> 
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"> 
+  <title>Security</title> 
+  <!--
         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
@@ -23,31 +21,21 @@
         KIND, either express or implied.  See the License for the
         specific language governing permissions and limitations
         under the License.
-    -->
-
-    <!-- No caching headers -->
-    <meta http-equiv="cache-control" content="no-cache" />
-    <meta http-equiv="pragma" content="no-cache" />
-    <meta http-equiv="expires" content="-1" />
-
-
-    <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
-    <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet" />
-    <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script>
-    <link href="../css/asciidoctor/colony.css" rel="stylesheet">
-    <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-
-
-
-    <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
-    <!--[if lt IE 9]>
+    --> 
+  <!-- No caching headers --> 
+  <meta http-equiv="cache-control" content="no-cache"> 
+  <meta http-equiv="pragma" content="no-cache"> 
+  <meta http-equiv="expires" content="-1"> 
+  <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line --> 
+  <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet"> 
+  <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script> 
+  <link href="../css/asciidoctor/colony.css" rel="stylesheet"> 
+  <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet"> 
+  <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet"> 
+  <!--[if lt IE 9]>
       <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
-    <![endif]-->
-
-
-
-    <style type="text/css">
+    <![endif]--> 
+  <style type="text/css">
         pre code {
             background-color: inherit;
             border-style: none;
@@ -192,9 +180,8 @@ table.CodeRay td.code>pre{padding:0}
         color:#fff;
         font-size: 1.1em;
     }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         @media only screen and (min-width: 40.063em) {
           .top-bar {
             .contain-to-grid .top-bar {
@@ -205,9 +192,8 @@ table.CodeRay td.code>pre{padding:0}
         .row {
             max-width: 80rem;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .extended-quote,
         .extended-quote-first {
             margin-left: 40px;
@@ -231,9 +217,8 @@ table.CodeRay td.code>pre{padding:0}
             text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
         }
         
-    </style>
-
-    <style>
+    </style> 
+  <style>
         body {
           position: relative;
         }
@@ -255,6 +240,7 @@ table.CodeRay td.code>pre{padding:0}
 
         div#doc-content {
             margin-top: 30px;
+            padding-top: 30px;
         }
 
         div.documentation-page table.frame-all {
@@ -286,9 +272,8 @@ table.CodeRay td.code>pre{padding:0}
             min-height: 2000px;
         }
 
-    </style>
-
-    <style>
+    </style> 
+  <style>
 
         @media only screen and (min-width: 768px) {
           #toc.toc2 ul ul { margin-left: -10px; }
@@ -316,15 +301,13 @@ table.CodeRay td.code>pre{padding:0}
         body div#toc2 li.tocify-item.active a {
             color: red;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         footer {
             margin-top: 1000px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* overriding colony.css stylesheet */
         .literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
            /*padding: 1.25em 1.5625em 1.125em 1.5625em;*/
@@ -372,9 +355,8 @@ table.CodeRay td.code>pre{padding:0}
         .imageblock img {
             margin-bottom: 10px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* from http://ben.balter.com/2014/03/13/pages-anchor-links/ */
         .header-link {
           position: absolute;
@@ -395,9 +377,8 @@ table.CodeRay td.code>pre{padding:0}
         h6:hover .header-link {
           opacity: 1;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .top-bar
         {
             -webkit-transition-duration: .5s;
@@ -425,309 +406,239 @@ table.CodeRay td.code>pre{padding:0}
             -webkit-transition-property: -webkit-transform;
             transition-property: transform;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         #doc-content a.guide {
             color: white;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
+        .tocify {
+            margin-top: 80px;
+        }
+    </style> 
+  <style>
         .tocify {
             margin-top: 80px;
         }
-    </style>
-
-
-</script>
-
-</head>
-<body>
-
-<<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
-    <div class="github-fork-ribbon">
-        <a href="https://github.com/apache/isis#fork-destination-box">Fork me on GitHub</a>
-    </div>
-</div>
-
-
-<div class="row">
-
-    <div class="fixed contain-to-grid header">
-        <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
-            <ul class="title-area">
-                <li class="name">
-                    <h1>
-                        <a href="/index.html">Apache Isis&trade;</a>
-                    </h1>
-                </li>
-                <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
-                <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
-            </ul>
-
-            <section class="top-bar-section">
-                <ul class="right">
-
-                    <li class="has-form">
-                       <FORM class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
-                        <div class="row collapse">
-                            <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
-                            <INPUT type="hidden" name="cof" value="FORID:0">
-                            <INPUT class="form-control" name="q" type="text" placeholder="Search">
-                        </div>
-                    </FORM>
-                     </li>
-
-                </ul>
-
-                <!-- Left Nav Section -->
-                <ul class="left">
-
-                    <li><a href="/documentation.html">Documentation</a></li>
-                    <li><a href="/downloads.html">Downloads</a></li>
-                    <li><a href="/help.html">Help</a></li>
-                    <li><a href="/asf.html">@ASF</a></li>
-
-                </ul>
-
-            </section>
-        </nav>
-    </div>
-</div>
-
-<div class="row">
-
-    <div id="doc-content-left" class="large-9 medium-9 columns">
-
-
-        <div id="doc-content">
-          <div class="sect1">
-<h2 id="_ugsec">1. Security</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>This guide describes the authentication and authorization features available to secure your Apache Isis application.</p>
-</div>
-<div class="sect2">
-<h3 id="_other_guides">1.1. Other Guides</h3>
-<div class="paragraph">
-<p>Apache Isis documentation is broken out into a number of user, reference and "supporting procedures" guides.</p>
-</div>
-<div class="paragraph">
-<p>The user guides available are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="ugfun.html">Fundamentals</a></p>
-</li>
-<li>
-<p><a href="ugvw.html">Wicket viewer</a></p>
-</li>
-<li>
-<p><a href="ugvro.html">Restful Objects viewer</a></p>
-</li>
-<li>
-<p><a href="ugdno.html">DataNucleus object store</a></p>
-</li>
-<li>
-<p><a href="#">Security</a> (this guide)</p>
-</li>
-<li>
-<p><a href="ugtst.html">Testing</a></p>
-</li>
-<li>
-<p><a href="ugbtb.html">Beyond the Basics</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The reference guides are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="rgant.html">Annotations</a></p>
-</li>
-<li>
-<p><a href="rgsvc.html">Domain Services</a></p>
-</li>
-<li>
-<p><a href="rgcfg.html">Configuration Properties</a></p>
-</li>
-<li>
-<p><a href="rgcms.html">Classes, Methods and Schema</a></p>
-</li>
-<li>
-<p><a href="rgmvn.html">Apache Isis Maven plugin</a></p>
-</li>
-<li>
-<p><a href="rgfis.html">Framework Internal Services</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The remaining guides are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="dg.html">Developers' Guide</a> (how to set up a development environment
-for Apache Isis and contribute back to the project)</p>
-</li>
-<li>
-<p><a href="cgcom.html">Committers' Guide</a> (release procedures and related practices)</p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_terminology">1.2. Terminology</h3>
-<div class="paragraph">
-<p>Apache Isis has built-in support for authentication and authorization:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>By "authentication" we mean logging into the application using some credentials, typically a username and password.  Authentication also means looking up the set of roles to which a user belongs.</p>
-</li>
-<li>
-<p>By "authorization" we mean permissions: granting roles to have access to features (object member) of the app.</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>Isis has two levels of permissions.  <em>Read</em> permission means that the user can view the object member; it will be rendered in the UI.  An action with only read permission will be shown disabled ("greyed out".  <em>Write</em> permission means that the object member can be changed.  For actions this means that they can be invoked.</p>
-</div>
-<div class="paragraph">
-<p>Isis provides an API for both authentication and authorization, and provides an implementation that integrates with <a href="http://shiro.apache.org">Apache Shiro</a>.  Shiro in turn uses the concept of a <em>realm</em> as a source for both authentication and optionally authorization.</p>
-</div>
-<div class="paragraph">
-<p>Shiro ships with a simple text-based realm&#8201;&#8212;&#8201;the <code>IniRealm</code>&#8201;&#8212;&#8201;which reads users (and password), user roles and role permissions from the <code>WEB-INF/shiro.ini</code> file.  The <a href="ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp archetype</a> is configured to use this realm.</p>
-</div>
-<div class="paragraph">
-<p>Shiro also ships with an implementation of an LDAP-based realm; LDAP is often used to manage user/passwords and corresponding user groups.  Apache Isis in turn extends this with its <code>IsisLdapRealm</code>, which provides more flexibility for both group/role and role/permissions management.</p>
-</div>
-<div class="paragraph">
-<p>In addition, the (non-ASF) <a href="http://www.isisaddons.org">Isis Addons</a> provides the <a href="http://github.com/isisaddons/isis-module-security">Isis addons' security</a> module, which also provides an implementation of the Shiro <code>Realm</code> API.  However, the security module also represents users, roles and permissions as domain objects, allowing them to be administered through Apache Isis itself.  Moreover, the security module can optionally delegate password management to a subsidiary (delegate) realm (usually LDAP as discussed above).</p>
-</div>
-<div class="paragraph">
-<p>In addition to Apache Isis' Shiro-based implementation of its authentication and authorization APIs, Isis also provides a "bypass" implementation, useful for quick-n-dirty prototyping when you want to in effect disable (bypass) security completely.</p>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="title">What about auditing?</div>
-<div class="paragraph">
-<p>A further aspect of security is auditing: recording what data was modified by which user.</p>
-</div>
-<div class="paragraph">
-<p>Apache Isis provides the <a href="rgsvc.html#_rgsvc_api_InteractionContext"><code>InteractionContext</code></a>
-can be used to track the actions being invoked, and the <a href="rgsvc.html#_rgsvc_spi_AuditerService"><code>AuditerService</code></a>
-captures what data was modified as a result (auditing).  When <code>Interaction</code>s are persisted (eg by way of
-(non-ASF) <a href="http://github.com/isisaddons/isis-module-publishmq">Isis addons' publishmq</a> module) this provides excellent
-traceability.  The (non-ASF) <a href="http://github.com/isisaddons/isis-module-audit">Isis addons' audit</a> module provides an
-implementation of the <code>AuditerService</code>.</p>
-</div>
-<div class="paragraph">
-<p>For earlier versions of the framework the
-<a href="rgsvc.html#_rgsvc_spi_CommandService"><code>CommandService</code></a> can be used to capture actions, while the (deprecated)
-<a href="rgsvc.html#_rgsvc_spi_AuditingService"><code>AuditingService</code></a> used to capture data modified.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_ugsec_configuring-isis-to-use-shiro">2. Configuring Apache Isis to use Shiro</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Apache Isis' security mechanism is configurable, specifying an <code>Authenticator</code> and an <code>Authorizor</code> (non-public) APIs.  The Shiro security mechanism is an integration wih Apache Shiro that implements both interfaces.</p>
-</div>
-<div class="admonitionblock tip">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-tip" title="Tip"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>The <a href="ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp archetype</a> is pre-configured to use Apache Shiro, so much of what follows is set up already.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="sect2">
-<h3 id="_telling_apache_isis_to_use_shiro">2.1. Telling Apache Isis to use Shiro</h3>
-<div class="paragraph">
-<p>To tell Apache Isis to use Shiro, update the <code>WEB-INF/isis.properties</code> file:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="ini">isis.authentication=shiro
-isis.authorization=shiro</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>This installs the appropriate implementation (the <code>ShiroAuthenticatorOrAuthorizor</code> class) that use Shiro&#8217;s APIs to perform authentication and authorization:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="images/security/security-apis-impl/configure-isis-to-use-shiro.png" alt="configure isis to use shiro" width="600px">
-</div>
-</div>
-<div class="paragraph">
-<p>The figure above doesn&#8217;t tell the whole story; we haven&#8217;t yet seen how Shiro itself is configured to use realms.  The <code>ShiroAuthenticatorOrAuthorizor</code> is in essence the glue between the Apache Isis runtime and Shiro.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_configuring_isis_shiro_authenticator">2.2. Configuring Isis' Shiro Authenticator</h3>
-<div class="paragraph">
-<p>The <code>ShiroAuthenticatorOrAuthorizor</code> class itself supports a single optional property.  This can
-be configured in <code>authentication_shiro.properties</code> file:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="ini">isis.authentication.shiro.autoLogoutIfAlreadyAuthenticated=false</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>This configuration property only comes into effect for the <a href="ugvro.html">Restful Objects viewer</a>; if set then
-the Shiro subject - if found to be still authenticated - will be logged out anyway and then re-authenticated.</p>
-</div>
-<div class="admonitionblock warning">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-warning" title="Warning"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>This auto-logout behaviour was the default prior to <code>1.13.0</code>, but is believed to be the root cause of some
-exceptions caused by a possible race condition.  There should generally be no need to change this property from its
-default (<code>false</code>).</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_bootstrapping_shiro">2.3. Bootstrapping Shiro</h3>
-<div class="paragraph">
-<p>The Shiro environment (in essence, thread-locals holding the security credentials) needs to be bootstrapped using the following settings in the <code>WEB-INF/web.xml</code> file:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="xml"><span class="tag">&lt;listener&gt;</span>
+    </style>  
+ </head> 
+ <body> 
+  <div class="row"> 
+   <div class="fixed contain-to-grid header"> 
+    <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem"> 
+     <ul class="title-area"> 
+      <li class="name"> <h1> <a href="/index.html">Apache Isis\u2122</a> </h1> </li> 
+      <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone --> 
+      <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li> 
+     </ul> 
+     <section class="top-bar-section"> 
+      <ul class="right"> 
+       <li class="has-form"> 
+        <form class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse"> 
+         <div class="row collapse"> 
+          <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya"> 
+          <input type="hidden" name="cof" value="FORID:0"> 
+          <input class="form-control" name="q" type="text" placeholder="Search"> 
+         </div> 
+        </form> </li> 
+      </ul> 
+      <!-- Left Nav Section --> 
+      <ul class="left"> 
+       <li><a href="/documentation.html">Documentation</a></li> 
+       <li><a href="/downloads.html">Downloads</a></li> 
+       <li><a href="/help.html">Help</a></li> 
+       <li><a href="/asf.html">@ASF</a></li> 
+      </ul> 
+     </section> 
+    </nav> 
+   </div> 
+  </div> 
+  <div class="row"> 
+   <div id="doc-content-left" class="large-9 medium-9 columns"> 
+    <div id="doc-content">
+     <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/ugsec.adoc&quot;" style="float: right; font-size: small; padding: 6px;  "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+     <div class="sect1"> 
+      <h2 id="_ugsec">1. Security</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_ugsec.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>This guide describes the authentication and authorization features available to secure your Apache Isis application.</p> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_other_guides">1.1. Other Guides</h3> 
+        <div class="paragraph"> 
+         <p>Apache Isis documentation is broken out into a number of user, reference and "supporting procedures" guides.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The user guides available are:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><a href="ugfun.html">Fundamentals</a></p> </li> 
+          <li> <p><a href="ugvw.html">Wicket viewer</a></p> </li> 
+          <li> <p><a href="ugvro.html">Restful Objects viewer</a></p> </li> 
+          <li> <p><a href="ugdno.html">DataNucleus object store</a></p> </li> 
+          <li> <p><a href="#">Security</a> (this guide)</p> </li> 
+          <li> <p><a href="ugtst.html">Testing</a></p> </li> 
+          <li> <p><a href="ugbtb.html">Beyond the Basics</a></p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The reference guides are:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><a href="rgant.html">Annotations</a></p> </li> 
+          <li> <p><a href="rgsvc.html">Domain Services</a></p> </li> 
+          <li> <p><a href="rgcfg.html">Configuration Properties</a></p> </li> 
+          <li> <p><a href="rgcms.html">Classes, Methods and Schema</a></p> </li> 
+          <li> <p><a href="rgmvn.html">Apache Isis Maven plugin</a></p> </li> 
+          <li> <p><a href="rgfis.html">Framework Internal Services</a></p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The remaining guides are:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><a href="dg.html">Developers' Guide</a> (how to set up a development environment for Apache Isis and contribute back to the project)</p> </li> 
+          <li> <p><a href="cgcom.html">Committers' Guide</a> (release procedures and related practices)</p> </li> 
+         </ul> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_terminology">1.2. Terminology</h3> 
+        <div class="paragraph"> 
+         <p>Apache Isis has built-in support for authentication and authorization:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p>By "authentication" we mean logging into the application using some credentials, typically a username and password. Authentication also means looking up the set of roles to which a user belongs.</p> </li> 
+          <li> <p>By "authorization" we mean permissions: granting roles to have access to features (object member) of the app.</p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Isis has two levels of permissions. <em>Read</em> permission means that the user can view the object member; it will be rendered in the UI. An action with only read permission will be shown disabled ("greyed out". <em>Write</em> permission means that the object member can be changed. For actions this means that they can be invoked.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Isis provides an API for both authentication and authorization, and provides an implementation that integrates with <a href="http://shiro.apache.org">Apache Shiro</a>. Shiro in turn uses the concept of a <em>realm</em> as a source for both authentication and optionally authorization.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Shiro ships with a simple text-based realm\u2009\u2014\u2009the <code>IniRealm</code>\u2009\u2014\u2009which reads users (and password), user roles and role permissions from the <code>WEB-INF/shiro.ini</code> file. The <a href="ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp archetype</a> is configured to use this realm.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Shiro also ships with an implementation of an LDAP-based realm; LDAP is often used to manage user/passwords and corresponding user groups. Apache Isis in turn extends this with its <code>IsisLdapRealm</code>, which provides more flexibility for both group/role and role/permissions management.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>In addition, the (non-ASF) <a href="http://www.isisaddons.org">Isis Addons</a> provides the <a href="http://github.com/isisaddons/isis-module-security">Isis addons' security</a> module, which also provides an implementation of the Shiro <code>Realm</code> API. However, the security module also represents users, roles and permissions as domain objects, allowing them to be administered through Apache Isis itself. Moreover, the security module can optionally delegate password management to a subsidiary (delegate) realm (usually LDAP as discussed above).</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>In addition to Apache Isis' Shiro-based implementation of its authentication and authorization APIs, Isis also provides a "bypass" implementation, useful for quick-n-dirty prototyping when you want to in effect disable (bypass) security completely.</p> 
+        </div> 
+        <div class="admonitionblock note"> 
+         <table> 
+          <tbody>
+           <tr> 
+            <td class="icon"> <i class="fa icon-note" title="Note"></i> </td> 
+            <td class="content"> 
+             <div class="title">
+              What about auditing?
+             </div> 
+             <div class="paragraph"> 
+              <p>A further aspect of security is auditing: recording what data was modified by which user.</p> 
+             </div> 
+             <div class="paragraph"> 
+              <p>Apache Isis provides the <a href="rgsvc.html#_rgsvc_api_InteractionContext"><code>InteractionContext</code></a> can be used to track the actions being invoked, and the <a href="rgsvc.html#_rgsvc_spi_AuditerService"><code>AuditerService</code></a> captures what data was modified as a result (auditing). When <code>Interaction</code>s are persisted (eg by way of (non-ASF) <a href="http://github.com/isisaddons/isis-module-publishmq">Isis addons' publishmq</a> module) this provides excellent traceability. The (non-ASF) <a href="http://github.com/isisaddons/isis-module-audit">Isis addons' audit</a> module provides an implementation of the <code>AuditerService</code>.</p> 
+             </div> 
+             <div class="paragraph"> 
+              <p>For earlier versions of the framework the <a href="rgsvc.html#_rgsvc_spi_CommandService"><code>CommandService</code></a> can be used to capture actions, while the (deprecated) <a href="rgsvc.html#_rgsvc_spi_AuditingService"><code>AuditingService</code></a> used to capture data modified.</p> 
+             </div> </td> 
+           </tr> 
+          </tbody>
+         </table> 
+        </div> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_ugsec_configuring-isis-to-use-shiro">2. Configuring Apache Isis to use Shiro</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_ugsec_configuring-isis-to-use-shiro.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>Apache Isis' security mechanism is configurable, specifying an <code>Authenticator</code> and an <code>Authorizor</code> (non-public) APIs. The Shiro security mechanism is an integration wih Apache Shiro that implements both interfaces.</p> 
+       </div> 
+       <div class="admonitionblock tip"> 
+        <table> 
+         <tbody>
+          <tr> 
+           <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td> 
+           <td class="content"> 
+            <div class="paragraph"> 
+             <p>The <a href="ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp archetype</a> is pre-configured to use Apache Shiro, so much of what follows is set up already.</p> 
+            </div> </td> 
+          </tr> 
+         </tbody>
+        </table> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_telling_apache_isis_to_use_shiro">2.1. Telling Apache Isis to use Shiro</h3> 
+        <div class="paragraph"> 
+         <p>To tell Apache Isis to use Shiro, update the <code>WEB-INF/isis.properties</code> file:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="ini">isis.authentication=shiro
+isis.authorization=shiro</code></pre> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>This installs the appropriate implementation (the <code>ShiroAuthenticatorOrAuthorizor</code> class) that use Shiro\u2019s APIs to perform authentication and authorization:</p> 
+        </div> 
+        <div class="imageblock"> 
+         <div class="content"> 
+          <img src="images/security/security-apis-impl/configure-isis-to-use-shiro.png" alt="configure isis to use shiro" width="600px"> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The figure above doesn\u2019t tell the whole story; we haven\u2019t yet seen how Shiro itself is configured to use realms. The <code>ShiroAuthenticatorOrAuthorizor</code> is in essence the glue between the Apache Isis runtime and Shiro.</p> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_configuring_isis_shiro_authenticator">2.2. Configuring Isis' Shiro Authenticator</h3> 
+        <div class="paragraph"> 
+         <p>The <code>ShiroAuthenticatorOrAuthorizor</code> class itself supports a single optional property. This can be configured in <code>authentication_shiro.properties</code> file:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="ini">isis.authentication.shiro.autoLogoutIfAlreadyAuthenticated=false</code></pre> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>This configuration property only comes into effect for the <a href="ugvro.html">Restful Objects viewer</a>; if set then the Shiro subject - if found to be still authenticated - will be logged out anyway and then re-authenticated.</p> 
+        </div> 
+        <div class="admonitionblock warning"> 
+         <table> 
+          <tbody>
+           <tr> 
+            <td class="icon"> <i class="fa icon-warning" title="Warning"></i> </td> 
+            <td class="content"> 
+             <div class="paragraph"> 
+              <p>This auto-logout behaviour was the default prior to <code>1.13.0</code>, but is believed to be the root cause of some exceptions caused by a possible race condition. There should generally be no need to change this property from its default (<code>false</code>).</p> 
+             </div> </td> 
+           </tr> 
+          </tbody>
+         </table> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_bootstrapping_shiro">2.3. Bootstrapping Shiro</h3> 
+        <div class="paragraph"> 
+         <p>The Shiro environment (in essence, thread-locals holding the security credentials) needs to be bootstrapped using the following settings in the <code>WEB-INF/web.xml</code> file:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="xml"><span class="tag">&lt;listener&gt;</span>
     <span class="tag">&lt;listener-class&gt;</span>org.apache.shiro.web.env.EnvironmentLoaderListener<span class="tag">&lt;/listener-class&gt;</span>
 <span class="tag">&lt;/listener&gt;</span>
 <span class="tag">&lt;filter&gt;</span>
@@ -737,164 +648,155 @@ default (<code>false</code>).</p>
 <span class="tag">&lt;filter-mapping&gt;</span>
     <span class="tag">&lt;filter-name&gt;</span>ShiroFilter<span class="tag">&lt;/filter-name&gt;</span>
     <span class="tag">&lt;url-pattern&gt;</span>/*<span class="tag">&lt;/url-pattern&gt;</span>
-<span class="tag">&lt;/filter-mapping&gt;</span></code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Based on this Shiro will then read <code>WEB-INF/shiro.ini</code> file to configure its Realm definitions for authentication and authorization.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="__code_web_inf_shiro_ini_code">2.4. <code>WEB-INF/shiro.ini</code></h3>
-<div class="paragraph">
-<p>The <code>shiro.ini</code> file is used to specify the realm(s) that Shiro will delegate to:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="ini">securityManager.realms = $realmName</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Shiro&#8217;s ini file supports a "poor-man&#8217;s" dependency injection (<a href="https://shiro.apache.org/configuration.html">their words</a>), and so <code>$realmName</code> in the above example is a reference to a realm defined elsewhere in <code>shiro.ini</code>.  The subsequent sections describe the specifics for thevarious realm implementations available to you.</p>
-</div>
-<div class="paragraph">
-<p>It&#8217;s also possible to configure Shiro to support multiple realms.</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="ini">securityManager.realms = $realm1,$realm2</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>You can learn more about Shiro realms in the <a href="http://shiro.apache.org/realm.html">Shiro documentation</a>.</p>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_ugsec_shiro-ini-realm">3. Shiro Ini Realm</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Probably the simplest realm to use is Shiro&#8217;s built-in <code>IniRealm</code>, which reads from the (same) <code>WEB-INF/shiro.ini</code> file.</p>
-</div>
-<div class="paragraph">
-<p>This is suitable for prototyping, but isn&#8217;t intended for production use, if only because user/password credentials are stored in plain text.  Nevertheless, it&#8217;s a good starting point.  The app generated by the <a href="ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp archetype</a> is configured to use this realm.</p>
-</div>
-<div class="paragraph">
-<p>The diagram below shows the Isis and components involved:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="images/security/security-apis-impl/configure-shiro-to-use-ini-realm.PNG" alt="configure shiro to use ini realm" width="600px">
-</div>
-</div>
-<div class="paragraph">
-<p>The realm is responsible for validating the user credentials, and then creates a Shiro <a href="http://shiro.apache.org/static/latest/apidocs/org/apache/shiro/subject/Subject.html"><code>Subject</code></a> which represents the user (for the current request).  Apache Isis <code>Authenticator</code> component then interacts with the <code>Subject</code> in order to check permissions.</p>
-</div>
-<div class="sect2">
-<h3 id="_shiro_configuration">3.1. Shiro Configuration</h3>
-<div class="paragraph">
-<p>To use the built-in <code>IniRealm</code>, we add the following to <code>WEB-INF/shiro.ini</code>:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="ini">securityManager.realms = $iniRealm</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>(Unlike other realms) there is no need to "define" <code>$iniRealm</code>; it is automatically available to us.</p>
-</div>
-<div class="paragraph">
-<p>Specifying <code>$iniRealm</code> means that the usernames/passwords, roles and permissions are read from the <code>shiro.ini</code> file itself.  Specifically:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>the users/passwords and their roles from the <code>[users]</code> sections;</p>
-</li>
-<li>
-<p>the roles are mapped to permissions in the <code>[roles]</code> section.</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The format of these is described below.</p>
-</div>
-<div class="sect3">
-<h4 id="__code_users_code_section">3.1.1. <code>[users]</code> section</h4>
-<div class="paragraph">
-<p>This section lists users, passwords and their roles.</p>
-</div>
-<div class="paragraph">
-<p>For example:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="ini">sven = pass, admin_role
+<span class="tag">&lt;/filter-mapping&gt;</span></code></pre> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Based on this Shiro will then read <code>WEB-INF/shiro.ini</code> file to configure its Realm definitions for authentication and authorization.</p> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="__code_web_inf_shiro_ini_code">2.4. <code>WEB-INF/shiro.ini</code></h3> 
+        <div class="paragraph"> 
+         <p>The <code>shiro.ini</code> file is used to specify the realm(s) that Shiro will delegate to:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="ini">securityManager.realms = $realmName</code></pre> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Shiro\u2019s ini file supports a "poor-man\u2019s" dependency injection (<a href="https://shiro.apache.org/configuration.html">their words</a>), and so <code>$realmName</code> in the above example is a reference to a realm defined elsewhere in <code>shiro.ini</code>. The subsequent sections describe the specifics for thevarious realm implementations available to you.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>It\u2019s also possible to configure Shiro to support multiple realms.</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="ini">securityManager.realms = $realm1,$realm2</code></pre> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>You can learn more about Shiro realms in the <a href="http://shiro.apache.org/realm.html">Shiro documentation</a>.</p> 
+        </div> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_ugsec_shiro-ini-realm">3. Shiro Ini Realm</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_ugsec_shiro-ini-realm.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>Probably the simplest realm to use is Shiro\u2019s built-in <code>IniRealm</code>, which reads from the (same) <code>WEB-INF/shiro.ini</code> file.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>This is suitable for prototyping, but isn\u2019t intended for production use, if only because user/password credentials are stored in plain text. Nevertheless, it\u2019s a good starting point. The app generated by the <a href="ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp archetype</a> is configured to use this realm.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>The diagram below shows the Isis and components involved:</p> 
+       </div> 
+       <div class="imageblock"> 
+        <div class="content"> 
+         <img src="images/security/security-apis-impl/configure-shiro-to-use-ini-realm.PNG" alt="configure shiro to use ini realm" width="600px"> 
+        </div> 
+       </div> 
+       <div class="paragraph"> 
+        <p>The realm is responsible for validating the user credentials, and then creates a Shiro <a href="http://shiro.apache.org/static/latest/apidocs/org/apache/shiro/subject/Subject.html"><code>Subject</code></a> which represents the user (for the current request). Apache Isis <code>Authenticator</code> component then interacts with the <code>Subject</code> in order to check permissions.</p> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_shiro_configuration">3.1. Shiro Configuration</h3> 
+        <div class="paragraph"> 
+         <p>To use the built-in <code>IniRealm</code>, we add the following to <code>WEB-INF/shiro.ini</code>:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="ini">securityManager.realms = $iniRealm</code></pre> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>(Unlike other realms) there is no need to "define" <code>$iniRealm</code>; it is automatically available to us.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Specifying <code>$iniRealm</code> means that the usernames/passwords, roles and permissions are read from the <code>shiro.ini</code> file itself. Specifically:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p>the users/passwords and their roles from the <code>[users]</code> sections;</p> </li> 
+          <li> <p>the roles are mapped to permissions in the <code>[roles]</code> section.</p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The format of these is described below.</p> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="__code_users_code_section">3.1.1. <code>[users]</code> section</h4> 
+         <div class="paragraph"> 
+          <p>This section lists users, passwords and their roles.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>For example:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="ini">sven = pass, admin_role
 dick = pass, user_role, analysis_role, self-install_role
-bob  = pass, user_role, self-install_role</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>The first value is the password (eg "pass", the remaining values are the role(s).</p>
-</div>
-</div>
-<div class="sect3">
-<h4 id="__code_roles_code_section">3.1.2. <code>[roles]</code> section</h4>
-<div class="paragraph">
-<p>This section lists roles and their corresponding permissions.</p>
-</div>
-<div class="paragraph">
-<p>For example:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="ini">user_role = *:ToDoItems:*:*,\
+bob  = pass, user_role, self-install_role</code></pre> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>The first value is the password (eg "pass", the remaining values are the role(s).</p> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="__code_roles_code_section">3.1.2. <code>[roles]</code> section</h4> 
+         <div class="paragraph"> 
+          <p>This section lists roles and their corresponding permissions.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>For example:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="ini">user_role = *:ToDoItems:*:*,\
             *:ToDoItem:*:*,\
             *:ToDoAppDashboard:*:*
 analysis_role = *:ToDoItemAnalysis:*:*,\
             *:ToDoItemsByCategoryViewModel:*:*,\
             *:ToDoItemsByDateRangeViewModel:*:*
 self-install_role = *:ToDoItemsFixturesService:install:*
-admin_role = *</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>The value is a comma-separated list of permissions for the role.  The format is:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="ini">packageName:className:memberName:r,w</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>where:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><code>memberName</code> is the property, collection or action name.</p>
-</li>
-<li>
-<p><code>r</code> indicates that the member is visible</p>
-</li>
-<li>
-<p><code>w</code> indicates that the member is usable (editable or invokable)</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>and where each of the parts of the permission string can be wildcarded using <code>*</code>.</p>
-</div>
-<div class="paragraph">
-<p>Because these are wildcards, a '*' can be used at any level. Additionally, missing levels assume wildcards.</p>
-</div>
-<div class="paragraph">
-<p>Thus:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="ini">com.mycompany.myapp:Customer:firstName:r,w   # view or edit customer's firstName
+admin_role = *</code></pre> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>The value is a comma-separated list of permissions for the role. The format is:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="ini">packageName:className:memberName:r,w</code></pre> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>where:</p> 
+         </div> 
+         <div class="ulist"> 
+          <ul> 
+           <li> <p><code>memberName</code> is the property, collection or action name.</p> </li> 
+           <li> <p><code>r</code> indicates that the member is visible</p> </li> 
+           <li> <p><code>w</code> indicates that the member is usable (editable or invokable)</p> </li> 
+          </ul> 
+         </div> 
+         <div class="paragraph"> 
+          <p>and where each of the parts of the permission string can be wildcarded using <code>*</code>.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>Because these are wildcards, a '*' can be used at any level. Additionally, missing levels assume wildcards.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>Thus:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="ini">com.mycompany.myapp:Customer:firstName:r,w   # view or edit customer's firstName
 com.mycompany.myapp:Customer:lastName:r      # view customer's lastName only
 com.mycompany.myapp:Customer:placeOrder:*    # view and invoke placeOrder action
 com.mycompany.myapp:Customer:placeOrder      # ditto
@@ -904,93 +806,94 @@ com.mycompany.myapp:*:*:*                    # view/edit for all classes in myap
 com.mycompany.myapp:*:*                      # ditto
 com.mycompany.myapp:*                        # ditto
 com.mycompany.myapp                          # ditto
-*                                            # view/edit access to everything</code></pre>
-</div>
-</div>
-<div class="admonitionblock tip">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-tip" title="Tip"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>The format of the permissions string is configurable in Shiro, and Apache Isis uses this to provide an extended wildcard format, described <a href="#_ugsec_shiro-isis-enhanced-wildcard-permission">here</a>.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_externalized_inirealm">3.2. Externalized IniRealm</h3>
-<div class="paragraph">
-<p>There&#8217;s no requirement for all users/roles to be defined in the <code>shiro.ini</code> file.  Instead, a realm can be defined that loads its users/roles from some other resource.</p>
-</div>
-<div class="paragraph">
-<p>For example:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="ini">$realm1=org.apache.shiro.realm.text.IniRealm <i class="conum" data-value="1"></i><b>(1)</b>
-realm1.resourcePath=classpath:webapp/realm1.ini <i class="conum" data-value="2"></i><b>(2)</b></code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td>happens to (coincidentally) be the <a href="http://shiro.apache.org/static/latest/apidocs/org/apache/shiro/realm/text/IniRealm.html">same implementation</a> as Shiro&#8217;s built-in $iniRealm</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="2"></i><b>2</b></td>
-<td>in this case load the users/roles from the <code>src/main/resources/webapp/realm1.ini</code> file.</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>Note that a URL could be provided as the <code>resourcePath</code>, so a centralized config file could be used.  Even so, the</p>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>If configured this way then the <code>[users]</code> and <code>[roles]</code> sections of <code>shiro.ini</code> become unused. Instead, the corresponding sections from for <code>realm1.ini</code> are used instead.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_ugsec_shiro-isis-ldap-realm">4. Isis Ldap Realm</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Isis ships with an implementation of <a href="http://shiro.apache.org">Apache Shiro</a>'s <code>Realm</code> class that allows user authentication and authorization to be performed against an LDAP server.</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="images/security/security-apis-impl/configure-shiro-to-use-isis-ldap-realm.PNG" alt="configure shiro to use isis ldap realm" width="600px">
-</div>
-</div>
-<div class="paragraph">
-<p>The LDAP database stores the user/passwords and user groups, while the <code>shiro.ini</code> file is used to map the LDAP groups to roles, and to map the roles to permissions.</p>
-</div>
-<div class="sect2">
-<h3 id="_shiro_configuration_2">4.1. Shiro Configuration</h3>
-<div class="paragraph">
-<p>To use LDAP involves telling Shiro how to instantiate the realm.  This bootstrapping info lives in the <code>WEB-INF/shiro.ini</code>:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="ini">contextFactory = org.apache.isis.security.shiro.IsisLdapContextFactory
+*                                            # view/edit access to everything</code></pre> 
+          </div> 
+         </div> 
+         <div class="admonitionblock tip"> 
+          <table> 
+           <tbody>
+            <tr> 
+             <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td> 
+             <td class="content"> 
+              <div class="paragraph"> 
+               <p>The format of the permissions string is configurable in Shiro, and Apache Isis uses this to provide an extended wildcard format, described <a href="#_ugsec_shiro-isis-enhanced-wildcard-permission">here</a>.</p> 
+              </div> </td> 
+            </tr> 
+           </tbody>
+          </table> 
+         </div> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_externalized_inirealm">3.2. Externalized IniRealm</h3> 
+        <div class="paragraph"> 
+         <p>There\u2019s no requirement for all users/roles to be defined in the <code>shiro.ini</code> file. Instead, a realm can be defined that loads its users/roles from some other resource.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>For example:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="ini">$realm1=org.apache.shiro.realm.text.IniRealm <i class="conum" data-value="1"></i><b>(1)</b>
+realm1.resourcePath=classpath:webapp/realm1.ini <i class="conum" data-value="2"></i><b>(2)</b></code></pre> 
+         </div> 
+        </div> 
+        <div class="colist arabic"> 
+         <table> 
+          <tbody>
+           <tr> 
+            <td><i class="conum" data-value="1"></i><b>1</b></td> 
+            <td>happens to (coincidentally) be the <a href="http://shiro.apache.org/static/latest/apidocs/org/apache/shiro/realm/text/IniRealm.html">same implementation</a> as Shiro\u2019s built-in $iniRealm</td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="2"></i><b>2</b></td> 
+            <td>in this case load the users/roles from the <code>src/main/resources/webapp/realm1.ini</code> file.</td> 
+           </tr> 
+          </tbody>
+         </table> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Note that a URL could be provided as the <code>resourcePath</code>, so a centralized config file could be used. Even so, the</p> 
+        </div> 
+        <div class="admonitionblock note"> 
+         <table> 
+          <tbody>
+           <tr> 
+            <td class="icon"> <i class="fa icon-note" title="Note"></i> </td> 
+            <td class="content"> 
+             <div class="paragraph"> 
+              <p>If configured this way then the <code>[users]</code> and <code>[roles]</code> sections of <code>shiro.ini</code> become unused. Instead, the corresponding sections from for <code>realm1.ini</code> are used instead.</p> 
+             </div> </td> 
+           </tr> 
+          </tbody>
+         </table> 
+        </div> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_ugsec_shiro-isis-ldap-realm">4. Isis Ldap Realm</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_ugsec_shiro-isis-ldap-realm.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>Isis ships with an implementation of <a href="http://shiro.apache.org">Apache Shiro</a>'s <code>Realm</code> class that allows user authentication and authorization to be performed against an LDAP server.</p> 
+       </div> 
+       <div class="imageblock"> 
+        <div class="content"> 
+         <img src="images/security/security-apis-impl/configure-shiro-to-use-isis-ldap-realm.PNG" alt="configure shiro to use isis ldap realm" width="600px"> 
+        </div> 
+       </div> 
+       <div class="paragraph"> 
+        <p>The LDAP database stores the user/passwords and user groups, while the <code>shiro.ini</code> file is used to map the LDAP groups to roles, and to map the roles to permissions.</p> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_shiro_configuration_2">4.1. Shiro Configuration</h3> 
+        <div class="paragraph"> 
+         <p>To use LDAP involves telling Shiro how to instantiate the realm. This bootstrapping info lives in the <code>WEB-INF/shiro.ini</code>:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="ini">contextFactory = org.apache.isis.security.shiro.IsisLdapContextFactory
 contextFactory.url = ldap://localhost:10389
 contextFactory.systemUsername = uid=admin,ou=system        <i class="conum" data-value="1"></i><b>(1)</b>
 contextFactory.systemPassword = secret
@@ -1019,282 +922,283 @@ ldapRealm.permissionsByRole=\                              <i class="conum" data
    self-install_role = *:ToDoItemsFixturesService:install:* ; \
    admin_role = *
 
-securityManager.realms = $ldapRealm</code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td>user accounts are searched using a dedicated service account</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="2"></i><b>2</b></td>
-<td>SASL (CRAM-MD5) authentication is used for this authentication</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="3"></i><b>3</b></td>
-<td>Apache Isis' implementation of the LDAP realm.</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="4"></i><b>4</b></td>
-<td>groups are searched under <code>ou=groups,o=mojo</code> (where <code>mojo</code> is the company name)</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="5"></i><b>5</b></td>
-<td>each group has an LDAP objectClass of <code>groupOfUniqueNames</code></td>
-</tr>
-<tr>
-<td><i class="conum" data-value="6"></i><b>6</b></td>
-<td>each group has a vector attribute of <code>uniqueMember</code></td>
-</tr>
-<tr>
-<td><i class="conum" data-value="7"></i><b>7</b></td>
-<td>groups looked up from LDAP can optionally be mapped to logical roles; otherwise groups are used as role names directly</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="8"></i><b>8</b></td>
-<td>roles are mapped in turn to permissions</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>The value of <code>uniqueMember</code> is in the form <code>uid=xxx</code>, with <code>xxx</code> being the uid of the user
-* users searched under <code>ou=system</code>
-* users have, at minimum, a <code>uid</code> attribute and a password
-* the users credentials are used to verify their user/password</p>
-</div>
-<div class="paragraph">
-<p>The above configuration has been tested against <a href="http://directory.apache.org/apacheds/">ApacheDS</a>, v1.5.7. This can be administered using <a href="http://directory.apache.org/studio/">Apache Directory Studio</a>, v1.5.3.</p>
-</div>
-<div class="admonitionblock tip">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-tip" title="Tip"></i>
-</td>
-<td class="content">
-<div class="title">Shiro Realm Mappings</div>
-<div class="paragraph">
-<p>When configuring role based permission mapping, there can only be one of these entries per realm:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="ini">realm.groupToRolesMappings = ...</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>and</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="ini">realm.roleToPermissionsMappings = ...</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>This forces you to put everything on one line for each of the above.  This is, unfortunately, a Shiro "feature".  And if you repeat the entries above then it&#8217;s "last one wins".)</p>
-</div>
-<div class="paragraph">
-<p>To make the configuration maintainable, use "\" to separate the mappings onto separate lines in the file.  Use this technique for both group to roles mapping and role to permission mapping. If you use the '&#39; after the "," that separates the key:value pairs it is more readable.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_externalizing_role_perms">4.2. Externalizing role perms</h3>
-<div class="paragraph">
-<p>As an alternative to injecting the <code>permissionsByRole</code> property, the role/permission mapping can alternatively be specified by injecting a resource path:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="ini">ldapRealm.resourcePath=classpath:webapp/myroles.ini</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>where <code>myroles.ini</code> is in <code>src/main/resources/webapp</code>, and takes the form:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="ini">[roles]
+securityManager.realms = $ldapRealm</code></pre> 
+         </div> 
+        </div> 
+        <div class="colist arabic"> 
+         <table> 
+          <tbody>
+           <tr> 
+            <td><i class="conum" data-value="1"></i><b>1</b></td> 
+            <td>user accounts are searched using a dedicated service account</td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="2"></i><b>2</b></td> 
+            <td>SASL (CRAM-MD5) authentication is used for this authentication</td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="3"></i><b>3</b></td> 
+            <td>Apache Isis' implementation of the LDAP realm.</td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="4"></i><b>4</b></td> 
+            <td>groups are searched under <code>ou=groups,o=mojo</code> (where <code>mojo</code> is the company name)</td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="5"></i><b>5</b></td> 
+            <td>each group has an LDAP objectClass of <code>groupOfUniqueNames</code></td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="6"></i><b>6</b></td> 
+            <td>each group has a vector attribute of <code>uniqueMember</code></td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="7"></i><b>7</b></td> 
+            <td>groups looked up from LDAP can optionally be mapped to logical roles; otherwise groups are used as role names directly</td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="8"></i><b>8</b></td> 
+            <td>roles are mapped in turn to permissions</td> 
+           </tr> 
+          </tbody>
+         </table> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The value of <code>uniqueMember</code> is in the form <code>uid=xxx</code>, with <code>xxx</code> being the uid of the user * users searched under <code>ou=system</code> * users have, at minimum, a <code>uid</code> attribute and a password * the users credentials are used to verify their user/password</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The above configuration has been tested against <a href="http://directory.apache.org/apacheds/">ApacheDS</a>, v1.5.7. This can be administered using <a href="http://directory.apache.org/studio/">Apache Directory Studio</a>, v1.5.3.</p> 
+        </div> 
+        <div class="admonitionblock tip"> 
+         <table> 
+          <tbody>
+           <tr> 
+            <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td> 
+            <td class="content"> 
+             <div class="title">
+              Shiro Realm Mappings
+             </div> 
+             <div class="paragraph"> 
+              <p>When configuring role based permission mapping, there can only be one of these entries per realm:</p> 
+             </div> 
+             <div class="listingblock"> 
+              <div class="content"> 
+               <pre class="CodeRay highlight"><code data-lang="ini">realm.groupToRolesMappings = ...</code></pre> 
+              </div> 
+             </div> 
+             <div class="paragraph"> 
+              <p>and</p> 
+             </div> 
+             <div class="listingblock"> 
+              <div class="content"> 
+               <pre class="CodeRay highlight"><code data-lang="ini">realm.roleToPermissionsMappings = ...</code></pre> 
+              </div> 
+             </div> 
+             <div class="paragraph"> 
+              <p>This forces you to put everything on one line for each of the above. This is, unfortunately, a Shiro "feature". And if you repeat the entries above then it\u2019s "last one wins".)</p> 
+             </div> 
+             <div class="paragraph"> 
+              <p>To make the configuration maintainable, use "\" to separate the mappings onto separate lines in the file. Use this technique for both group to roles mapping and role to permission mapping. If you use the '' after the "," that separates the key:value pairs it is more readable.</p> 
+             </div> </td> 
+           </tr> 
+          </tbody>
+         </table> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_externalizing_role_perms">4.2. Externalizing role perms</h3> 
+        <div class="paragraph"> 
+         <p>As an alternative to injecting the <code>permissionsByRole</code> property, the role/permission mapping can alternatively be specified by injecting a resource path:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="ini">ldapRealm.resourcePath=classpath:webapp/myroles.ini</code></pre> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>where <code>myroles.ini</code> is in <code>src/main/resources/webapp</code>, and takes the form:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="ini">[roles]
 user_role = *:ToDoItemsJdo:*:*,\
             *:ToDoItem:*:*
 self-install_role = *:ToDoItemsFixturesService:install:*
-admin_role = *</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>This separation of the role/mapping can be useful if Shiro is configured to support multiple realms (eg an LdapRealm based one and also an TextRealm)</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_active_ds_ldap_tutorial">4.3. Active DS LDAP tutorial</h3>
-<div class="paragraph">
-<p>The screenshots below show how to setup LDAP accounts in ApacheDS using the Apache Directory Studio.</p>
-</div>
-<div class="paragraph">
-<p>The setup here was initially based on <a href="http://krams915.blogspot.co.uk/2011/01/ldap-apache-directory-studio-basic.html">this tutorial</a>, however we have moved the user accounts so that they are defined in a separate LDAP node.</p>
-</div>
-<div class="paragraph">
-<p>To start, create a partition in order to hold the mojo node (holding the groups):</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="images//configuration/configuring-shiro/ldap/activeds-ldap-mojo-partition.png" alt="ActiveDS LDAP Users">
-</div>
-</div>
-<div class="paragraph">
-<p>Create the <code>ou=groups,o=mojo</code> hierarchy:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="images//configuration/configuring-shiro/ldap/activeds-ldap-mojo-root-dse.png" alt="ActiveDS LDAP Users">
-</div>
-</div>
-<div class="paragraph">
-<p>Configure SASL authentication. This means that the checking of user/password is done implicitly by virtue of Apache Isis connecting to LDAP using these credentials:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="images//configuration/configuring-shiro/ldap/activeds-ldap-sasl-authentication.png" alt="ActiveDS LDAP Users">
-</div>
-</div>
-<div class="paragraph">
-<p>In order for SASL to work, it seems to be necessary to put users under <code>o=system</code>. (This is why the setup is slightly different than the tutorial mentioned above):</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="images//configuration/configuring-shiro/ldap/activeds-ldap-users.png" alt="ActiveDS LDAP Users">
-</div>
-</div>
-<div class="paragraph">
-<p>Configure the users into the groups:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="images//configuration/configuring-shiro/ldap/activeds-ldap-groups.png" alt="ActiveDS LDAP Users">
-</div>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_ugsec_shiro-isisaddons-security-module-realm">5. Security Module Realm</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>The <a href="https://github.com/isisaddons/isis-module-security">Isis Addons' security module</a> (not ASF) provides a complete
-security subdomain for users, roles, permissions; all are persisted as domain entities.</p>
-</div>
-<div class="paragraph">
-<p>What that means, of course, that they can also be administered through your Isis application.  Moreover, the set of permissions (to features) is derived completely from your application&#8217;s metamodel; in essence the permissions are "type-safe".</p>
-</div>
-<div class="paragraph">
-<p>In order to play along, the module includes a Shiro realm, which fits in as follows:</p>
-</div>
-<div class="paragraph">
-<p>The general configuration is as follows:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="images/security/security-apis-impl/configure-shiro-to-use-isisaddons-security-module-realm.PNG" alt="configure shiro to use isisaddons security module realm" width="600px">
-</div>
-</div>
-<div class="paragraph">
-<p>where the <code>IsisModuleSecurityRealm</code> realm is the implementation provided by the module.</p>
-</div>
-<div class="paragraph">
-<p>In the configuration above user passwords are stored in the database.  The module uses <a href="http://www.mindrot.org/projects/jBCrypt/">jBCrypt</a> so that passwords are only stored in a (one-way) encrypted form in the database.</p>
-</div>
-<div class="paragraph">
-<p>The security module also supports a slightly more sophisticated configuration.  Most organizations use LDAP for user credentials, and maintaining two separate user accounts would be less than ideal.  The <code>IsisModuleSecurityRealm</code> can therefore be configured with a subsidiary "delegate" realm that is responsible for performing the primary authentication of the user; if that passes then a user is created (as a domain entity) automatically.
-In most cases this delegate realm will be the LDAP realm, and so the architecture becomes:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="images/security/security-apis-impl/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG" alt="configure shiro to use isisaddons security module realm with delegate realm" width="600px">
-</div>
-</div>
-<div class="paragraph">
-<p>The security module has many more features than are described here, all of which are described in the module&#8217;s <a href="https://github.com/isisaddons/isis-module-security">README</a>.  The README also explains in detail how to configure an existing app to use this module.</p>
-</div>
-<div class="paragraph">
-<p>You can also look at the Isisaddons <a href="https://github.com/isisaddons/isis-app-todoapp">todoapp example</a> (not ASF), which is preconfigured to use the security module.</p>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_ugsec_shiro-jdbc-realm">6. Shiro JDBC Realm</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>There is nothing to stop you from using some other <code>Realm</code> implementation (or indeed writing one yourself).  For example, you could use Shiro&#8217;s own JDBC realm that loads user/password details from a database.</p>
-</div>
-<div class="admonitionblock warning">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-warning" title="Warning"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>If you are happy to use a database then we strongly recommend you use the <a href="http://github.com/isisaddons/isis-module-security">Isis addons' security</a> module instead of a vanilla JDBC; it is far more sophisticated and moreover gives you the ability to administer the system from within your Isis application.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>If you go down this route, then the architecture is as follows:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="images/security/security-apis-impl/configure-shiro-to-use-custom-jdbc-realm.png" alt="configure shiro to use custom jdbc realm" width="600px">
-</div>
-</div>
-<div class="paragraph">
-<p>There&#8217;s quite a lot of configuration required (in <code>WEB-INF/shiro.ini</code>) to set up a JDBC realm, so we&#8217;ll break it out into sections.</p>
-</div>
-<div class="paragraph">
-<p>First, we need to set up the connection to JDBC:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="ini">jdbcRealm=org.apache.shiro.realm.jdbc.JdbcRealm        <i class="conum" data-value="1"></i><b>(1)</b>
+admin_role = *</code></pre> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>This separation of the role/mapping can be useful if Shiro is configured to support multiple realms (eg an LdapRealm based one and also an TextRealm)</p> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_active_ds_ldap_tutorial">4.3. Active DS LDAP tutorial</h3> 
+        <div class="paragraph"> 
+         <p>The screenshots below show how to setup LDAP accounts in ApacheDS using the Apache Directory Studio.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The setup here was initially based on <a href="http://krams915.blogspot.co.uk/2011/01/ldap-apache-directory-studio-basic.html">this tutorial</a>, however we have moved the user accounts so that they are defined in a separate LDAP node.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>To start, create a partition in order to hold the mojo node (holding the groups):</p> 
+        </div> 
+        <div class="imageblock"> 
+         <div class="content"> 
+          <img src="images//configuration/configuring-shiro/ldap/activeds-ldap-mojo-partition.png" alt="ActiveDS LDAP Users"> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Create the <code>ou=groups,o=mojo</code> hierarchy:</p> 
+        </div> 
+        <div class="imageblock"> 
+         <div class="content"> 
+          <img src="images//configuration/configuring-shiro/ldap/activeds-ldap-mojo-root-dse.png" alt="ActiveDS LDAP Users"> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Configure SASL authentication. This means that the checking of user/password is done implicitly by virtue of Apache Isis connecting to LDAP using these credentials:</p> 
+        </div> 
+        <div class="imageblock"> 
+         <div class="content"> 
+          <img src="images//configuration/configuring-shiro/ldap/activeds-ldap-sasl-authentication.png" alt="ActiveDS LDAP Users"> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>In order for SASL to work, it seems to be necessary to put users under <code>o=system</code>. (This is why the setup is slightly different than the tutorial mentioned above):</p> 
+        </div> 
+        <div class="imageblock"> 
+         <div class="content"> 
+          <img src="images//configuration/configuring-shiro/ldap/activeds-ldap-users.png" alt="ActiveDS LDAP Users"> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Configure the users into the groups:</p> 
+        </div> 
+        <div class="imageblock"> 
+         <div class="content"> 
+          <img src="images//configuration/configuring-shiro/ldap/activeds-ldap-groups.png" alt="ActiveDS LDAP Users"> 
+         </div> 
+        </div> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_ugsec_shiro-isisaddons-security-module-realm">5. Security Module Realm</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_ugsec_shiro-isisaddons-security-module-realm.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>The <a href="https://github.com/isisaddons/isis-module-security">Isis Addons' security module</a> (not ASF) provides a complete security subdomain for users, roles, permissions; all are persisted as domain entities.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>What that means, of course, that they can also be administered through your Isis application. Moreover, the set of permissions (to features) is derived completely from your application\u2019s metamodel; in essence the permissions are "type-safe".</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>In order to play along, the module includes a Shiro realm, which fits in as follows:</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>The general configuration is as follows:</p> 
+       </div> 
+       <div class="imageblock"> 
+        <div class="content"> 
+         <img src="images/security/security-apis-impl/configure-shiro-to-use-isisaddons-security-module-realm.PNG" alt="configure shiro to use isisaddons security module realm" width="600px"> 
+        </div> 
+       </div> 
+       <div class="paragraph"> 
+        <p>where the <code>IsisModuleSecurityRealm</code> realm is the implementation provided by the module.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>In the configuration above user passwords are stored in the database. The module uses <a href="http://www.mindrot.org/projects/jBCrypt/">jBCrypt</a> so that passwords are only stored in a (one-way) encrypted form in the database.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>The security module also supports a slightly more sophisticated configuration. Most organizations use LDAP for user credentials, and maintaining two separate user accounts would be less than ideal. The <code>IsisModuleSecurityRealm</code> can therefore be configured with a subsidiary "delegate" realm that is responsible for performing the primary authentication of the user; if that passes then a user is created (as a domain entity) automatically. In most cases this delegate realm will be the LDAP realm, and so the architecture becomes:</p> 
+       </div> 
+       <div class="imageblock"> 
+        <div class="content"> 
+         <img src="images/security/security-apis-impl/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG" alt="configure shiro to use isisaddons security module realm with delegate realm" width="600px"> 
+        </div> 
+       </div> 
+       <div class="paragraph"> 
+        <p>The security module has many more features than are described here, all of which are described in the module\u2019s <a href="https://github.com/isisaddons/isis-module-security">README</a>. The README also explains in detail how to configure an existing app to use this module.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>You can also look at the Isisaddons <a href="https://github.com/isisaddons/isis-app-todoapp">todoapp example</a> (not ASF), which is preconfigured to use the security module.</p> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_ugsec_shiro-jdbc-realm">6. Shiro JDBC Realm</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_ugsec_shiro-jdbc-realm.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>There is nothing to stop you from using some other <code>Realm</code> implementation (or indeed writing one yourself). For example, you could use Shiro\u2019s own JDBC realm that loads user/password details from a database.</p> 
+       </div> 
+       <div class="admonitionblock warning"> 
+        <table> 
+         <tbody>
+          <tr> 
+           <td class="icon"> <i class="fa icon-warning" title="Warning"></i> </td> 
+           <td class="content"> 
+            <div class="paragraph"> 
+             <p>If you are happy to use a database then we strongly recommend you use the <a href="http://github.com/isisaddons/isis-module-security">Isis addons' security</a> module instead of a vanilla JDBC; it is far more sophisticated and moreover gives you the ability to administer the system from within your Isis application.</p> 
+            </div> </td> 
+          </tr> 
+         </tbody>
+        </table> 
+       </div> 
+       <div class="paragraph"> 
+        <p>If you go down this route, then the architecture is as follows:</p> 
+       </div> 
+       <div class="imageblock"> 
+        <div class="content"> 
+         <img src="images/security/security-apis-impl/configure-shiro-to-use-custom-jdbc-realm.png" alt="configure shiro to use custom jdbc realm" width="600px"> 
+        </div> 
+       </div> 
+       <div class="paragraph"> 
+        <p>There\u2019s quite a lot of configuration required (in <code>WEB-INF/shiro.ini</code>) to set up a JDBC realm, so we\u2019ll break it out into sections.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>First, we need to set up the connection to JDBC:</p> 
+       </div> 
+       <div class="listingblock"> 
+        <div class="content"> 
+         <pre class="CodeRay highlight"><code data-lang="ini">jdbcRealm=org.apache.shiro.realm.jdbc.JdbcRealm        <i class="conum" data-value="1"></i><b>(1)</b>
 
 jof = org.apache.shiro.jndi.JndiObjectFactory          <i class="conum" data-value="2"></i><b>(2)</b>
 jof.resourceName = jdbc/postgres                       <i class="conum" data-value="3"></i><b>(3)</b>
 jof.requiredType = javax.sql.DataSource
 jof.resourceRef = true
 
-jdbcRealm.dataSource = $jof                            <i class="conum" data-value="4"></i><b>(4)</b></code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td>instantiate the JDBC realm</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="2"></i><b>2</b></td>
-<td>instantiate factory object to lookup DataSource from servlet container</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="3"></i><b>3</b></td>
-<td>name of the datasource (as configured in <code>web.xml</code>)</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="4"></i><b>4</b></td>
-<td>instruct JDBC realm to obtain datasource from the JNDI</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>We next need to tell the realm how to query the database.  Shiro supports any schema; what matters is the input search argument and the output results.</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="ini">jdbcRealm.authenticationQuery =         \              <i class="conum" data-value="1"></i><b>(1)</b>
+jdbcRealm.dataSource = $jof                            <i class="conum" data-value="4"></i><b>(4)</b></code></pre> 
+        </div> 
+       </div> 
+       <div class="colist arabic"> 
+        <table> 
+         <tbody>
+          <tr> 
+           <td><i class="conum" data-value="1"></i><b>1</b></td> 
+           <td>instantiate the JDBC realm</td> 
+          </tr> 
+          <tr> 
+           <td><i class="conum" data-value="2"></i><b>2</b></td> 
+           <td>instantiate factory object to lookup DataSource from servlet container</td> 
+          </tr> 
+          <tr> 
+           <td><i class="conum" data-value="3"></i><b>3</b></td> 
+           <td>name of the datasource (as configured in <code>web.xml</code>)</td> 
+          </tr> 
+          <tr> 
+           <td><i class="conum" data-value="4"></i><b>4</b></td> 
+           <td>instruct JDBC realm to obtain datasource from the JNDI</td> 
+          </tr> 
+         </tbody>
+        </table> 
+       </div> 
+       <div class="paragraph"> 
+        <p>We next need to tell the realm how to query the database. Shiro supports any schema; what matters is the input search argument and the output results.</p> 
+       </div> 
+       <div class="listingblock"> 
+        <div class="content"> 
+         <pre class="CodeRay highlight"><code data-lang="ini">jdbcRealm.authenticationQuery =         \              <i class="conum" data-value="1"></i><b>(1)</b>
         select password                 \
           from users                    \
          where username = ?
@@ -1319,408 +1223,385 @@ jdbcRealm.permissionsQuery=             \               <i class="conum" data-va
              from roles                 \
             where label = ?);
 
-jdbcRealm.permissionsLookupEnabled=true                 <i class="conum" data-value="4"></i><b>(4)</b></code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td>query to find password for user</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="2"></i><b>2</b></td>
-<td>query to find roles for user</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="3"></i><b>3</b></td>
-<td>query to find permissions for role</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="4"></i><b>4</b></td>
-<td>enable permissions lookup</td>
-</tr>
-</table>
-</div>
-<div class="admonitionblock warning">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-warning" title="Warning"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>The <code>permissionsLookupEnabled</code> is very important, otherwise Shiro just returns an empty list of permissions and your users will have no access to any features(!).</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>We also should ensure that the passwords are not stored as plain-text:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="ini">dps = org.apache.shiro.authc.credential.DefaultPasswordService   <i class="conum" data-value="1"></i><b>(1)</b>
+jdbcRealm.permissionsLookupEnabled=true                 <i class="conum" data-value="4"></i><b>(4)</b></code></pre> 
+        </div> 
+       </div> 
+       <div class="colist arabic"> 
+        <table> 
+         <tbody>
+          <tr> 
+           <td><i class="conum" data-value="1"></i><b>1</b></td> 
+           <td>query to find password for user</td> 
+          </tr> 
+          <tr> 
+           <td><i class="conum" data-value="2"></i><b>2</b></td> 
+           <td>query to find roles for user</td> 
+          </tr> 
+          <tr> 
+           <td><i class="conum" data-value="3"></i><b>3</b></td> 
+           <td>query to find permissions for role</td> 
+          </tr> 
+          <tr> 
+           <td><i class="conum" data-value="4"></i><b>4</b></td> 
+           <td>enable permissions lookup</td> 
+          </tr> 
+         </tbody>
+        </table> 
+       </div> 
+       <div class="admonitionblock warning"> 
+        <table> 
+         <tbody>
+          <tr> 
+           <td class="icon"> <i class="fa icon-warning" title="Warning"></i> </td> 
+           <td class="content"> 
+            <div class="paragraph"> 
+             <p>The <code>permissionsLookupEnabled</code> is very important, otherwise Shiro just returns an empty list of permissions and your users will have no access to any features(!).</p> 
+            </div> </td> 
+          </tr> 
+         </tbody>
+        </table> 
+       </div> 
+       <div class="paragraph"> 
+        <p>We also should ensure that the passwords are not stored as plain-text:</p> 
+       </div> 
+       <div class="listingblock"> 
+        <div class="content"> 
+         <pre class="CodeRay highlight"><code data-lang="ini">dps = org.apache.shiro.authc.credential.DefaultPasswordService   <i class="conum" data-value="1"></i><b>(1)</b>
 pm = org.apache.shiro.authc.credential.PasswordMatcher           <i class="conum" data-value="2"></i><b>(2)</b>
 pm.passwordService = $dps
-jdbcRealm.credentialsMatcher = $pm                               <i class="conum" data-value="3"></i><b>(3)</b></code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td>mechanism to encrypts password</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="2"></i><b>2</b></td>
-<td>service to match passwords</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="3"></i><b>3</b></td>
-<td>instruct JDBC realm to use password matching service when authenticating</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>And finally we need to tell Shiro to use the realm, in the usual fashion:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="ini">securityManager.realms = $jdbcRealm</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Using the above configuration you will also need to setup a <code>DataSource</code>.  The details vary by servlet container, for example this is <a href="https://tomcat.apache.org/tomcat-8.0-doc/jndi-datasource-examples-howto.html">how to do the setup on Tomcat 8.0</a>.</p>
-</div>
-<div class="admonitionblock warning">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-warning" title="Warning"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>The name of the <code>DataSource</code> can also vary by servlet container; see for example <a href="http://stackoverflow.com/questions/17441019/how-to-configure-jdbcrealm-to-obtain-its-datasource-from-jndi/23784702#23784702">this StackOverflow answer</a>.</p>
-</div>
-</td>
-</tr>
-</tab

<TRUNCATED>

[42/44] isis-site git commit: ISIS-1594: provide an 'edit' button

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/downloads.html
----------------------------------------------------------------------
diff --git a/content/downloads.html b/content/downloads.html
index f27eb66..43c5017 100644
--- a/content/downloads.html
+++ b/content/downloads.html
@@ -1,12 +1,10 @@
 <!doctype html>
 <html class="no-js" lang="en">
-<head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-
-    <title>Downloads</title>
-
-    <!--
+ <head> 
+  <meta charset="utf-8"> 
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"> 
+  <title>Downloads</title> 
+  <!--
         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
@@ -23,31 +21,21 @@
         KIND, either express or implied.  See the License for the
         specific language governing permissions and limitations
         under the License.
-    -->
-
-    <!-- No caching headers -->
-    <meta http-equiv="cache-control" content="no-cache" />
-    <meta http-equiv="pragma" content="no-cache" />
-    <meta http-equiv="expires" content="-1" />
-
-
-    <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
-    <link href="./css/foundation/5.5.1/foundation.css" rel="stylesheet" />
-    <script src="./js/foundation/5.5.1/vendor/modernizr.js"></script>
-    <link href="./css/asciidoctor/colony.css" rel="stylesheet">
-    <link href="./css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-
-
-
-    <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
-    <!--[if lt IE 9]>
+    --> 
+  <!-- No caching headers --> 
+  <meta http-equiv="cache-control" content="no-cache"> 
+  <meta http-equiv="pragma" content="no-cache"> 
+  <meta http-equiv="expires" content="-1"> 
+  <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line --> 
+  <link href="./css/foundation/5.5.1/foundation.css" rel="stylesheet"> 
+  <script src="./js/foundation/5.5.1/vendor/modernizr.js"></script> 
+  <link href="./css/asciidoctor/colony.css" rel="stylesheet"> 
+  <link href="./css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet"> 
+  <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet"> 
+  <!--[if lt IE 9]>
       <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
-    <![endif]-->
-
-
-
-    <style type="text/css">
+    <![endif]--> 
+  <style type="text/css">
         pre code {
             background-color: inherit;
             border-style: none;
@@ -192,9 +180,8 @@ table.CodeRay td.code>pre{padding:0}
         color:#fff;
         font-size: 1.1em;
     }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         @media only screen and (min-width: 40.063em) {
           .top-bar {
             .contain-to-grid .top-bar {
@@ -205,9 +192,8 @@ table.CodeRay td.code>pre{padding:0}
         .row {
             max-width: 80rem;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .extended-quote,
         .extended-quote-first {
             margin-left: 40px;
@@ -231,9 +217,8 @@ table.CodeRay td.code>pre{padding:0}
             text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
         }
         
-    </style>
-
-    <style>
+    </style> 
+  <style>
         body {
           position: relative;
         }
@@ -255,6 +240,7 @@ table.CodeRay td.code>pre{padding:0}
 
         div#doc-content {
             margin-top: 30px;
+            padding-top: 30px;
         }
 
         div.documentation-page table.frame-all {
@@ -286,9 +272,8 @@ table.CodeRay td.code>pre{padding:0}
             min-height: 2000px;
         }
 
-    </style>
-
-    <style>
+    </style> 
+  <style>
 
         @media only screen and (min-width: 768px) {
           #toc.toc2 ul ul { margin-left: -10px; }
@@ -316,15 +301,13 @@ table.CodeRay td.code>pre{padding:0}
         body div#toc2 li.tocify-item.active a {
             color: red;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         footer {
             margin-top: 1000px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* overriding colony.css stylesheet */
         .literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
            /*padding: 1.25em 1.5625em 1.125em 1.5625em;*/
@@ -372,9 +355,8 @@ table.CodeRay td.code>pre{padding:0}
         .imageblock img {
             margin-bottom: 10px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* from http://ben.balter.com/2014/03/13/pages-anchor-links/ */
         .header-link {
           position: absolute;
@@ -395,9 +377,8 @@ table.CodeRay td.code>pre{padding:0}
         h6:hover .header-link {
           opacity: 1;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .top-bar
         {
             -webkit-transition-duration: .5s;
@@ -425,274 +406,234 @@ table.CodeRay td.code>pre{padding:0}
             -webkit-transition-property: -webkit-transform;
             transition-property: transform;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         #doc-content a.guide {
             color: white;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
+        .tocify {
+            margin-top: 80px;
+        }
+    </style> 
+  <style>
         .tocify {
             margin-top: 80px;
         }
-    </style>
-
-
-</script>
-
-</head>
-<body>
-
-<<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
-    <div class="github-fork-ribbon">
-        <a href="https://github.com/apache/isis#fork-destination-box">Fork me on GitHub</a>
-    </div>
-</div>
-
-
-<div class="row">
-
-    <div class="fixed contain-to-grid header">
-        <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
-            <ul class="title-area">
-                <li class="name">
-                    <h1>
-                        <a href="/index.html">Apache Isis&trade;</a>
-                    </h1>
-                </li>
-                <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
-                <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
-            </ul>
-
-            <section class="top-bar-section">
-                <ul class="right">
-
-                    <li class="has-form">
-                       <FORM class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
-                        <div class="row collapse">
-                            <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
-                            <INPUT type="hidden" name="cof" value="FORID:0">
-                            <INPUT class="form-control" name="q" type="text" placeholder="Search">
-                        </div>
-                    </FORM>
-                     </li>
-
-                </ul>
-
-                <!-- Left Nav Section -->
-                <ul class="left">
-
-                    <li><a href="/documentation.html">Documentation</a></li>
-                    <li><a href="/downloads.html">Downloads</a></li>
-                    <li><a href="/help.html">Help</a></li>
-                    <li><a href="/asf.html">@ASF</a></li>
-
-                </ul>
-
-            </section>
-        </nav>
-    </div>
-</div>
-
-<div class="row">
-
-    <div id="doc-content-left" class="large-9 medium-9 columns">
-
-
-        <div id="doc-content">
-          <div id="preamble">
-<div class="sectionbody">
-<div class="paragraph">
-<p><br/><br/><br/></p>
-</div>
-<div class="paragraph">
-<p>Apache Isis&trade; software is a framework for rapidly developing domain-driven apps in Java. Write your business logic in entities, domain services and repositories, and the framework dynamically generates a representation of that domain model as a webapp or RESTful API. Use for prototyping or production.</p>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_getting_started">Getting Started</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>If you just want to get going quickly, we suggest using our Maven archetype.  For more information, see <a href="guides/ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp archetype</a>[here].</p>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_formal_releases">Formal Releases</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>If you want to build Apache Isis from formally released source tarballs, you can download from here:</p>
-</div>
-<div class="paragraph">
-<p>Core:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="https://www.apache.org/dyn/closer.cgi/isis/isis-core/isis-1.13.2-source-release.zip">isis-1.13.2</a> (<a href="http://www.apache.org/dist/isis/isis-core/isis-1.13.2-source-release.zip.asc">asc</a>, <a href="http://www.apache.org/dist/isis/isis-core/isis-1.13.2-source-release.zip.md5">md5</a>)</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>Archetypes:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="https://www.apache.org/dyn/closer.cgi/isis/archetype/simpleapp-archetype/simpleapp-archetype-1.13.2.1-source-release.zip">simpleapp-archetype-1.13.2.1</a> (<a href="http://www.apache.org/dist/isis/archetype/simpleapp-archetype/simpleapp-archetype-1.13.2.1-source-release.zip.asc">asc</a>, <a href="http://www.apache.org/dist/isis/archetype/simpleapp-archetype/simpleapp-archetype-1.13.2.1-source-release.zip.md5">md5</a>)</p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_verifying_releases">Verifying Releases</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>It is essential that you verify the integrity of any downloaded files using the PGP or MD5 signatures. For more information on signing artifacts and why we do it, check out the <a href="http://www.apache.org/dev/release-signing.html">Release Signing FAQ</a>.</p>
-</div>
-<div class="paragraph">
-<p>The PGP signatures can be verified using PGP or GPG. First download the <a href="http://www.apache.org/dist/isis/KEYS">KEYS</a> as well as the asc signature file for the artifact. Make sure you get these files from the <a href="http://www.apache.org/dist/isis/">main distribution directory</a>, rather than from a mirror.</p>
-</div>
-<div class="paragraph">
-<p>Then verify the signatures using a command such as:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">pgpk -a KEYS
-pgpv isis-1.13.2-source-release.zip.asc</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>or</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">pgp -ka KEYS
-pgp isis-1.13.2-source-release.zip.asc</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>or</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">gpg \u2013import KEYS
-gpg \u2013verify isis-1.13.2-source-release.zip.asc</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Alternatively, you can verify the MD5 signature on the files. A Unix/Linux program called <code>md5</code> or <code>md5sum</code> is included in most distributions. It is also available as part of <a href="http://www.gnu.org/software/textutils/textutils.html">GNU Textutils</a>.   Windows users can get binary md5 programs from these (and likely other) places:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://www.md5summer.org/">http://www.md5summer.org/</a></p>
-</li>
-<li>
-<p><a href="http://www.fourmilab.ch/md5/">http://www.fourmilab.ch/md5/</a></p>
-</li>
-<li>
-<p><a href="http://www.pc-tools.net/win32/md5sums/">http://www.pc-tools.net/win32/md5sums/</a></p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_downloads_source_code">Source Code</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>You can also download the Apache Isis source code using:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">git clone git://git.apache.org/isis.git</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>or</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">git clone http://git.apache.org/isis.git</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>The code is also mirrored on <a href="http://github.com/apache/isis">github</a>, where you can browse it or fork it. And if you&#8217;re interested in contributing back to Apache Isis, see <a href="contributors/contributing.html">here</a>.</p>
-</div>
-<div class="sect2">
-<h3 id="_committers">Committers</h3>
-<div class="paragraph">
-<p>Committers should use the read/write repo:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">https://git-wip-us.apache.org/repos/asf/isis.git</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>You can browse the repo <a href="https://git-wip-us.apache.org/repos/asf/isis/repo?p=isis.git;a=summary">here</a>.</p>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_isis_add_ons">Isis add-ons</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>There are also a number of (open source, but not ASF) supporting modules and extensions for you to use; see <a href="http://www.isisaddons.org/">Isis Add-ons</a>.</p>
-</div>
-</div>
-</div>
-        </div>
-
-        <footer>
-          <hr>
-          <p class="small">
-          Copyright &copy; 2010~2016 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0.
-          <br/>
-          Apache, the Apache feather logo, Apache&nbsp;Isis, and the Apache&nbsp;Isis project logo are all trademarks of The&nbsp;Apache&nbsp;Software&nbsp;Foundation.
-          </p>
-        </footer>
-
-    </div>
-
-    <div id="doc-content-right" class="large-3 medium-3 xcolumns">
-        <div id="toc" class="toc2">
-            <div class="fallback-toc">
-                <ul class="sectlevel1">
-<li><a href="#_getting_started">Getting Started</a></li>
-<li><a href="#_formal_releases">Formal Releases</a></li>
-<li><a href="#_verifying_releases">Verifying Releases</a></li>
-<li><a href="#_downloads_source_code">Source Code</a>
-<ul class="sectlevel2">
-<li><a href="#_committers">Committers</a></li>
-</ul>
-</li>
-<li><a href="#_isis_add_ons">Isis add-ons</a></li>
-</ul>
-            </div>
-        </div>
-    </div>
-
-</div>
-
-
-<script src="./js/foundation/5.5.1/vendor/jquery.js"></script>
-<script src="./js/foundation/5.5.1/foundation.min.js"></script>
-
-
-<link href="./css/jquery.tocify/1.9.0/jquery.tocify.css" rel="stylesheet">
-<script src="./js/jqueryui/1.11.4/jquery-ui.min.js"></script>
-<script src="./js/jquery.tocify/1.9.0/jquery.tocify.js"></script>
-
-
-
-<script type="text/javascript">
+    </style>  
+ </head> 
+ <body> 
+  <div class="row"> 
+   <div class="fixed contain-to-grid header"> 
+    <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem"> 
+     <ul class="title-area"> 
+      <li class="name"> <h1> <a href="/index.html">Apache Isis\u2122</a> </h1> </li> 
+      <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone --> 
+      <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li> 
+     </ul> 
+     <section class="top-bar-section"> 
+      <ul class="right"> 
+       <li class="has-form"> 
+        <form class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse"> 
+         <div class="row collapse"> 
+          <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya"> 
+          <input type="hidden" name="cof" value="FORID:0"> 
+          <input class="form-control" name="q" type="text" placeholder="Search"> 
+         </div> 
+        </form> </li> 
+      </ul> 
+      <!-- Left Nav Section --> 
+      <ul class="left"> 
+       <li><a href="/documentation.html">Documentation</a></li> 
+       <li><a href="/downloads.html">Downloads</a></li> 
+       <li><a href="/help.html">Help</a></li> 
+       <li><a href="/asf.html">@ASF</a></li> 
+      </ul> 
+     </section> 
+    </nav> 
+   </div> 
+  </div> 
+  <div class="row"> 
+   <div id="doc-content-left" class="large-9 medium-9 columns"> 
+    <div id="doc-content">
+     <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/downloads.adoc&quot;" style="float: right; font-size: small; padding: 6px;  "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+     <div id="preamble"> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>Apache Isis\u2122 software is a framework for rapidly developing domain-driven apps in Java. Write your business logic in entities, domain services and repositories, and the framework dynamically generates a representation of that domain model as a webapp or RESTful API. Use for prototyping or production.</p> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_getting_started">Getting Started</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_getting_started.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>If you just want to get going quickly, we suggest using our Maven archetype. For more information, see <a href="guides/ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp archetype</a>[here].</p> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_formal_releases">Formal Releases</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_formal_releases.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>If you want to build Apache Isis from formally released source tarballs, you can download from here:</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>Core:</p> 
+       </div> 
+       <div class="ulist"> 
+        <ul> 
+         <li> <p><a href="https://www.apache.org/dyn/closer.cgi/isis/isis-core/isis-1.13.2-source-release.zip">isis-1.13.2</a> (<a href="http://www.apache.org/dist/isis/isis-core/isis-1.13.2-source-release.zip.asc">asc</a>, <a href="http://www.apache.org/dist/isis/isis-core/isis-1.13.2-source-release.zip.md5">md5</a>)</p> </li> 
+        </ul> 
+       </div> 
+       <div class="paragraph"> 
+        <p>Archetypes:</p> 
+       </div> 
+       <div class="ulist"> 
+        <ul> 
+         <li> <p><a href="https://www.apache.org/dyn/closer.cgi/isis/archetype/simpleapp-archetype/simpleapp-archetype-1.13.2.1-source-release.zip">simpleapp-archetype-1.13.2.1</a> (<a href="http://www.apache.org/dist/isis/archetype/simpleapp-archetype/simpleapp-archetype-1.13.2.1-source-release.zip.asc">asc</a>, <a href="http://www.apache.org/dist/isis/archetype/simpleapp-archetype/simpleapp-archetype-1.13.2.1-source-release.zip.md5">md5</a>)</p> </li> 
+        </ul> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_verifying_releases">Verifying Releases</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_verifying_releases.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>It is essential that you verify the integrity of any downloaded files using the PGP or MD5 signatures. For more information on signing artifacts and why we do it, check out the <a href="http://www.apache.org/dev/release-signing.html">Release Signing FAQ</a>.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>The PGP signatures can be verified using PGP or GPG. First download the <a href="http://www.apache.org/dist/isis/KEYS">KEYS</a> as well as the asc signature file for the artifact. Make sure you get these files from the <a href="http://www.apache.org/dist/isis/">main distribution directory</a>, rather than from a mirror.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>Then verify the signatures using a command such as:</p> 
+       </div> 
+       <div class="listingblock"> 
+        <div class="content"> 
+         <pre class="CodeRay highlight"><code data-lang="bash">pgpk -a KEYS
+pgpv isis-1.13.2-source-release.zip.asc</code></pre> 
+        </div> 
+       </div> 
+       <div class="paragraph"> 
+        <p>or</p> 
+       </div> 
+       <div class="listingblock"> 
+        <div class="content"> 
+         <pre class="CodeRay highlight"><code data-lang="bash">pgp -ka KEYS
+pgp isis-1.13.2-source-release.zip.asc</code></pre> 
+        </div> 
+       </div> 
+       <div class="paragraph"> 
+        <p>or</p> 
+       </div> 
+       <div class="listingblock"> 
+        <div class="content"> 
+         <pre class="CodeRay highlight"><code data-lang="bash">gpg �\u20ac\u201cimport KEYS
+gpg �\u20ac\u201cverify isis-1.13.2-source-release.zip.asc</code></pre> 
+        </div> 
+       </div> 
+       <div class="paragraph"> 
+        <p>Alternatively, you can verify the MD5 signature on the files. A Unix/Linux program called <code>md5</code> or <code>md5sum</code> is included in most distributions. It is also available as part of <a href="http://www.gnu.org/software/textutils/textutils.html">GNU Textutils</a>. Windows users can get binary md5 programs from these (and likely other) places:</p> 
+       </div> 
+       <div class="ulist"> 
+        <ul> 
+         <li> <p><a href="http://www.md5summer.org/">http://www.md5summer.org/</a></p> </li> 
+         <li> <p><a href="http://www.fourmilab.ch/md5/">http://www.fourmilab.ch/md5/</a></p> </li> 
+         <li> <p><a href="http://www.pc-tools.net/win32/md5sums/">http://www.pc-tools.net/win32/md5sums/</a></p> </li> 
+        </ul> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_downloads_source_code">Source Code</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_downloads_source_code.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>You can also download the Apache Isis source code using:</p> 
+       </div> 
+       <div class="listingblock"> 
+        <div class="content"> 
+         <pre class="CodeRay highlight"><code data-lang="bash">git clone git://git.apache.org/isis.git</code></pre> 
+        </div> 
+       </div> 
+       <div class="paragraph"> 
+        <p>or</p> 
+       </div> 
+       <div class="listingblock"> 
+        <div class="content"> 
+         <pre class="CodeRay highlight"><code data-lang="bash">git clone http://git.apache.org/isis.git</code></pre> 
+        </div> 
+       </div> 
+       <div class="paragraph"> 
+        <p>The code is also mirrored on <a href="http://github.com/apache/isis">github</a>, where you can browse it or fork it. And if you\u2019re interested in contributing back to Apache Isis, see <a href="contributors/contributing.html">here</a>.</p> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_committers">Committers</h3> 
+        <div class="paragraph"> 
+         <p>Committers should use the read/write repo:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="bash">https://git-wip-us.apache.org/repos/asf/isis.git</code></pre> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>You can browse the repo <a href="https://git-wip-us.apache.org/repos/asf/isis/repo?p=isis.git;a=summary">here</a>.</p> 
+        </div> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_isis_add_ons_incode_catalog">Isis add-ons &amp; Incode Catalog</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_isis_add_ons_incode_catalog.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>There are also a number of (open source, but not ASF) supporting modules and extensions for you to use:</p> 
+       </div> 
+       <div class="ulist"> 
+        <ul> 
+         <li> <p>the <a href="http://www.isisaddons.org/">Isis Add-ons</a> provide technical extensions, such as security, commands, auditing and feature toggles</p> </li> 
+         <li> <p>the <a href="http://catalog.incode.org">Incode Catalog</a> provides business modules, such as documents, notes and communications.</p> </li> 
+        </ul> 
+       </div> 
+       <div class="paragraph"> 
+        <p>Each module is in a separate github repo, with a demo app to illustrate the module\u2019s functionality.</p> 
+       </div> 
+      </div> 
+     </div> 
+    </div> 
+    <footer> 
+     <hr> 
+     <p class="small"> Copyright � 2010~2016 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0. <br> Apache, the Apache feather logo, Apache&nbsp;Isis, and the Apache&nbsp;Isis project logo are all trademarks of The&nbsp;Apache&nbsp;Software&nbsp;Foundation. </p> 
+    </footer> 
+   </div> 
+   <div id="doc-content-right" class="large-3 medium-3 xcolumns"> 
+    <div id="toc" class="toc2"> 
+     <div class="fallback-toc"> 
+      <ul class="sectlevel1"> 
+       <li><a href="#_getting_started">Getting Started</a></li> 
+       <li><a href="#_formal_releases">Formal Releases</a></li> 
+       <li><a href="#_verifying_releases">Verifying Releases</a></li> 
+       <li><a href="#_downloads_source_code">Source Code</a> 
+        <ul class="sectlevel2"> 
+         <li><a href="#_committers">Committers</a></li> 
+        </ul> </li> 
+       <li><a href="#_isis_add_ons_incode_catalog">Isis add-ons &amp; Incode Catalog</a></li> 
+      </ul> 
+     </div> 
+    </div> 
+   </div> 
+  </div> 
+  <script src="./js/foundation/5.5.1/vendor/jquery.js"></script> 
+  <script src="./js/foundation/5.5.1/foundation.min.js"></script> 
+  <link href="./css/jquery.tocify/1.9.0/jquery.tocify.css" rel="stylesheet"> 
+  <script src="./js/jqueryui/1.11.4/jquery-ui.min.js"></script> 
+  <script src="./js/jquery.tocify/1.9.0/jquery.tocify.js"></script> 
+  <script type="text/javascript">
     $(function () {
         $("#toc").tocify({
             scrollTo: 50,
@@ -705,9 +646,8 @@ gpg \u2013verify isis-1.13.2-source-release.zip.asc</code></pre>
         });
         $(".fallback-toc").hide();
     });
-</script>
-
-<script type="text/javascript">
+</script> 
+  <script type="text/javascript">
 
   /****
 
@@ -817,9 +757,8 @@ gpg \u2013verify isis-1.13.2-source-release.zip.asc</code></pre>
 
     ***/
 
-</script>
-
-<script type="text/javascript">
+</script> 
+  <script type="text/javascript">
 
 $(document).ready(function(){
     if("Documentation" === "Downloads") {
@@ -831,10 +770,8 @@ $(document).ready(function(){
 
 });
 
-</script>
-
-
-<script>
+</script> 
+  <script>
 
 $( document ).ready(function() {
 
@@ -925,7 +862,6 @@ $( document ).ready(function() {
 
 
 });
-</script>
-
-</body>
+</script>  
+ </body>
 </html>


[05/44] isis-site git commit: ISIS-1594: provide an 'edit' button

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/quotes.html
----------------------------------------------------------------------
diff --git a/content/quotes.html b/content/quotes.html
index ed80286..45700f7 100644
--- a/content/quotes.html
+++ b/content/quotes.html
@@ -1,12 +1,10 @@
 <!doctype html>
 <html class="no-js" lang="en">
-<head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-
-    <title>Quotes</title>
-
-    <!--
+ <head> 
+  <meta charset="utf-8"> 
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"> 
+  <title>Quotes</title> 
+  <!--
         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
@@ -23,31 +21,21 @@
         KIND, either express or implied.  See the License for the
         specific language governing permissions and limitations
         under the License.
-    -->
-
-    <!-- No caching headers -->
-    <meta http-equiv="cache-control" content="no-cache" />
-    <meta http-equiv="pragma" content="no-cache" />
-    <meta http-equiv="expires" content="-1" />
-
-
-    <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
-    <link href="./css/foundation/5.5.1/foundation.css" rel="stylesheet" />
-    <script src="./js/foundation/5.5.1/vendor/modernizr.js"></script>
-    <link href="./css/asciidoctor/colony.css" rel="stylesheet">
-    <link href="./css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-
-
-
-    <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
-    <!--[if lt IE 9]>
+    --> 
+  <!-- No caching headers --> 
+  <meta http-equiv="cache-control" content="no-cache"> 
+  <meta http-equiv="pragma" content="no-cache"> 
+  <meta http-equiv="expires" content="-1"> 
+  <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line --> 
+  <link href="./css/foundation/5.5.1/foundation.css" rel="stylesheet"> 
+  <script src="./js/foundation/5.5.1/vendor/modernizr.js"></script> 
+  <link href="./css/asciidoctor/colony.css" rel="stylesheet"> 
+  <link href="./css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet"> 
+  <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet"> 
+  <!--[if lt IE 9]>
       <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
-    <![endif]-->
-
-
-
-    <style type="text/css">
+    <![endif]--> 
+  <style type="text/css">
         pre code {
             background-color: inherit;
             border-style: none;
@@ -192,9 +180,8 @@ table.CodeRay td.code>pre{padding:0}
         color:#fff;
         font-size: 1.1em;
     }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         @media only screen and (min-width: 40.063em) {
           .top-bar {
             .contain-to-grid .top-bar {
@@ -205,9 +192,8 @@ table.CodeRay td.code>pre{padding:0}
         .row {
             max-width: 80rem;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .extended-quote,
         .extended-quote-first {
             margin-left: 40px;
@@ -231,9 +217,8 @@ table.CodeRay td.code>pre{padding:0}
             text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
         }
         
-    </style>
-
-    <style>
+    </style> 
+  <style>
         body {
           position: relative;
         }
@@ -255,6 +240,7 @@ table.CodeRay td.code>pre{padding:0}
 
         div#doc-content {
             margin-top: 30px;
+            padding-top: 30px;
         }
 
         div.documentation-page table.frame-all {
@@ -286,9 +272,8 @@ table.CodeRay td.code>pre{padding:0}
             min-height: 2000px;
         }
 
-    </style>
-
-    <style>
+    </style> 
+  <style>
 
         @media only screen and (min-width: 768px) {
           #toc.toc2 ul ul { margin-left: -10px; }
@@ -316,15 +301,13 @@ table.CodeRay td.code>pre{padding:0}
         body div#toc2 li.tocify-item.active a {
             color: red;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         footer {
             margin-top: 1000px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* overriding colony.css stylesheet */
         .literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
            /*padding: 1.25em 1.5625em 1.125em 1.5625em;*/
@@ -372,9 +355,8 @@ table.CodeRay td.code>pre{padding:0}
         .imageblock img {
             margin-bottom: 10px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* from http://ben.balter.com/2014/03/13/pages-anchor-links/ */
         .header-link {
           position: absolute;
@@ -395,9 +377,8 @@ table.CodeRay td.code>pre{padding:0}
         h6:hover .header-link {
           opacity: 1;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .top-bar
         {
             -webkit-transition-duration: .5s;
@@ -425,294 +406,318 @@ table.CodeRay td.code>pre{padding:0}
             -webkit-transition-property: -webkit-transform;
             transition-property: transform;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         #doc-content a.guide {
             color: white;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
+        .tocify {
+            margin-top: 80px;
+        }
+    </style> 
+  <style>
         .tocify {
             margin-top: 80px;
         }
-    </style>
-
-
-</script>
-
-</head>
-<body>
-
-<<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
-    <div class="github-fork-ribbon">
-        <a href="https://github.com/apache/isis#fork-destination-box">Fork me on GitHub</a>
-    </div>
-</div>
-
-
-<div class="row">
-
-    <div class="fixed contain-to-grid header">
-        <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
-            <ul class="title-area">
-                <li class="name">
-                    <h1>
-                        <a href="/index.html">Apache Isis&trade;</a>
-                    </h1>
-                </li>
-                <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
-                <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
-            </ul>
-
-            <section class="top-bar-section">
-                <ul class="right">
-
-                    <li class="has-form">
-                       <FORM class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
-                        <div class="row collapse">
-                            <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
-                            <INPUT type="hidden" name="cof" value="FORID:0">
-                            <INPUT class="form-control" name="q" type="text" placeholder="Search">
-                        </div>
-                    </FORM>
-                     </li>
-
-                </ul>
-
-                <!-- Left Nav Section -->
-                <ul class="left">
-
-                    <li><a href="/documentation.html">Documentation</a></li>
-                    <li><a href="/downloads.html">Downloads</a></li>
-                    <li><a href="/help.html">Help</a></li>
-                    <li><a href="/asf.html">@ASF</a></li>
-
-                </ul>
-
-            </section>
-        </nav>
-    </div>
-</div>
-
-<div class="row">
-
-    <div id="doc-content-left" class="large-9 medium-9 columns">
-
-
-        <div id="doc-content">
-          <div class="paragraph">
-<p><br/><br/></p>
-</div>
-<div class="paragraph">
-<p><div class="extended-quote-first"><p>
-Apache Isis enabled us to concentrate on modelling the domain and getting the UI and REST Interface with nearly no effort so we could build a fast and reliable application. Now we&#8217;ve started using it for the second project and I&#8217;m still very impressed by the framework and the community behind it.
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><div class="extended-quote-attribution"><p>&#8201;&#8212;&#8201;Timothy Simecsek, NTT DATA Osterreich GmbH
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><br/><br/>
-<div class="extended-quote-first"><p>
-We&#8217;d been looking for a RAD-tool for building our app; after trying different tools, Apache Isis gave us the most confidence for getting the job done.  It&#8217;s really remarkable how easy it is to use, while contributors and users on the Isis' active mailing list are ready to help on more advanced topics.
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><div class="extended-quote-attribution"><p>&#8201;&#8212;&#8201;Erik de Hair, pocos.nl
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><br/><br/>
-<div class="extended-quote-first"><p>
-A fantastic framework! With Apache Isis we can prototype a deployable application in minutes rather than days.
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><div class="extended-quote-attribution"><p>&#8201;&#8212;&#8201;Jeremy Branham
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><br/><br/>
-<div class="extended-quote-first"><p>
-With its automatic UI and REST web services generation, Apache Isis kept our developers amazed and happy. Having had strenuous experiences with architecture and infrastructure concerns differing from project to project, it&#8217;s like having back the fun in software development
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><div class="extended-quote-attribution"><p>&#8201;&#8212;&#8201;Willie Loyd Tandingan
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><br/><br/>
-<div class="extended-quote-first"><p>
-Apache Isis' focus on the business domain improves communication between our end-users, architects and developers.  Having a better application in a fraction of the time and cost is something we highly appreciate.
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><div class="extended-quote-attribution"><p>&#8201;&#8212;&#8201;Cesar Lugo
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><br/><br/>
-<div class="extended-quote-first"><p>
-I like the guidance Apache Isis gives me for structuring code along the lines of Domain Driven Design. My first web application in plain Java without writing a single line of DDL or HTML/*Script.
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><div class="extended-quote-attribution"><p>&#8201;&#8212;&#8201;Joerg Rade
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><br/><br/>
-<div class="extended-quote-first"><p>
-The Apache Isis team is very supportive. They even added new functionality for Summernote when I needed a WYSIWYG editor in my prototype project.
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><div class="extended-quote-attribution"><p>&#8201;&#8212;&#8201;Marianne Hagaseth
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><br/><br/>
-<div class="extended-quote-first"><p>
-What interests me most about Apache Isis is its goal of making both developers and users co-owners of their domain models.  Apache Isis will be of interest to businesses who see their custom software as a strategic investment. It&#8217;s not trying to be all things to all people, but it has depth and also, I predict, a bright future.
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><div class="extended-quote-attribution"><p>&#8201;&#8212;&#8201;Steve Cameron
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><br/><br/>
-<div class="extended-quote-first"><p>
-As students most of us prefer sticking with business logic than spending much time with UX enhancements.  Apache Isis provides a great platform to create a perfectly working prototypes with loads of inbuilt UX concerns and customizations without worrying a single bit on the GUI perspective.
-And I must say this: "Great Support from the development team"
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><div class="extended-quote-attribution"><p>&#8201;&#8212;&#8201;Vishma Dias, University of Moratuwa, Sri Lanka.
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><br/><br/>
-<div class="extended-quote-first"><p>
-Apache Isis has allowed us to be focused on the Domain instead of infrastructure issues. The extensive metamodel let us further automate and enhance our custom viewer and integrate with external frameworks.
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><div class="extended-quote-attribution"><p>&#8201;&#8212;&#8201;Nacho Canovas
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><br/><br/>
-<div class="extended-quote-first"><p>
-Support from the Apache Isis community is excellent. I sense a love and dedication that is inspiring.
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><div class="extended-quote-attribution"><p>&#8201;&#8212;&#8201;Johan Doornenbal
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><br/><br/>
-<div class="extended-quote-first"><p>
-Apache Isis provided us with a great starting point for our app; we simply took the todoapp archetype and used it as a template to help set up our integration tests and BDD specs.  We were productive almost immediately
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><div class="extended-quote-attribution"><p>&#8201;&#8212;&#8201;Vladimir Nisevic, A1 Telekom Austria
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><br/><br/>
-<div class="extended-quote-first"><p>
-Apache Isis enabled us to focus on the problem domain and data quality and - because the UI was generated for us by the framework - not get distracted by UI concerns. Identified security issues were quickly addressed by the Apache Isis committers.
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><div class="extended-quote-attribution"><p>&#8201;&#8212;&#8201;Architect
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><br/><br/>
-<div class="extended-quote-first"><p>
-We use Apache Isis because of its simple and fast user interface generation.
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><div class="extended-quote-attribution"><p>&#8201;&#8212;&#8201;Andreas Lechner
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><br/><br/>
-<div class="extended-quote-first"><p>
-Apache Isis is an easy to learn, efficient and productive RAD platform. Further I can say it is evolving to be
-"the best RAD platform" without any exaggerations. The help from the community is simply wonderful.
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><div class="extended-quote-attribution"><p>&#8201;&#8212;&#8201;Theekshana Dilshan, Computer Science and Engineering, University of Moratuwa, Sri Lanka.
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><br/><br/>
-<div class="extended-quote-first"><p>
-Apache Isis is one of the best tools for hackathons.  Given a 2 day hackathon challenge I have the perfect framework
-to create my prototype helping me to focus on business logic.
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><div class="extended-quote-attribution"><p>&#8201;&#8212;&#8201;Sunand Padmanabhan
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><br/><br/>
-From a Sprint retrospective, the criticism of one lead developer sounded more like praise:
-<div class="extended-quote-first"><p>
-The problem is that if we show this to the customer they will think that all the work is done.
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><div class="extended-quote-attribution"><p>&#8201;&#8212;&#8201;provided by Ged Byrne
-</p></div></p>
-</div>
-        </div>
-
-        <footer>
-          <hr>
-          <p class="small">
-          Copyright &copy; 2010~2016 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0.
-          <br/>
-          Apache, the Apache feather logo, Apache&nbsp;Isis, and the Apache&nbsp;Isis project logo are all trademarks of The&nbsp;Apache&nbsp;Software&nbsp;Foundation.
-          </p>
-        </footer>
-
-    </div>
-
-    <div id="doc-content-right" class="large-3 medium-3 xcolumns">
-        <div id="toc" class="toc2">
-            <div class="fallback-toc">
-                
-            </div>
-        </div>
-    </div>
-
-</div>
-
-
-<script src="./js/foundation/5.5.1/vendor/jquery.js"></script>
-<script src="./js/foundation/5.5.1/foundation.min.js"></script>
-
-
-<link href="./css/jquery.tocify/1.9.0/jquery.tocify.css" rel="stylesheet">
-<script src="./js/jqueryui/1.11.4/jquery-ui.min.js"></script>
-<script src="./js/jquery.tocify/1.9.0/jquery.tocify.js"></script>
-
-
-
-<script type="text/javascript">
+    </style>  
+ </head> 
+ <body> 
+  <div class="row"> 
+   <div class="fixed contain-to-grid header"> 
+    <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem"> 
+     <ul class="title-area"> 
+      <li class="name"> <h1> <a href="/index.html">Apache Isis\u2122</a> </h1> </li> 
+      <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone --> 
+      <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li> 
+     </ul> 
+     <section class="top-bar-section"> 
+      <ul class="right"> 
+       <li class="has-form"> 
+        <form class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse"> 
+         <div class="row collapse"> 
+          <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya"> 
+          <input type="hidden" name="cof" value="FORID:0"> 
+          <input class="form-control" name="q" type="text" placeholder="Search"> 
+         </div> 
+        </form> </li> 
+      </ul> 
+      <!-- Left Nav Section --> 
+      <ul class="left"> 
+       <li><a href="/documentation.html">Documentation</a></li> 
+       <li><a href="/downloads.html">Downloads</a></li> 
+       <li><a href="/help.html">Help</a></li> 
+       <li><a href="/asf.html">@ASF</a></li> 
+      </ul> 
+     </section> 
+    </nav> 
+   </div> 
+  </div> 
+  <div class="row"> 
+   <div id="doc-content-left" class="large-9 medium-9 columns"> 
+    <div id="doc-content">
+     <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/quotes.adoc&quot;" style="float: right; font-size: small; padding: 6px;  "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+     <div class="paragraph"> 
+      <p><br><br></p> 
+     </div> 
+     <div class="paragraph"> 
+      <p></p>
+      <div class="extended-quote-first">
+       <p> Apache Isis enabled us to concentrate on modelling the domain and getting the UI and REST Interface with nearly no effort so we could build a fast and reliable application. Now we\u2019ve started using it for the second project and I\u2019m still very impressed by the framework and the community behind it. </p>
+      </div>
+      <p></p> 
+     </div> 
+     <div class="paragraph"> 
+      <p></p>
+      <div class="extended-quote-attribution">
+       <p>\u2009\u2014\u2009Timothy Simecsek, NTT DATA Osterreich GmbH </p>
+      </div>
+      <p></p> 
+     </div> 
+     <div class="paragraph"> 
+      <p><br><br> </p>
+      <div class="extended-quote-first">
+       <p> We\u2019d been looking for a RAD-tool for building our app; after trying different tools, Apache Isis gave us the most confidence for getting the job done. It\u2019s really remarkable how easy it is to use, while contributors and users on the Isis' active mailing list are ready to help on more advanced topics. </p>
+      </div>
+      <p></p> 
+     </div> 
+     <div class="paragraph"> 
+      <p></p>
+      <div class="extended-quote-attribution">
+       <p>\u2009\u2014\u2009Erik de Hair, pocos.nl </p>
+      </div>
+      <p></p> 
+     </div> 
+     <div class="paragraph"> 
+      <p><br><br> </p>
+      <div class="extended-quote-first">
+       <p> A fantastic framework! With Apache Isis we can prototype a deployable application in minutes rather than days. </p>
+      </div>
+      <p></p> 
+     </div> 
+     <div class="paragraph"> 
+      <p></p>
+      <div class="extended-quote-attribution">
+       <p>\u2009\u2014\u2009Jeremy Branham </p>
+      </div>
+      <p></p> 
+     </div> 
+     <div class="paragraph"> 
+      <p><br><br> </p>
+      <div class="extended-quote-first">
+       <p> With its automatic UI and REST web services generation, Apache Isis kept our developers amazed and happy. Having had strenuous experiences with architecture and infrastructure concerns differing from project to project, it\u2019s like having back the fun in software development </p>
+      </div>
+      <p></p> 
+     </div> 
+     <div class="paragraph"> 
+      <p></p>
+      <div class="extended-quote-attribution">
+       <p>\u2009\u2014\u2009Willie Loyd Tandingan </p>
+      </div>
+      <p></p> 
+     </div> 
+     <div class="paragraph"> 
+      <p><br><br> </p>
+      <div class="extended-quote-first">
+       <p> Apache Isis' focus on the business domain improves communication between our end-users, architects and developers. Having a better application in a fraction of the time and cost is something we highly appreciate. </p>
+      </div>
+      <p></p> 
+     </div> 
+     <div class="paragraph"> 
+      <p></p>
+      <div class="extended-quote-attribution">
+       <p>\u2009\u2014\u2009Cesar Lugo </p>
+      </div>
+      <p></p> 
+     </div> 
+     <div class="paragraph"> 
+      <p><br><br> </p>
+      <div class="extended-quote-first">
+       <p> I like the guidance Apache Isis gives me for structuring code along the lines of Domain Driven Design. My first web application in plain Java without writing a single line of DDL or HTML/*Script. </p>
+      </div>
+      <p></p> 
+     </div> 
+     <div class="paragraph"> 
+      <p></p>
+      <div class="extended-quote-attribution">
+       <p>\u2009\u2014\u2009Joerg Rade </p>
+      </div>
+      <p></p> 
+     </div> 
+     <div class="paragraph"> 
+      <p><br><br> </p>
+      <div class="extended-quote-first">
+       <p> The Apache Isis team is very supportive. They even added new functionality for Summernote when I needed a WYSIWYG editor in my prototype project. </p>
+      </div>
+      <p></p> 
+     </div> 
+     <div class="paragraph"> 
+      <p></p>
+      <div class="extended-quote-attribution">
+       <p>\u2009\u2014\u2009Marianne Hagaseth </p>
+      </div>
+      <p></p> 
+     </div> 
+     <div class="paragraph"> 
+      <p><br><br> </p>
+      <div class="extended-quote-first">
+       <p> What interests me most about Apache Isis is its goal of making both developers and users co-owners of their domain models. Apache Isis will be of interest to businesses who see their custom software as a strategic investment. It\u2019s not trying to be all things to all people, but it has depth and also, I predict, a bright future. </p>
+      </div>
+      <p></p> 
+     </div> 
+     <div class="paragraph"> 
+      <p></p>
+      <div class="extended-quote-attribution">
+       <p>\u2009\u2014\u2009Steve Cameron </p>
+      </div>
+      <p></p> 
+     </div> 
+     <div class="paragraph"> 
+      <p><br><br> </p>
+      <div class="extended-quote-first">
+       <p> As students most of us prefer sticking with business logic than spending much time with UX enhancements. Apache Isis provides a great platform to create a perfectly working prototypes with loads of inbuilt UX concerns and customizations without worrying a single bit on the GUI perspective. And I must say this: "Great Support from the development team" </p>
+      </div>
+      <p></p> 
+     </div> 
+     <div class="paragraph"> 
+      <p></p>
+      <div class="extended-quote-attribution">
+       <p>\u2009\u2014\u2009Vishma Dias, University of Moratuwa, Sri Lanka. </p>
+      </div>
+      <p></p> 
+     </div> 
+     <div class="paragraph"> 
+      <p><br><br> </p>
+      <div class="extended-quote-first">
+       <p> Apache Isis has allowed us to be focused on the Domain instead of infrastructure issues. The extensive metamodel let us further automate and enhance our custom viewer and integrate with external frameworks. </p>
+      </div>
+      <p></p> 
+     </div> 
+     <div class="paragraph"> 
+      <p></p>
+      <div class="extended-quote-attribution">
+       <p>\u2009\u2014\u2009Nacho Canovas </p>
+      </div>
+      <p></p> 
+     </div> 
+     <div class="paragraph"> 
+      <p><br><br> </p>
+      <div class="extended-quote-first">
+       <p> Support from the Apache Isis community is excellent. I sense a love and dedication that is inspiring. </p>
+      </div>
+      <p></p> 
+     </div> 
+     <div class="paragraph"> 
+      <p></p>
+      <div class="extended-quote-attribution">
+       <p>\u2009\u2014\u2009Johan Doornenbal </p>
+      </div>
+      <p></p> 
+     </div> 
+     <div class="paragraph"> 
+      <p><br><br> </p>
+      <div class="extended-quote-first">
+       <p> Apache Isis provided us with a great starting point for our app; we simply took the todoapp archetype and used it as a template to help set up our integration tests and BDD specs. We were productive almost immediately </p>
+      </div>
+      <p></p> 
+     </div> 
+     <div class="paragraph"> 
+      <p></p>
+      <div class="extended-quote-attribution">
+       <p>\u2009\u2014\u2009Vladimir Nisevic, A1 Telekom Austria </p>
+      </div>
+      <p></p> 
+     </div> 
+     <div class="paragraph"> 
+      <p><br><br> </p>
+      <div class="extended-quote-first">
+       <p> Apache Isis enabled us to focus on the problem domain and data quality and - because the UI was generated for us by the framework - not get distracted by UI concerns. Identified security issues were quickly addressed by the Apache Isis committers. </p>
+      </div>
+      <p></p> 
+     </div> 
+     <div class="paragraph"> 
+      <p></p>
+      <div class="extended-quote-attribution">
+       <p>\u2009\u2014\u2009Architect </p>
+      </div>
+      <p></p> 
+     </div> 
+     <div class="paragraph"> 
+      <p><br><br> </p>
+      <div class="extended-quote-first">
+       <p> We use Apache Isis because of its simple and fast user interface generation. </p>
+      </div>
+      <p></p> 
+     </div> 
+     <div class="paragraph"> 
+      <p></p>
+      <div class="extended-quote-attribution">
+       <p>\u2009\u2014\u2009Andreas Lechner </p>
+      </div>
+      <p></p> 
+     </div> 
+     <div class="paragraph"> 
+      <p><br><br> </p>
+      <div class="extended-quote-first">
+       <p> Apache Isis is an easy to learn, efficient and productive RAD platform. Further I can say it is evolving to be "the best RAD platform" without any exaggerations. The help from the community is simply wonderful. </p>
+      </div>
+      <p></p> 
+     </div> 
+     <div class="paragraph"> 
+      <p></p>
+      <div class="extended-quote-attribution">
+       <p>\u2009\u2014\u2009Theekshana Dilshan, Computer Science and Engineering, University of Moratuwa, Sri Lanka. </p>
+      </div>
+      <p></p> 
+     </div> 
+     <div class="paragraph"> 
+      <p><br><br> </p>
+      <div class="extended-quote-first">
+       <p> Apache Isis is one of the best tools for hackathons. Given a 2 day hackathon challenge I have the perfect framework to create my prototype helping me to focus on business logic. </p>
+      </div>
+      <p></p> 
+     </div> 
+     <div class="paragraph"> 
+      <p></p>
+      <div class="extended-quote-attribution">
+       <p>\u2009\u2014\u2009Sunand Padmanabhan </p>
+      </div>
+      <p></p> 
+     </div> 
+     <div class="paragraph"> 
+      <p><br><br> From a Sprint retrospective, the criticism of one lead developer sounded more like praise: </p>
+      <div class="extended-quote-first">
+       <p> The problem is that if we show this to the customer they will think that all the work is done. </p>
+      </div>
+      <p></p> 
+     </div> 
+     <div class="paragraph"> 
+      <p></p>
+      <div class="extended-quote-attribution">
+       <p>\u2009\u2014\u2009provided by Ged Byrne </p>
+      </div>
+      <p></p> 
+     </div> 
+    </div> 
+    <footer> 
+     <hr> 
+     <p class="small"> Copyright � 2010~2016 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0. <br> Apache, the Apache feather logo, Apache&nbsp;Isis, and the Apache&nbsp;Isis project logo are all trademarks of The&nbsp;Apache&nbsp;Software&nbsp;Foundation. </p> 
+    </footer> 
+   </div> 
+   <div id="doc-content-right" class="large-3 medium-3 xcolumns"> 
+    <div id="toc" class="toc2"> 
+     <div class="fallback-toc"> 
+     </div> 
+    </div> 
+   </div> 
+  </div> 
+  <script src="./js/foundation/5.5.1/vendor/jquery.js"></script> 
+  <script src="./js/foundation/5.5.1/foundation.min.js"></script> 
+  <link href="./css/jquery.tocify/1.9.0/jquery.tocify.css" rel="stylesheet"> 
+  <script src="./js/jqueryui/1.11.4/jquery-ui.min.js"></script> 
+  <script src="./js/jquery.tocify/1.9.0/jquery.tocify.js"></script> 
+  <script type="text/javascript">
     $(function () {
         $("#toc").tocify({
             scrollTo: 50,
@@ -725,9 +730,8 @@ The problem is that if we show this to the customer they will think that all the
         });
         $(".fallback-toc").hide();
     });
-</script>
-
-<script type="text/javascript">
+</script> 
+  <script type="text/javascript">
 
   /****
 
@@ -837,9 +841,8 @@ The problem is that if we show this to the customer they will think that all the
 
     ***/
 
-</script>
-
-<script type="text/javascript">
+</script> 
+  <script type="text/javascript">
 
 $(document).ready(function(){
     if("Documentation" === "Quotes") {
@@ -851,10 +854,8 @@ $(document).ready(function(){
 
 });
 
-</script>
-
-
-<script>
+</script> 
+  <script>
 
 $( document ).ready(function() {
 
@@ -945,7 +946,6 @@ $( document ).ready(function() {
 
 
 });
-</script>
-
-</body>
+</script>  
+ </body>
 </html>


[12/44] isis-site git commit: ISIS-1594: provide an 'edit' button

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/guides/ugvro.pdf
----------------------------------------------------------------------
diff --git a/content/guides/ugvro.pdf b/content/guides/ugvro.pdf
index 3b6f36e..07e5b92 100644
--- a/content/guides/ugvro.pdf
+++ b/content/guides/ugvro.pdf
@@ -4,16 +4,16 @@
 << /Title (Restful Objects Viewer)
 /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:20161103173533+00'00')
-/ModDate (D:20161103173533+00'00')
+/CreationDate (D:20170307234555+00'00')
+/ModDate (D:20170307234555+00'00')
 >>
 endobj
 2 0 obj
 << /Type /Catalog
 /Pages 3 0 R
 /Names 14 0 R
-/Outlines 200 0 R
-/PageLabels 225 0 R
+/Outlines 199 0 R
+/PageLabels 224 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 21
-/Kids [7 0 R 10 0 R 12 0 R 35 0 R 43 0 R 48 0 R 64 0 R 70 0 R 79 0 R 89 0 R 92 0 R 95 0 R 99 0 R 101 0 R 110 0 R 115 0 R 128 0 R 136 0 R 141 0 R 143 0 R 150 0 R]
+/Kids [7 0 R 10 0 R 12 0 R 35 0 R 43 0 R 48 0 R 64 0 R 69 0 R 78 0 R 88 0 R 91 0 R 94 0 R 98 0 R 100 0 R 109 0 R 114 0 R 127 0 R 135 0 R 140 0 R 142 0 R 149 0 R]
 >>
 endobj
 4 0 obj
@@ -78,13 +78,13 @@ endobj
 endobj
 8 0 obj
 << /Type /Font
-/BaseFont /AAAAEQ+NotoSerif
+/BaseFont /AAAAEC+NotoSerif
 /Subtype /TrueType
-/FontDescriptor 227 0 R
+/FontDescriptor 226 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 229 0 R
-/ToUnicode 228 0 R
+/Widths 228 0 R
+/ToUnicode 227 0 R
 >>
 endobj
 9 0 obj
@@ -999,7 +999,7 @@ endobj
 /F1.0 8 0 R
 >>
 >>
-/Annots [155 0 R 156 0 R 157 0 R 158 0 R 159 0 R 160 0 R 161 0 R 162 0 R 163 0 R 164 0 R 165 0 R 166 0 R 167 0 R 168 0 R 169 0 R 170 0 R 171 0 R 172 0 R 173 0 R 174 0 R 175 0 R 176 0 R 177 0 R 178 0 R 179 0 R 180 0 R 181 0 R 182 0 R 183 0 R 184 0 R 185 0 R 186 0 R 187 0 R 188 0 R 189 0 R 190 0 R 191 0 R 192 0 R 193 0 R 194 0 R 195 0 R 196 0 R 197 0 R 198 0 R]
+/Annots [154 0 R 155 0 R 156 0 R 157 0 R 158 0 R 159 0 R 160 0 R 161 0 R 162 0 R 163 0 R 164 0 R 165 0 R 166 0 R 167 0 R 168 0 R 169 0 R 170 0 R 171 0 R 172 0 R 173 0 R 174 0 R 175 0 R 176 0 R 177 0 R 178 0 R 179 0 R 180 0 R 181 0 R 182 0 R 183 0 R 184 0 R 185 0 R 186 0 R 187 0 R 188 0 R 189 0 R 190 0 R 191 0 R 192 0 R 193 0 R 194 0 R 195 0 R 196 0 R 197 0 R]
 >>
 endobj
 11 0 obj
@@ -1718,7 +1718,7 @@ endobj
 /Font << /F2.0 16 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 199 0 R
+/XObject << /Stamp1 198 0 R
 >>
 >>
 /Annots [17 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 31 0 R 32 0 R 33 0 R]
@@ -1733,18 +1733,18 @@ endobj
 >>
 endobj
 15 0 obj
-<< /Kids [112 0 R 113 0 R]
+<< /Kids [111 0 R 112 0 R]
 >>
 endobj
 16 0 obj
 << /Type /Font
-/BaseFont /AAAAER+NotoSerif-Bold
+/BaseFont /AAAAED+NotoSerif-Bold
 /Subtype /TrueType
-/FontDescriptor 231 0 R
+/FontDescriptor 230 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 233 0 R
-/ToUnicode 232 0 R
+/Widths 232 0 R
+/ToUnicode 231 0 R
 >>
 endobj
 17 0 obj
@@ -2416,7 +2416,7 @@ endobj
 /Font << /F2.0 16 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 199 0 R
+/XObject << /Stamp1 198 0 R
 >>
 >>
 /Annots [37 0 R]
@@ -3696,7 +3696,7 @@ endobj
 /Contents 42 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /XObject << /I1 40 0 R
-/Stamp1 199 0 R
+/Stamp1 198 0 R
 >>
 /Font << /F1.0 8 0 R
 /F3.1 45 0 R
@@ -3719,13 +3719,13 @@ endobj
 endobj
 45 0 obj
 << /Type /Font
-/BaseFont /AAAAES+FontAwesome
+/BaseFont /AAAAEE+FontAwesome
 /Subtype /TrueType
-/FontDescriptor 235 0 R
+/FontDescriptor 234 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 237 0 R
-/ToUnicode 236 0 R
+/Widths 236 0 R
+/ToUnicode 235 0 R
 >>
 endobj
 46 0 obj
@@ -4954,7 +4954,7 @@ endobj
 /F4.0 49 0 R
 /F5.0 53 0 R
 >>
-/XObject << /Stamp1 199 0 R
+/XObject << /Stamp1 198 0 R
 >>
 >>
 /Annots [54 0 R 55 0 R 57 0 R 58 0 R 59 0 R 60 0 R 62 0 R]
@@ -4962,13 +4962,13 @@ endobj
 endobj
 49 0 obj
 << /Type /Font
-/BaseFont /AAAAET+NotoSerif-Italic
+/BaseFont /AAAAEF+NotoSerif-Italic
 /Subtype /TrueType
-/FontDescriptor 239 0 R
+/FontDescriptor 238 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 241 0 R
-/ToUnicode 240 0 R
+/Widths 240 0 R
+/ToUnicode 239 0 R
 >>
 endobj
 50 0 obj
@@ -4982,13 +4982,13 @@ endobj
 endobj
 53 0 obj
 << /Type /Font
-/BaseFont /AAAAEU+mplus1mn-regular
+/BaseFont /AAAAEG+mplus1mn-regular
 /Subtype /TrueType
-/FontDescriptor 243 0 R
+/FontDescriptor 242 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 245 0 R
-/ToUnicode 244 0 R
+/Widths 244 0 R
+/ToUnicode 243 0 R
 >>
 endobj
 54 0 obj
@@ -5066,7 +5066,7 @@ endobj
 >>
 endobj
 63 0 obj
-<< /Length 11457
+<< /Length 11171
 >>
 stream
 q
@@ -5618,35 +5618,13 @@ f
 h
 S
 Q
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-59.24000000000001 276.33500000000026 Td
-/F6.0 11 Tf
-<697369732e7669657765722e7265737466756c6f626a656374732e686f6e6f72556948696e7473> 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
-273.74 276.33500000000026 Td
-/F5.0 11 Tf
-<3d> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-279.24 276.33500000000026 Td
+59.24000000000001 276.33500000000026 Td
 /F5.0 11 Tf
-<74727565> Tj
+<697369732e7669657765722e7265737466756c6f626a656374732e686f6e6f72556948696e74733d74727565> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5711,9 +5689,8 @@ endobj
 /F5.0 53 0 R
 /F2.0 16 0 R
 /F4.0 49 0 R
-/F6.0 68 0 R
 >>
-/XObject << /Stamp1 199 0 R
+/XObject << /Stamp1 198 0 R
 >>
 >>
 /Annots [65 0 R 66 0 R]
@@ -5745,17 +5722,6 @@ endobj
 [64 0 R /XYZ 0 431.9400000000002 null]
 endobj
 68 0 obj
-<< /Type /Font
-/BaseFont /AAAAEV+mplus1mn-bold
-/Subtype /TrueType
-/FontDescriptor 247 0 R
-/FirstChar 32
-/LastChar 255
-/Widths 249 0 R
-/ToUnicode 248 0 R
->>
-endobj
-69 0 obj
 << /Length 17729
 >>
 stream
@@ -6804,26 +6770,26 @@ Q
 
 endstream
 endobj
-70 0 obj
+69 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 69 0 R
+/Contents 68 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 16 0 R
 /F1.0 8 0 R
 /F5.0 53 0 R
 >>
-/XObject << /Stamp1 199 0 R
+/XObject << /Stamp1 198 0 R
 >>
 >>
-/Annots [72 0 R 73 0 R 74 0 R 75 0 R 76 0 R 77 0 R]
+/Annots [71 0 R 72 0 R 73 0 R 74 0 R 75 0 R 76 0 R]
 >>
 endobj
-71 0 obj
-[70 0 R /XYZ 0 841.89 null]
+70 0 obj
+[69 0 R /XYZ 0 841.89 null]
 endobj
-72 0 obj
+71 0 obj
 << /Border [0 0 0]
 /Dest ()
 /Subtype /Link
@@ -6831,7 +6797,7 @@ endobj
 /Type /Annot
 >>
 endobj
-73 0 obj
+72 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -6842,7 +6808,7 @@ endobj
 /Type /Annot
 >>
 endobj
-74 0 obj
+73 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -6853,7 +6819,7 @@ endobj
 /Type /Annot
 >>
 endobj
-75 0 obj
+74 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -6864,7 +6830,7 @@ endobj
 /Type /Annot
 >>
 endobj
-76 0 obj
+75 0 obj
 << /Border [0 0 0]
 /Dest (_ugvro_simplified-representations)
 /Subtype /Link
@@ -6872,7 +6838,7 @@ endobj
 /Type /Annot
 >>
 endobj
-77 0 obj
+76 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -6883,7 +6849,7 @@ endobj
 /Type /Annot
 >>
 endobj
-78 0 obj
+77 0 obj
 << /Length 14805
 >>
 stream
@@ -7681,26 +7647,26 @@ Q
 
 endstream
 endobj
-79 0 obj
+78 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 78 0 R
+/Contents 77 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 16 0 R
 /F1.0 8 0 R
 /F5.0 53 0 R
 >>
-/XObject << /Stamp1 199 0 R
+/XObject << /Stamp1 198 0 R
 >>
 >>
-/Annots [81 0 R 82 0 R 83 0 R 84 0 R 86 0 R]
+/Annots [80 0 R 81 0 R 82 0 R 83 0 R 85 0 R]
 >>
 endobj
-80 0 obj
-[79 0 R /XYZ 0 841.89 null]
+79 0 obj
+[78 0 R /XYZ 0 841.89 null]
 endobj
-81 0 obj
+80 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -7711,7 +7677,7 @@ endobj
 /Type /Annot
 >>
 endobj
-82 0 obj
+81 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -7722,7 +7688,7 @@ endobj
 /Type /Annot
 >>
 endobj
-83 0 obj
+82 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -7733,7 +7699,7 @@ endobj
 /Type /Annot
 >>
 endobj
-84 0 obj
+83 0 obj
 << /Border [0 0 0]
 /Dest (_ugvro_architecture)
 /Subtype /Link
@@ -7741,10 +7707,10 @@ endobj
 /Type /Annot
 >>
 endobj
-85 0 obj
-[79 0 R /XYZ 0 630.71 null]
+84 0 obj
+[78 0 R /XYZ 0 630.71 null]
 endobj
-86 0 obj
+85 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -7755,10 +7721,10 @@ endobj
 /Type /Annot
 >>
 endobj
-87 0 obj
-[79 0 R /XYZ 0 247.57000000000016 null]
+86 0 obj
+[78 0 R /XYZ 0 247.57000000000016 null]
 endobj
-88 0 obj
+87 0 obj
 << /Length 3416
 >>
 stream
@@ -7953,22 +7919,22 @@ Q
 
 endstream
 endobj
-89 0 obj
+88 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 88 0 R
+/Contents 87 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F5.0 53 0 R
 >>
-/XObject << /Stamp1 199 0 R
+/XObject << /Stamp1 198 0 R
 >>
 >>
-/Annots [90 0 R]
+/Annots [89 0 R]
 >>
 endobj
-90 0 obj
+89 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -7979,7 +7945,7 @@ endobj
 /Type /Annot
 >>
 endobj
-91 0 obj
+90 0 obj
 << /Length 12436
 >>
 stream
@@ -8699,33 +8665,33 @@ Q
 
 endstream
 endobj
-92 0 obj
+91 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 91 0 R
+/Contents 90 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F5.0 53 0 R
-/F5.1 93 0 R
+/F5.1 92 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 199 0 R
+/XObject << /Stamp1 198 0 R
 >>
 >>
 >>
 endobj
-93 0 obj
+92 0 obj
 << /Type /Font
-/BaseFont /AAAAEW+mplus1mn-regular
+/BaseFont /AAAAEH+mplus1mn-regular
 /Subtype /TrueType
-/FontDescriptor 251 0 R
+/FontDescriptor 246 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 253 0 R
-/ToUnicode 252 0 R
+/Widths 248 0 R
+/ToUnicode 247 0 R
 >>
 endobj
-94 0 obj
+93 0 obj
 << /Length 6581
 >>
 stream
@@ -9060,26 +9026,26 @@ Q
 
 endstream
 endobj
-95 0 obj
+94 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 94 0 R
+/Contents 93 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F5.0 53 0 R
 /F2.0 16 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 199 0 R
+/XObject << /Stamp1 198 0 R
 >>
 >>
-/Annots [97 0 R]
+/Annots [96 0 R]
 >>
 endobj
-96 0 obj
-[95 0 R /XYZ 0 742.41 null]
+95 0 obj
+[94 0 R /XYZ 0 742.41 null]
 endobj
-97 0 obj
+96 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -9090,7 +9056,7 @@ endobj
 /Type /Annot
 >>
 endobj
-98 0 obj
+97 0 obj
 << /Length 12733
 >>
 stream
@@ -9827,22 +9793,22 @@ Q
 
 endstream
 endobj
-99 0 obj
+98 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 98 0 R
+/Contents 97 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F5.0 53 0 R
-/F5.1 93 0 R
+/F5.1 92 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 199 0 R
+/XObject << /Stamp1 198 0 R
 >>
 >>
 >>
 endobj
-100 0 obj
+99 0 obj
 << /Length 12070
 >>
 stream
@@ -10481,29 +10447,29 @@ Q
 
 endstream
 endobj
-101 0 obj
+100 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 100 0 R
+/Contents 99 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 16 0 R
 /F1.0 8 0 R
 /F5.0 53 0 R
 >>
-/XObject << /Stamp1 199 0 R
+/XObject << /Stamp1 198 0 R
 >>
 >>
-/Annots [104 0 R 105 0 R 107 0 R 108 0 R]
+/Annots [103 0 R 104 0 R 106 0 R 107 0 R]
 >>
 endobj
+101 0 obj
+[100 0 R /XYZ 0 841.89 null]
+endobj
 102 0 obj
-[101 0 R /XYZ 0 841.89 null]
+[100 0 R /XYZ 0 742.83 null]
 endobj
 103 0 obj
-[101 0 R /XYZ 0 742.83 null]
-endobj
-104 0 obj
 << /Border [0 0 0]
 /Dest (_ugvro_simplified-representations_domain-object)
 /Subtype /Link
@@ -10511,7 +10477,7 @@ endobj
 /Type /Annot
 >>
 endobj
-105 0 obj
+104 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -10522,10 +10488,10 @@ endobj
 /Type /Annot
 >>
 endobj
-106 0 obj
-[101 0 R /XYZ 0 171.03000000000029 null]
+105 0 obj
+[100 0 R /XYZ 0 171.03000000000029 null]
 endobj
-107 0 obj
+106 0 obj
 << /Border [0 0 0]
 /Dest (_ugvro_simplified-representations_object-collection)
 /Subtype /Link
@@ -10533,7 +10499,7 @@ endobj
 /Type /Annot
 >>
 endobj
-108 0 obj
+107 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -10544,7 +10510,7 @@ endobj
 /Type /Annot
 >>
 endobj
-109 0 obj
+108 0 obj
 << /Length 10824
 >>
 stream
@@ -11159,35 +11125,35 @@ Q
 
 endstream
 endobj
-110 0 obj
+109 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 109 0 R
+/Contents 108 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F5.0 53 0 R
 /F1.0 8 0 R
 /F2.0 16 0 R
 >>
-/XObject << /Stamp1 199 0 R
+/XObject << /Stamp1 198 0 R
 >>
 >>
 >>
 endobj
-111 0 obj
-[110 0 R /XYZ 0 144.34999999999988 null]
+110 0 obj
+[109 0 R /XYZ 0 144.34999999999988 null]
 endobj
-112 0 obj
+111 0 obj
 << /Limits [(_ugvro_architecture) (_ugvro_ro-spec_goals)]
-/Names [(_ugvro_architecture) 71 0 R (_ugvro_configuration-properties) 129 0 R (_ugvro_configuration-properties_deprecated) 134 0 R (_ugvro_configuration-properties_standard) 130 0 R (_ugvro_hints-and-tips) 144 0 R (_ugvro_ro-spec) 36 0 R (_ugvro_ro-spec_apache-isis-implementation) 46 0 R (_ugvro_ro-spec_extensions) 50 0 R (_ugvro_ro-spec_extensions_content-negotiation) 51 0 R (_ugvro_ro-spec_extensions_content-negotiation_apache-isis-profile) 56 0 R (_ugvro_ro-spec_extensions_content-negotiation_x-ro-domain-type) 52 0 R (_ugvro_ro-spec_extensions_minimizing-round-trips) 61 0 R (_ugvro_ro-spec_extensions_minimizing-round-trips_honor-ui-hints) 67 0 R (_ugvro_ro-spec_goals) 38 0 R]
+/Names [(_ugvro_architecture) 70 0 R (_ugvro_configuration-properties) 128 0 R (_ugvro_configuration-properties_deprecated) 133 0 R (_ugvro_configuration-properties_standard) 129 0 R (_ugvro_hints-and-tips) 143 0 R (_ugvro_ro-spec) 36 0 R (_ugvro_ro-spec_apache-isis-implementation) 46 0 R (_ugvro_ro-spec_extensions) 50 0 R (_ugvro_ro-spec_extensions_content-negotiation) 51 0 R (_ugvro_ro-spec_extensions_content-negotiation_apache-isis-profile) 56 0 R (_ugvro_ro-spec_extensions_content-negotiation_x-ro-domain-type) 52 0 R (_ugvro_ro-spec_extensions_minimizing-round-trips) 61 0 R (_ugvro_ro-spec_extensions_minimizing-round-trips_honor-ui-hints) 67 0 R (_ugvro_ro-spec_goals) 38 0 R]
 >>
 endobj
-113 0 obj
+112 0 obj
 << /Limits [(_ugvro_simplified-representations) (using-chrome-tools)]
-/Names [(_ugvro_simplified-representations) 80 0 R (_ugvro_simplified-representations_action-invocation) 102 0 R (_ugvro_simplified-representations_apache-isis-profile) 85 0 R (_ugvro_simplified-representations_configuration-properties) 125 0 R (_ugvro_simplified-representations_domain-object) 87 0 R (_ugvro_simplified-representations_object-collection) 96 0 R (_ugvro_simplified-representations_other-representations) 116 0 R (_ugvw) 13 0 R (angularjs-tips) 147 0 R (invoking-a-get-link-eg-invoking-a-query-action) 148 0 R (invoking-a-put-or-post-link) 151 0 R (other-guides) 18 0 R (pretty-printing) 153 0 R (resources-and-representations) 39 0 R (returning-a-list) 106 0 R (returning-an-object) 103 0 R (returning-scalar-nothing) 111 0 R (using-chrome-tools) 145 0 R]
+/Names [(_ugvro_simplified-representations) 79 0 R (_ugvro_simplified-representations_action-invocation) 101 0 R (_ugvro_simplified-representations_apache-isis-profile) 84 0 R (_ugvro_simplified-representations_configuration-properties) 124 0 R (_ugvro_simplified-representations_domain-object) 86 0 R (_ugvro_simplified-representations_object-collection) 95 0 R (_ugvro_simplified-representations_other-representations) 115 0 R (_ugvw) 13 0 R (angularjs-tips) 146 0 R (invoking-a-get-link-eg-invoking-a-query-action) 147 0 R (invoking-a-put-or-post-link) 150 0 R (other-guides) 18 0 R (pretty-printing) 152 0 R (resources-and-representations) 39 0 R (returning-a-list) 105 0 R (returning-an-object) 102 0 R (returning-scalar-nothing) 110 0 R (using-chrome-tools) 144 0 R]
 >>
 endobj
-114 0 obj
+113 0 obj
 << /Length 15289
 >>
 stream
@@ -12052,27 +12018,27 @@ Q
 
 endstream
 endobj
-115 0 obj
+114 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 114 0 R
+/Contents 113 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 16 0 R
 /F1.0 8 0 R
 /F5.0 53 0 R
 /F3.1 45 0 R
 >>
-/XObject << /Stamp1 199 0 R
+/XObject << /Stamp1 198 0 R
 >>
 >>
-/Annots [117 0 R 118 0 R 119 0 R 120 0 R 121 0 R 122 0 R 123 0 R 124 0 R 126 0 R]
+/Annots [116 0 R 117 0 R 118 0 R 119 0 R 120 0 R 121 0 R 122 0 R 123 0 R 125 0 R]
 >>
 endobj
-116 0 obj
-[115 0 R /XYZ 0 841.89 null]
+115 0 obj
+[114 0 R /XYZ 0 841.89 null]
 endobj
-117 0 obj
+116 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -12083,7 +12049,7 @@ endobj
 /Type /Annot
 >>
 endobj
-118 0 obj
+117 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -12094,7 +12060,7 @@ endobj
 /Type /Annot
 >>
 endobj
-119 0 obj
+118 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -12105,7 +12071,7 @@ endobj
 /Type /Annot
 >>
 endobj
-120 0 obj
+119 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -12116,7 +12082,7 @@ endobj
 /Type /Annot
 >>
 endobj
-121 0 obj
+120 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -12127,7 +12093,7 @@ endobj
 /Type /Annot
 >>
 endobj
-122 0 obj
+121 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -12138,7 +12104,7 @@ endobj
 /Type /Annot
 >>
 endobj
-123 0 obj
+122 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -12149,7 +12115,7 @@ endobj
 /Type /Annot
 >>
 endobj
-124 0 obj
+123 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -12160,10 +12126,10 @@ endobj
 /Type /Annot
 >>
 endobj
-125 0 obj
-[115 0 R /XYZ 0 295.45000000000016 null]
+124 0 obj
+[114 0 R /XYZ 0 295.45000000000016 null]
 endobj
-126 0 obj
+125 0 obj
 << /Border [0 0 0]
 /Dest (_ugvro_configuration-properties_deprecated)
 /Subtype /Link
@@ -12171,7 +12137,7 @@ endobj
 /Type /Annot
 >>
 endobj
-127 0 obj
+126 0 obj
 << /Length 21011
 >>
 stream
@@ -12639,7 +12605,7 @@ ET
 
 BT
 221.13950040000003 507.0430000000001 Td
-/F7.0 10.5 Tf
+/F6.0 10.5 Tf
 <66616c7365> Tj
 ET
 
@@ -12841,7 +12807,7 @@ ET
 
 BT
 221.13950040000003 455.2030000000002 Td
-/F7.0 10.5 Tf
+/F6.0 10.5 Tf
 <66616c7365> Tj
 ET
 
@@ -13458,7 +13424,7 @@ ET
 
 BT
 221.13950040000003 61.80300000000021 Td
-/F7.0 10.5 Tf
+/F6.0 10.5 Tf
 <66616c7365> Tj
 ET
 
@@ -13538,42 +13504,42 @@ Q
 
 endstream
 endobj
-128 0 obj
+127 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 127 0 R
+/Contents 126 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 16 0 R
 /F1.0 8 0 R
 /F5.0 53 0 R
 /F4.0 49 0 R
-/F7.0 131 0 R
+/F6.0 130 0 R
 >>
-/XObject << /Stamp1 199 0 R
+/XObject << /Stamp1 198 0 R
 >>
 >>
-/Annots [132 0 R 133 0 R]
+/Annots [131 0 R 132 0 R]
 >>
 endobj
+128 0 obj
+[127 0 R /XYZ 0 841.89 null]
+endobj
 129 0 obj
-[128 0 R /XYZ 0 841.89 null]
+[127 0 R /XYZ 0 662.2700000000001 null]
 endobj
 130 0 obj
-[128 0 R /XYZ 0 662.2700000000001 null]
-endobj
-131 0 obj
 << /Type /Font
-/BaseFont /AAAAEX+mplus1mn-italic
+/BaseFont /AAAAEI+mplus1mn-italic
 /Subtype /TrueType
-/FontDescriptor 255 0 R
+/FontDescriptor 250 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 257 0 R
-/ToUnicode 256 0 R
+/Widths 252 0 R
+/ToUnicode 251 0 R
 >>
 endobj
-132 0 obj
+131 0 obj
 << /Border [0 0 0]
 /Dest (_ugvro_ro-spec_extensions_minimizing-round-trips_honor-ui-hints)
 /Subtype /Link
@@ -13581,7 +13547,7 @@ endobj
 /Type /Annot
 >>
 endobj
-133 0 obj
+132 0 obj
 << /Border [0 0 0]
 /Dest (_ugvro_simplified-representations)
 /Subtype /Link
@@ -13589,11 +13555,11 @@ endobj
 /Type /Annot
 >>
 endobj
-134 0 obj
-[128 0 R /XYZ 0 335.71000000000026 null]
+133 0 obj
+[127 0 R /XYZ 0 335.71000000000026 null]
 endobj
-135 0 obj
-<< /Length 27487
+134 0 obj
+<< /Length 25493
 >>
 stream
 q
@@ -13937,7 +13903,7 @@ ET
 
 BT
 221.13950040000003 738.303 Td
-/F7.0 10.5 Tf
+/F6.0 10.5 Tf
 <66616c7365> Tj
 ET
 
@@ -14121,7 +14087,7 @@ ET
 
 BT
 221.13950040000003 700.7429999999999 Td
-/F7.0 10.5 Tf
+/F6.0 10.5 Tf
 <66616c7365> Tj
 ET
 
@@ -14312,7 +14278,7 @@ ET
 
 BT
 221.13950040000003 648.903 Td
-/F7.0 10.5 Tf
+/F6.0 10.5 Tf
 <66616c7365> Tj
 ET
 
@@ -14503,7 +14469,7 @@ ET
 
 BT
 221.13950040000003 597.063 Td
-/F7.0 10.5 Tf
+/F6.0 10.5 Tf
 <66616c7365> Tj
 ET
 
@@ -14694,7 +14660,7 @@ ET
 
 BT
 221.13950040000003 545.223 Td
-/F7.0 10.5 Tf
+/F6.0 10.5 Tf
 <66616c7365> Tj
 ET
 
@@ -14885,7 +14851,7 @@ ET
 
 BT
 221.13950040000003 493.3829999999999 Td
-/F7.0 10.5 Tf
+/F6.0 10.5 Tf
 <66616c7365> Tj
 ET
 
@@ -15031,13 +14997,13 @@ f
 h
 S
 Q
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 59.24 407.465 Td
-/F6.0 11 Tf
-<697369732e7669657765722e7265737466756c6f626a656374732e737570707265737344657363726962656442794c696e6b73> Tj
+/F5.0 11 Tf
+<697369732e7669657765722e7265737466756c6f626a656374732e737570707265737344657363726962656442794c696e6b733d74727565> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -15046,31 +15012,31 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-339.74 407.465 Td
+59.24 392.72499999999997 Td
 /F5.0 11 Tf
-<3d> Tj
+<697369732e7669657765722e7265737466756c6f626a656374732e73757070726573735570646174654c696e6b3d74727565> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-345.24 407.465 Td
+59.24 377.98499999999996 Td
 /F5.0 11 Tf
-<74727565> Tj
+<697369732e7669657765722e7265737466756c6f626a656374732e73757070726573734d656d62657249643d74727565> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-59.24 392.72499999999997 Td
-/F6.0 11 Tf
-<697369732e7669657765722e7265737466756c6f626a656374732e73757070726573735570646174654c696e6b> Tj
+59.24 363.24499999999995 Td
+/F5.0 11 Tf
+<697369732e7669657765722e7265737466756c6f626a656374732e73757070726573734d656d6265724c696e6b733d74727565> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -15079,31 +15045,42 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-306.73999999999995 392.72499999999997 Td
+59.24 348.50499999999994 Td
 /F5.0 11 Tf
-<3d> Tj
+<697369732e7669657765722e7265737466756c6f626a656374732e73757070726573734d656d626572457874656e73696f6e733d74727565> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-312.23999999999995 392.72499999999997 Td
+59.24 333.765 Td
 /F5.0 11 Tf
-<74727565> Tj
+<697369732e7669657765722e7265737466756c6f626a656374732e73757070726573734d656d62657244697361626c6564526561736f6e3d74727565> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+q
+0.5 w
+0.933 0.933 0.933 SCN
+113.807 252.510 m
+113.807 307.850 l
+S
+Q
+0.098 0.251 0.486 scn
+0.098 0.251 0.486 SCN
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.098 0.251 0.486 scn
+0.098 0.251 0.486 SCN
 
 BT
-59.24 377.98499999999996 Td
-/F6.0 11 Tf
-<697369732e7669657765722e7265737466756c6f626a656374732e73757070726573734d656d6265724964> Tj
+76.73933333333333 271.59999999999997 Td
+/F3.1 24 Tf
+<21> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -15111,225 +15088,82 @@ ET
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
+1.357 Tw
+
 BT
-295.74 377.98499999999996 Td
-/F5.0 11 Tf
-<3d> Tj
+125.80666666666667 291.88599999999997 Td
+/F1.0 10.5 Tf
+[<496620746865736520636f6e6669677572> 20.01953125 <6174696f6e2073657474696e6773206172652073657420696e20636f6e6a756e6374696f6e2077697468207573696e672074686520>] TJ
 ET
 
+
+0.000 Tw
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+1.357 Tw
 
 BT
-301.24 377.98499999999996 Td
-/F5.0 11 Tf
-<74727565> Tj
+477.1092051323784 291.88599999999997 Td
+/F1.0 10.5 Tf
+<4170616368652049736973> Tj
 ET
 
+
+0.000 Tw
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+1.700 Tw
 
 BT
-59.24 363.24499999999995 Td
-/F6.0 11 Tf
-<697369732e7669657765722e7265737466756c6f626a656374732e73757070726573734d656d6265724c696e6b73> Tj
+125.80666666666667 276.106 Td
+/F1.0 10.5 Tf
+<70726f66696c65> 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
-312.23999999999995 363.24499999999995 Td
-/F5.0 11 Tf
-<3d> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+1.700 Tw
 
 BT
-317.74 363.24499999999995 Td
-/F5.0 11 Tf
-<74727565> Tj
+159.34366666666668 276.106 Td
+/F1.0 10.5 Tf
+<2c207468656e20746865207370656369616c20> Tj
 ET
 
+
+0.000 Tw
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+1.700 Tw
 
 BT
-59.24 348.50499999999994 Td
-/F6.0 11 Tf
-<697369732e7669657765722e7265737466756c6f626a656374732e73757070726573734d656d626572457874656e73696f6e73> Tj
+252.81983333333332 276.106 Td
+/F5.0 10.5 Tf
+<2424726f> 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
-339.74 348.50499999999994 Td
-/F5.0 11 Tf
-<3d> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-345.24 348.50499999999994 Td
-/F5.0 11 Tf
-<74727565> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-59.24 333.765 Td
-/F6.0 11 Tf
-<697369732e7669657765722e7265737466756c6f626a656374732e73757070726573734d656d62657244697361626c6564526561736f6e> 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
-361.74 333.765 Td
-/F5.0 11 Tf
-<3d> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-367.24 333.765 Td
-/F5.0 11 Tf
-<74727565> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-q
-0.5 w
-0.933 0.933 0.933 SCN
-113.807 252.510 m
-113.807 307.850 l
-S
-Q
-0.098 0.251 0.486 scn
-0.098 0.251 0.486 SCN
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.098 0.251 0.486 scn
-0.098 0.251 0.486 SCN
-
-BT
-76.73933333333333 271.59999999999997 Td
-/F3.1 24 Tf
-<21> 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
-
-1.357 Tw
-
-BT
-125.80666666666667 291.88599999999997 Td
-/F1.0 10.5 Tf
-[<496620746865736520636f6e6669677572> 20.01953125 <6174696f6e2073657474696e6773206172652073657420696e20636f6e6a756e6374696f6e2077697468207573696e672074686520>] 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.357 Tw
-
-BT
-477.1092051323784 291.88599999999997 Td
-/F1.0 10.5 Tf
-<4170616368652049736973> 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.700 Tw
-
-BT
-125.80666666666667 276.106 Td
-/F1.0 10.5 Tf
-<70726f66696c65> 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.700 Tw
-
-BT
-159.34366666666668 276.106 Td
-/F1.0 10.5 Tf
-<2c207468656e20746865207370656369616c20> Tj
-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.700 Tw
-
-BT
-252.81983333333332 276.106 Td
-/F5.0 10.5 Tf
-<2424726f> 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.700 Tw
+
+1.700 Tw
 
 BT
 273.81983333333335 276.106 Td
@@ -15412,35 +15246,13 @@ f
 h
 S
 Q
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-59.24000000000001 189.90499999999997 Td
-/F6.0 11 Tf
-<697369732e7669657765722e7265737466756c6f626a656374732e6f626a65637450726f706572747956616c7565734f6e6c79> 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
-339.74 189.90499999999997 Td
-/F5.0 11 Tf
-<3d> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-345.24 189.90499999999997 Td
+59.24000000000001 189.90499999999997 Td
 /F5.0 11 Tf
-<74727565> Tj
+<697369732e7669657765722e7265737466756c6f626a656374732e6f626a65637450726f706572747956616c7565734f6e6c793d74727565> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -15480,27 +15292,26 @@ Q
 
 endstream
 endobj
-136 0 obj
+135 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 135 0 R
+/Contents 134 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 16 0 R
 /F4.0 49 0 R
 /F5.0 53 0 R
 /F1.0 8 0 R
-/F7.0 131 0 R
-/F6.0 68 0 R
+/F6.0 130 0 R
 /F3.1 45 0 R
 >>
-/XObject << /Stamp1 199 0 R
+/XObject << /Stamp1 198 0 R
 >>
 >>
-/Annots [137 0 R 138 0 R 139 0 R]
+/Annots [136 0 R 137 0 R 138 0 R]
 >>
 endobj
-137 0 obj
+136 0 obj
 << /Border [0 0 0]
 /Dest (_ugvro_simplified-representations_configuration-properties_object-property-values-only)
 /Subtype /Link
@@ -15508,7 +15319,7 @@ endobj
 /Type /Annot
 >>
 endobj
-138 0 obj
+137 0 obj
 << /Border [0 0 0]
 /Dest (_ugvro_simplified-representations_apache-isis-profile)
 /Subtype /Link
@@ -15516,7 +15327,7 @@ endobj
 /Type /Annot
 >>
 endobj
-139 0 obj
+138 0 obj
 << /Border [0 0 0]
 /Dest (_ugvro_simplified-representations_apache-isis-profile)
 /Subtype /Link
@@ -15524,8 +15335,8 @@ endobj
 /Type /Annot
 >>
 endobj
-140 0 obj
-<< /Length 31077
+139 0 obj
+<< /Length 45276
 >>
 stream
 q
@@ -15582,13 +15393,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 768.3249999999999 Td
 /F5.0 11 Tf
-<227469746c6522> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
+
+BT
+86.74000000000001 768.3249999999999 Td
+/F5.0 11 Tf
+<7469746c65> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
+
+BT
+114.24000000000001 768.3249999999999 Td
+/F5.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -15604,46 +15437,1102 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 125.24000000000001 768.3249999999999 Td
 /F5.0 11 Tf
-<3a> Tj
+<3a> 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
+130.74 768.3249999999999 Td
+/F5.0 11 Tf
+<20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+136.24 768.3249999999999 Td
+/F5.0 11 Tf
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+141.74 768.3249999999999 Td
+/F5.0 11 Tf
+<427579206d696c6b2064756520627920323031342d31302d3237> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+284.74 768.3249999999999 Td
+/F5.0 11 Tf
+<22> 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
+290.24 768.3249999999999 Td
+/F5.0 11 Tf
+<2c> 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
+59.24 753.585 Td
+/F5.0 11 Tf
+<ca202020> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
+
+BT
+81.24000000000001 753.585 Td
+/F5.0 11 Tf
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
+
+BT
+86.74000000000001 753.585 Td
+/F5.0 11 Tf
+<646f6d61696e54797065> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
+
+BT
+141.74 753.585 Td
+/F5.0 11 Tf
+<22> 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
+147.24 753.585 Td
+/F5.0 11 Tf
+<20> 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
+152.74 753.585 Td
+/F5.0 11 Tf
+<3a> 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
+158.24 753.585 Td
+/F5.0 11 Tf
+<20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+163.74 753.585 Td
+/F5.0 11 Tf
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+169.24 753.585 Td
+/F5.0 11 Tf
+<544f444f> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+191.24 753.585 Td
+/F5.0 11 Tf
+<22> 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
+196.74 753.585 Td
+/F5.0 11 Tf
+<2c> 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
+59.24 738.845 Td
+/F5.0 11 Tf
+<ca202020> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
+
+BT
+81.24000000000001 738.845 Td
+/F5.0 11 Tf
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
+
+BT
+86.74000000000001 738.845 Td
+/F5.0 11 Tf
+<696e7374616e63654964> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
+
+BT
+141.74 738.845 Td
+/F5.0 11 Tf
+<22> 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
+147.24 738.845 Td
+/F5.0 11 Tf
+<20> 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
+152.74 738.845 Td
+/F5.0 11 Tf
+<3a> 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
+158.24 738.845 Td
+/F5.0 11 Tf
+<20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+163.74 738.845 Td
+/F5.0 11 Tf
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+169.24 738.845 Td
+/F5.0 11 Tf
+<30> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+174.74 738.845 Td
+/F5.0 11 Tf
+<22> 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
+180.24 738.845 Td
+/F5.0 11 Tf
+<2c> 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
+59.24 724.105 Td
+/F5.0 11 Tf
+<ca202020> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
+
+BT
+81.24000000000001 724.105 Td
+/F5.0 11 Tf
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
+
+BT
+86.74000000000001 724.105 Td
+/F5.0 11 Tf
+<6d656d62657273> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
+
+BT
+125.24000000000001 724.105 Td
+/F5.0 11 Tf
+<22> 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
+130.74 724.105 Td
+/F5.0 11 Tf
+<20> 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
+136.24 724.105 Td
+/F5.0 11 Tf
+<3a> 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
+141.74 724.105 Td
+/F5.0 11 Tf
+<20> 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
+147.24 724.105 Td
+/F5.0 11 Tf
+<7b> 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
+59.24 709.365 Td
+/F5.0 11 Tf
+<ca20202020202020> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
+
+BT
+103.24000000000001 709.365 Td
+/F5.0 11 Tf
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
+
+BT
+108.74000000000001 709.365 Td
+/F5.0 11 Tf
+<6465736372697074696f6e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
+
+BT
+169.24 709.365 Td
+/F5.0 11 Tf
+<22> 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
+174.74 709.365 Td
+/F5.0 11 Tf
+<20> 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
+180.24 709.365 Td
+/F5.0 11 Tf
+<3a> 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
+185.74 709.365 Td
+/F5.0 11 Tf
+<20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+191.24 709.365 Td
+/F5.0 11 Tf
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+196.74 709.365 Td
+/F5.0 11 Tf
+<427579206d696c6b> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+240.74 709.365 Td
+/F5.0 11 Tf
+<22> 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
+246.24 709.365 Td
+/F5.0 11 Tf
+<2c> 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
+59.24 694.625 Td
+/F5.0 11 Tf
+<ca20202020202020> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
+
+BT
+103.24000000000001 694.625 Td
+/F5.0 11 Tf
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
+
+BT
+108.74000000000001 694.625 Td
+/F5.0 11 Tf
+<63617465676f7279> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
+
+BT
+152.74 694.625 Td
+/F5.0 11 Tf
+<22> 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
+158.24 694.625 Td
+/F5.0 11 Tf
+<20> 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
+163.74 694.625 Td
+/F5.0 11 Tf
+<3a> 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
+169.24 694.625 Td
+/F5.0 11 Tf
+<20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+174.74 694.625 Td
+/F5.0 11 Tf
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+180.24 694.625 Td
+/F5.0 11 Tf
+<446f6d6573746963> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+224.24 694.625 Td
+/F5.0 11 Tf
+<22> 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
+229.74 694.625 Td
+/F5.0 11 Tf
+<2c> 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
+59.24 679.885 Td
+/F5.0 11 Tf
+<ca20202020202020> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
+
+BT
+103.24000000000001 679.885 Td
+/F5.0 11 Tf
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
+
+BT
+108.74000000000001 679.885 Td
+/F5.0 11 Tf
+<73756263617465676f7279> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
+
+BT
+169.24 679.885 Td
+/F5.0 11 Tf
+<22> 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
+174.74 679.885 Td
+/F5.0 11 Tf
+<20> 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
+180.24 679.885 Td
+/F5.0 11 Tf
+<3a> 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
+185.74 679.885 Td
+/F5.0 11 Tf
+<20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+191.24 679.885 Td
+/F5.0 11 Tf
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+196.74 679.885 Td
+/F5.0 11 Tf
+<53686f7070696e67> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+240.74 679.885 Td
+/F5.0 11 Tf
+<22> 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
+246.24 679.885 Td
+/F5.0 11 Tf
+<2c> 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
+59.24 665.145 Td
+/F5.0 11 Tf
+<ca20202020202020> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
+
+BT
+103.24000000000001 665.145 Td
+/F5.0 11 Tf
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
+
+BT
+108.74000000000001 665.145 Td
+/F5.0 11 Tf
+<636f6d706c657465> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
+
+BT
+152.74 665.145 Td
+/F5.0 11 Tf
+<22> 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
+158.24 665.145 Td
+/F5.0 11 Tf
+<20> 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
+163.74 665.145 Td
+/F5.0 11 Tf
+<3a> 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
+169.24 665.145 Td
+/F5.0 11 Tf
+<20> 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
+174.74 665.145 Td
+/F5.0 11 Tf
+<66616c7365> 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
+202.24 665.145 Td
+/F5.0 11 Tf
+<2c> 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
+59.24 650.405 Td
+/F5.0 11 Tf
+<ca20202020202020> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
+
+BT
+103.24000000000001 650.405 Td
+/F5.0 11 Tf
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
+
+BT
+108.74000000000001 650.405 Td
+/F5.0 11 Tf
+<76657273696f6e53657175656e6365> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
+
+BT
+191.24 650.405 Td
+/F5.0 11 Tf
+<22> 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
+196.74 650.405 Td
+/F5.0 11 Tf
+<20> 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
+202.24 650.405 Td
+/F5.0 11 Tf
+<3a> 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.74 650.405 Td
+/F5.0 11 Tf
+<20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 0.400 0.000 scn
+1.000 0.400 0.000 SCN
+
+BT
+213.24 650.405 Td
+/F5.0 11 Tf
+<31> 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
+218.74 650.405 Td
+/F5.0 11 Tf
+<2c> 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
+59.24 635.665 Td
+/F5.0 11 Tf
+<ca20202020202020> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
+
+BT
+103.24000000000001 635.665 Td
+/F5.0 11 Tf
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
+
+BT
+108.74000000000001 635.665 Td
+/F5.0 11 Tf
+<72656c61746976655072696f72697479> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
+
+BT
+196.74 635.665 Td
+/F5.0 11 Tf
+<22> 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
+202.24 635.665 Td
+/F5.0 11 Tf
+<20> 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.74 635.665 Td
+/F5.0 11 Tf
+<3a> 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.24 635.665 Td
+/F5.0 11 Tf
+<20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 0.400 0.000 scn
+1.000 0.400 0.000 SCN
+
+BT
+218.74 635.665 Td
+/F5.0 11 Tf
+<32> 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
+224.24 635.665 Td
+/F5.0 11 Tf
+<2c> 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
+59.24 620.925 Td
+/F5.0 11 Tf
+<ca20202020202020> 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
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
-130.74 768.3249999999999 Td
+103.24000000000001 620.925 Td
 /F5.0 11 Tf
-<20> Tj
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
-136.24 768.3249999999999 Td
+108.74000000000001 620.925 Td
 /F5.0 11 Tf
-<22427579206d696c6b2064756520627920323031342d31302d323722> Tj
+<6475654279> 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
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
-290.24 768.3249999999999 Td
+136.24 620.925 Td
 /F5.0 11 Tf
-<2c> Tj
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -15652,20 +16541,20 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24 753.585 Td
+141.74 620.925 Td
 /F5.0 11 Tf
-<ca202020> Tj
+<20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-81.24000000000001 753.585 Td
+147.24 620.925 Td
 /F5.0 11 Tf
-<22646f6d61696e5479706522> Tj
+<3a> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -15674,42 +16563,42 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-147.24 753.585 Td
+152.74 620.925 Td
 /F5.0 11 Tf
 <20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-152.74 753.585 Td
+158.24 620.925 Td
 /F5.0 11 Tf
-<3a> Tj
+<22> 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
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-158.24 753.585 Td
+163.74 620.925 Td
 /F5.0 11 Tf
-<20> Tj
+<323031342d31302d3237> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-163.74 753.585 Td
+218.74 620.925 Td
 /F5.0 11 Tf
-<22544f444f22> Tj
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -15718,7 +16607,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-196.74 753.585 Td
+224.24 620.925 Td
 /F5.0 11 Tf
 <2c> Tj
 ET
@@ -15729,42 +16618,42 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24 738.845 Td
+59.24 606.185 Td
 /F5.0 11 Tf
-<ca202020> Tj
+<ca20202020202020> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
-81.24000000000001 738.845 Td
+103.24000000000001 606.185 Td
 /F5.0 11 Tf
-<22696e7374616e6365496422> Tj
+<22> 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
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
-147.24 738.845 Td
+108.74000000000001 606.185 Td
 /F5.0 11 Tf
-<20> Tj
+<636f7374> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
-152.74 738.845 Td
+130.74 606.185 Td
 /F5.0 11 Tf
-<3a> Tj
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -15773,20 +16662,20 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-158.24 738.845 Td
+136.24 606.185 Td
 /F5.0 11 Tf
 <20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-163.74 738.845 Td
+141.74 606.185 Td
 /F5.0 11 Tf
-<223022> Tj
+<3a> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -15795,53 +16684,53 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-180.24 738.845 Td
+147.24 606.185 Td
 /F5.0 11 Tf
-<2c> Tj
+<20> 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
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-59.24 724.105 Td
+152.74 606.185 Td
 /F5.0 11 Tf
-<ca202020> Tj
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-81.24000000000001 724.105 Td
+158.24 606.185 Td
 /F5.0 11 Tf
-<226d656d6265727322> Tj
+<302e3735> 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
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-130.74 724.105 Td
+180.24 606.185 Td
 /F5.0 11 Tf
-<20> Tj
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-136.24 724.105 Td
+185.74 606.185 Td
 /F5.0 11 Tf
-<3a> Tj
+<2c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -15850,42 +16739,42 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-141.74 724.105 Td
+59.24 591.4449999999999 Td
 /F5.0 11 Tf
-<20> Tj
+<ca20202020202020> 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
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
-147.24 724.105 Td
+103.24000000000001 591.4449999999999 Td
 /F5.0 11 Tf
-<7b> Tj
+<22> 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
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
-59.24 709.365 Td
+108.74000000000001 591.4449999999999 Td
 /F5.0 11 Tf
-<ca20202020202020> Tj
+<6e6f746573> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
-103.24000000000001 709.365 Td
+136.24 591.4449999999999 Td
 /F5.0 11 Tf
-<226465736372697074696f6e22> Tj
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -15894,18 +16783,18 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-174.74 709.365 Td
+141.74 591.4449999999999 Td
 /F5.0 11 Tf
 <20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-180.24 709.365 Td
+147.24 591.4449999999999 Td
 /F5.0 11 Tf
 <3a> Tj
 ET
@@ -15916,20 +16805,20 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-185.74 709.365 Td
+152.74 591.4449999999999 Td
 /F5.0 11 Tf
 <20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-191.24 709.365 Td
+158.24 591.4449999999999 Td
 /F5.0 11 Tf
-<22427579206d696c6b22> Tj
+<6e756c6c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -15938,7 +16827,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-246.24 709.365 Td
+180.24 591.4449999999999 Td
 /F5.0 11 Tf
 <2c> Tj
 ET
@@ -15949,42 +16838,42 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24 694.625 Td
+59.24 576.7049999999999 Td
 /F5.0 11 Tf
 <ca20202020202020> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
-103.24000000000001 694.625 Td
+103.24000000000001 576.7049999999999 Td
 /F5.0 11 Tf
-<2263617465676f727922> Tj
+<22> 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
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
-158.24 694.625 Td
+108.74000000000001 576.7049999999999 Td
 /F5.0 11 Tf
-<20> Tj
+<6174746163686d656e74> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
-163.74 694.625 Td
+163.74 576.7049999999999 Td
 /F5.0 11 Tf
-<3a> Tj
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -15993,20 +16882,20 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-169.24 694.625 Td
+169.24 576.7049999999999 Td
 /F5.0 11 Tf
 <20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-174.74 694.625 Td
+174.74 576.7049999999999 Td
 /F5.0 11 Tf
-<22446f6d657374696322> Tj
+<3a> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16015,9 +16904,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-229.74 694.625 Td
+180.24 576.7049999999999 Td
 /F5.0 11 Tf
-<2c> Tj
+<20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16026,20 +16915,20 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24 679.885 Td
+185.74 576.7049999999999 Td
 /F5.0 11 Tf
-<ca20202020202020> Tj
+<6e756c6c> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-103.24000000000001 679.885 Td
+207.74 576.7049999999999 Td
 /F5.0 11 Tf
-<2273756263617465676f727922> Tj
+<2c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16048,42 +16937,42 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-174.74 679.885 Td
+59.24 561.9649999999999 Td
 /F5.0 11 Tf
-<20> Tj
+<ca20202020202020> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
-180.24 679.885 Td
+103.24000000000001 561.9649999999999 Td
 /F5.0 11 Tf
-<3a> Tj
+<22> 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
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
-185.74 679.885 Td
+108.74000000000001 561.9649999999999 Td
 /F5.0 11 Tf
-<20> Tj
+<646f63> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
-191.24 679.885 Td
+125.24000000000001 561.9649999999999 Td
 /F5.0 11 Tf
-<2253686f7070696e6722> Tj
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16092,9 +16981,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-246.24 679.885 Td
+130.74 561.9649999999999 Td
 /F5.0 11 Tf
-<2c> Tj
+<20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16103,20 +16992,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24 665.145 Td
-/F5.0 11 Tf
-<ca20202020202020> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-103.24000000000001 665.145 Td
+136.24 561.9649999999999 Td
 /F5.0 11 Tf
-<22636f6d706c65746522> Tj
+<3a> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16125,20 +17003,20 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-158.24 665.145 Td
+141.74 561.9649999999999 Td
 /F5.0 11 Tf
 <20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-163.74 665.145 Td
+147.24 561.9649999999999 Td
 /F5.0 11 Tf
-<3a> Tj
+<6e756c6c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16147,20 +17025,20 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-169.24 665.145 Td
+59.24 547.2249999999999 Td
 /F5.0 11 Tf
-<20> Tj
+<ca202020> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-174.74 665.145 Td
-/F6.0 11 Tf
-<66616c7365> Tj
+81.24000000000001 547.2249999999999 Td
+/F5.0 11 Tf
+<7d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16169,7 +17047,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-202.24 665.145 Td
+86.74000000000001 547.2249999999999 Td
 /F5.0 11 Tf
 <2c> Tj
 ET
@@ -16180,42 +17058,42 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24 650.405 Td
+59.24 532.4849999999999 Td
 /F5.0 11 Tf
-<ca20202020202020> Tj
+<ca202020> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
-103.24000000000001 650.405 Td
+81.24000000000001 532.4849999999999 Td
 /F5.0 11 Tf
-<2276657273696f6e53657175656e636522> Tj
+<22> 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
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
-196.74 650.405 Td
+86.74000000000001 532.4849999999999 Td
 /F5.0 11 Tf
-<20> Tj
+<6c696e6b73> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
-202.24 650.405 Td
+114.24000000000001 532.4849999999999 Td
 /F5.0 11 Tf
-<3a> Tj
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16224,31 +17102,20 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-207.74 650.405 Td
+119.74000000000001 532.4849999999999 Td
 /F5.0 11 Tf
 <20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.000 0.867 scn
-0.000 0.000 0.867 SCN
-
-BT
-213.24 650.405 Td
-/F6.0 11 Tf
-<31> 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
-218.74 650.405 Td
+125.24000000000001 532.4849999999999 Td
 /F5.0 11 Tf
-<2c> Tj
+<3a> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16257,20 +17124,20 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24 635.665 Td
+130.74 532.4849999999999 Td
 /F5.0 11 Tf
-<ca20202020202020> Tj
+<20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-103.24000000000001 635.665 Td
+136.24 532.4849999999999 Td
 /F5.0 11 Tf
-<2272656c61746976655072696f7269747922> Tj
+<5b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16279,20 +17146,20 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-202.24 635.665 Td
+59.24 517.7449999999999 Td
 /F5.0 11 Tf
-<20> Tj
+<ca20202020202020> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-207.74 635.665 Td
+103.24000000000001 517.7449999999999 Td
 /F5.0 11 Tf
-<3a> Tj
+<7b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16301,53 +17168,42 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-213.24 635.665 Td
+59.24 503.00499999999994 Td
 /F5.0 11 Tf
-<20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.000 0.867 scn
-0.000 0.000 0.867 SCN
-
-BT
-218.74 635.665 Td
-/F6.0 11 Tf
-<32> Tj
+<ca2020202020202020202020> 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
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
-224.24 635.665 Td
+125.24000000000001 503.00499999999994 Td
 /F5.0 11 Tf
-<2c> Tj
+<22> 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
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
-59.24 620.925 Td
+130.74 503.00499999999994 Td
 /F5.0 11 Tf
-<ca20202020202020> Tj
+<72656c> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
-103.24000000000001 620.925 Td
+147.24 503.00499999999994 Td
 /F5.0 11 Tf
-<22647565427922> Tj
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16356,18 +17212,18 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-141.74 620.925 Td
+152.74 503.00499999999994 Td
 /F5.0 11 Tf
 <20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-147.24 620.925 Td
+158.24 503.00499999999994 Td
 /F5.0 11 Tf
 <3a> Tj
 ET
@@ -16378,53 +17234,53 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-152.74 620.925 Td
+163.74 503.00499999999994 Td
 /F5.0 11 Tf
 <20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-158.24 620.925 Td
+169.24 503.00499999999994 Td
 /F5.0 11 Tf
-<22323031342d31302d323722> Tj
+<22> 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
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-224.24 620.925 Td
+174.74 503.00499999999994 Td
 /F5.0 11 Tf
-<2c> Tj
+<73656c66> 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
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-59.24 606.185 Td
+196.74 503.00499999999994 Td
 /F5.0 11 Tf
-<ca20202020202020> Tj
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-103.24000000000001 606.185 Td
+202.24 503.00499999999994 Td
 /F5.0 11 Tf
-<22636f737422> Tj
+<2c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16433,42 +17289,42 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-136.24 606.185 Td
+59.24 488.26499999999993 Td
 /F5.0 11 Tf
-<20> Tj
+<ca2020202020202020202020> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
-141.74 606.185 Td
+125.24000000000001 488.26499999999993 Td
 /F5.0 11 Tf
-<3a> Tj
+<22> 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
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
-147.24 606.185 Td
+130.74 488.26499999999993 Td
 /F5.0 11 Tf
-<20> Tj
+<68726566> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
-152.74 606.185 Td
+152.74 488.26499999999993 Td
 /F5.0 11 Tf
-<22302e373522> Tj
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16477,9 +17333,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-185.74 606.185 Td
+158.24 488.26499999999993 Td
 /F5.0 11 Tf
-<2c> Tj
+<20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16488,20 +17344,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24 591.4449999999999 Td
-/F5.0 11 Tf
-<ca20202020202020> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-103.24000000000001 591.4449999999999 Td
+163.74 488.26499999999993 Td
 /F5.0 11 Tf
-<226e6f74657322> Tj
+<3a> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16510,42 +17355,42 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-141.74 591.4449999999999 Td
+169.24 488.26499999999993 Td
 /F5.0 11 Tf
 <20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-147.24 591.4449999999999 Td
+174.74 488.26499999999993 Td
 /F5.0 11 Tf
-<3a> Tj
+<22> 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
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-152.74 591.4449999999999 Td
+180.24 488.26499999999993 Td
 /F5.0 11 Tf
-<20> Tj
+<687474703a2f2f6c6f63616c686f73743a383038302f7265737466756c2f6f626a656374732f544f444f2f30> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-158.24 591.4449999999999 Td
-/F6.0 11 Tf
-<6e756c6c> Tj
+422.24 488.26499999999993 Td
+/F5.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16554,7 +17399,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-180.24 591.4449999999999 Td
+427.74 488.26499999999993 Td
 /F5.0 11 Tf
 <2c> Tj
 ET
@@ -16565,42 +17410,42 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24 576.7049999999999 Td
+59.24 473.5249999999999 Td
 /F5.0 11 Tf
-<ca20202020202020> Tj
+<ca2020202020202020202020> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
-103.24000000000001 576.7049999999999 Td
+125.24000000000001 473.5249999999999 Td
 /F5.0 11 Tf
-<226174746163686d656e7422> Tj
+<22> 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
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
-169.24 576.7049999999999 Td
+130.74 473.5249999999999 Td
 /F5.0 11 Tf
-<20> Tj
+<6d6574686f64> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
-174.74 576.7049999999999 Td
+163.74 473.5249999999999 Td
 /F5.0 11 Tf
-<3a> Tj
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16609,31 +17454,20 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-180.24 576.7049999999999 Td
+169.24 473.5249999999999 Td
 /F5.0 11 Tf
 <20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
-
-BT
-185.74 576.7049999999999 Td
-/F6.0 11 Tf
-<6e756c6c> 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.74 576.7049999999999 Td
+174.74 473.5249999999999 Td
 /F5.0 11 Tf
-<2c> Tj
+<3a> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16642,42 +17476,42 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24 561.9649999999999 Td
+180.24 473.5249999999999 Td
 /F5.0 11 Tf
-<ca20202020202020> Tj
+<20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-103.24000000000001 561.9649999999999 Td
+185.74 473.5249999999999 Td
 /F5.0 11 Tf
-<22646f6322> Tj
+<22> 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
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-130.74 561.9649999999999 Td
+191.24 473.5249999999999 Td
 /F5.0 11 Tf
-<20> Tj
+<474554> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-136.24 561.9649999999999 Td
+207.74 473.5249999999999 Td
 /F5.0 11 Tf
-<3a> Tj
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16686,20 +17520,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-141.74 561.9649999999999 Td
+213.24 473.5249999999999 Td
 /F5.0 11 Tf
-<20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
-
-BT
-147.24 561.9649999999999 Td
-/F6.0 11 Tf
-<6e756c6c> Tj
+<2c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16708,42 +17531,42 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24 547.2249999999999 Td
+59.24 458.7849999999999 Td
 /F5.0 11 Tf
-<ca202020> Tj
+<ca2020202020202020202020> 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
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
-81.24000000000001 547.2249999999999 Td
+125.24000000000001 458.7849999999999 Td
 /F5.0 11 Tf
-<7d2c> Tj
+<22> 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
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
-59.24 532.4849999999999 Td
+130.74 458.7849999999999 Td
 /F5.0 11 Tf
-<ca202020> Tj
+<74797065> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
-81.24000000000001 532.4849999999999 Td
+152.74 458.7849999999999 Td
 /F5.0 11 Tf
-<226c696e6b7322> Tj
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16752,18 +17575,18 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-119.74000000000001 532.4849999999999 Td
+158.24 458.7849999999999 Td
 /F5.0 11 Tf
 <20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-125.24000000000001 532.4849999999999 Td
+163.74 458.7849999999999 Td
 /F5.0 11 Tf
 <3a> Tj
 ET
@@ -16774,86 +17597,86 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-130.74 532.4849999999999 Td
+169.24 458.7849999999999 Td
 /F5.0 11 Tf
 <20> 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
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-136.24 532.4849999999999 Td
+174.74 458.7849999999999 Td
 /F5.0 11 Tf
-<5b> Tj
+<22> 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
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-59.24 517.7449999999999 Td
+180.24 458.7849999999999 Td
 /F5.0 11 Tf
-<ca20202020202020> Tj
+<6170706c69636174696f6e2f6a736f6e3b70726f66696c653d> 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
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-103.24000000000001 517.7449999999999 Td
+317.74 458.7849999999999 Td
 /F5.0 11 Tf
-<7b> Tj
+<5c22> 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
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-59.24 503.00499999999994 Td
+328.74 458.7849999999999 Td
 /F5.0 11 Tf
-<ca2020202020202020202020> Tj
+<75726e3a6f72672e7265737466756c6f626a656374733a726570722d> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-125.24000000000001 503.00499999999994 Td
+59.24 444.0449999999999 Td
 /F5.0 11 Tf
-<2272656c22> Tj
+<74797065732f6f626a656374> 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
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-152.74 503.00499999999994 Td
+125.24000000000001 444.0449999999999 Td
 /F5.0 11 Tf
-<20> Tj
+<5c22> 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
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-158.24 503.00499999999994 Td
+136.24 444.0449999999999 Td
 /F5.0 11 Tf
-<3a> Tj
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16862,53 +17685,53 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-163.74 503.00499999999994 Td
+141.74 444.0449999999999 Td
 /F5.0 11 Tf
-<20> Tj
+<2c> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-169.24 503.00499999999994 Td
+59.24 429.3049999999999 Td
 /F5.0 11 Tf
-<2273656c6622> Tj
+<ca2020202020202020202020> 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
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
-202.24 503.00499999999994 Td
+125.24000000000001 429.3049999999999 Td
 /F5.0 11 Tf
-<2c> Tj
+<22> 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
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
-59.24 488.26499999999993 Td
+130.74 429.3049999999999 Td
 /F5.0 11 Tf
-<ca2020202020202020202020> Tj
+<7469746c65> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
-125.24000000000001 488.26499999999993 Td
+158.24 429.3049999999999 Td
 /F5.0 11 Tf
-<226872656622> Tj
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16917,7 +17740,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-158.24 488.26499999999993 Td
+163.74 429.3049999999999 Td
 /F5.0 11 Tf
 <20> Tj
 ET
@@ -16928,7 +17751,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-163.74 488.26499999999993 Td
+169.24 429.3049999999999 Td
 /F5.0 11 Tf
 <3a> Tj
 ET
@@ -16939,53 +17762,53 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-169.24 488.26499999999993 Td
+174.74 429.3049999999999 Td
 /F5.0 11 Tf
 <20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-174.74 488.26499999999993 Td
+180.24 429.3049999999999 Td
 /F5.0 11 Tf
-<22687474703a2f2f6c6f63616c686f73743a383038302f7265737466756c2f6f626a656374732f544f444f2f3022> Tj
+<22> 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
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-427.74 488.26499999999993 Td
+185.74 429.3049999999999 Td
 /F5.0 11 Tf
-<2c> Tj
+<427579206d696c6b2064756520627920323031342d31302d3237> 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
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-59.24 473.5249999999999 Td
+328.74 429.3049999999999 Td
 /F5.0 11 Tf
-<ca2020202020202020202020> Tj
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-125.24000000000001 473.5249999999999 Td
+59.24 414.5649999999999 Td
 /F5.0 11 Tf
-<226d6574686f6422> Tj
+<ca20202020202020> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16994,9 +17817,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-169.24 473.5249999999999 Td
+103.24000000000001 414.5649999999999 Td
 /F5.0 11 Tf
-<20> Tj
+<7d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17005,9 +17828,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-174.74 473.5249999999999 Td
+108.74000000000001 414.5649999999999 Td
 /F5.0 11 Tf
-<3a> Tj
+<2c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17016,20 +17839,20 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-180.24 473.5249999999999 Td
+59.24 399.8249999999999 Td
 /F5.0 11 Tf
-<20> Tj
+<ca20202020202020> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-185.74 473.5249999999999 Td
+103.24000000000001 399.8249999999999 Td
 /F5.0 11 Tf
-<2247455422> Tj
+<7b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17038,31 +17861,42 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-213.24 473.5249999999999 Td
+59.24 385.08499999999987 Td
+/F5.0 11 Tf
+<ca2020202020202020202020> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
+
+BT
+125.24000000000001 385.08499999999987 Td
 /F5.0 11 Tf
-<2c> Tj
+<22> 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
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
-59.24 458.7849999999999 Td
+130.74 385.08499999999987 Td
 /F5.0 11 Tf
-<ca2020202020202020202020> Tj
+<72656c> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
-125.24000000000001 458.7849999999999 Td
+147.24 385.08499999999987 Td
 /F5.0 11 Tf
-<227479706522> Tj
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17071,7 +17905,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-158.24 458.7849999999999 Td
+152.74 385.08499999999987 Td
 /F5.0 11 Tf
 <20> Tj
 ET
@@ -17082,7 +17916,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-163.74 458.7849999999999 Td
+158.24 385.08499999999987 Td
 /F5.0 11 Tf
 <3a> Tj
 ET
@@ -17093,42 +17927,42 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-169.24 458.7849999999999 Td
+163.74 385.08499999999987 Td
 /F5.0 11 Tf
 <20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-174.74 458.7849999999999 Td
+169.24 385.08499999999987 Td
 /F5.0 11 Tf
-<226170706c69636174696f6e2f6a736f6e3b70726f66696c653d5c2275726e3a6f72672e7265737466756c6f626a656374733a726570722d> Tj
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-59.24 444.0449999999999 Td
+174.74 385.08499999999987 Td
 /F5.0 11 Tf
-<74797065732f6f626a6563745c2222> Tj
+<6465736372696265646279> 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
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-141.74 444.0449999999999 Td
+235.24 385.08499999999987 Td
 /F5.0 11 Tf
-<2c> Tj
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17137,20 +17971,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24 429.3049999999999 Td
-/F5.0 11 Tf
-<ca2020202020202020202020> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-125.24000000000001 429.3049999999999 Td
+240.74 385.08499999999987 Td
 /F5.0 11 Tf
-<227469746c6522> Tj
+<2c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17159,42 +17982,42 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-163.74 429.3049999999999 Td
+59.24 370.34499999999986 Td
 /F5.0 11 Tf
-<20> Tj
+<ca2020202020202020202020> 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
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
-169.24 429.3049999999999 Td
+125.24000000000001 370.34499999999986 Td
 /F5.0 11 Tf
-<3a> Tj
+<22> 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
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
-174.74 429.3049999999999 Td
+130.74 370.34499999999986 Td
 /F5.0 11 Tf
-<20> Tj
+<68726566> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
-180.24 429.3049999999999 Td
+152.74 370.34499999999986 Td
 /F5.0 11 Tf
-<22427579206d696c6b2064756520627920323031342d31302d323722> Tj
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17203,9 +18026,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24 414.5649999999999 Td
+158.24 370.34499999999986 Td
 /F5.0 11 Tf
-<ca20202020202020> Tj
+<20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17214,9 +18037,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-103.24000000000001 414.5649999999999 Td
+163.74 370.34499999999986 Td
 /F5.0 11 Tf
-<7d2c> Tj
+<3a> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17225,42 +18048,42 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24 399.8249999999999 Td
+169.24 370.34499999999986 Td
 /F5.0 11 Tf
-<ca20202020202020> Tj
+<20> 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
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-103.24000000000001 399.8249999999999 Td
+174.74 370.34499999999986 Td
 /F5.0 11 Tf
-<7b> Tj
+<22> 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
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-59.24 385.08499999999987 Td
+180.24 370.34499999999986 Td
 /F5.0 11 Tf
-<ca2020202020202020202020> Tj
+<687474703a2f2f6c6f63616c686f73743a383038302f7265737466756c2f646f6d61696e2d74797065732f544f444f> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-125.24000000000001 385.08499999999987 Td
+438.74 370.34499999999986 Td
 /F5.0 11 Tf
-<2272656c22> Tj
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17269,9 +18092,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-152.74 385.08499999999987 Td
+444.24 370.34499999999986 Td
 /F5.0 11 Tf
-<20> Tj
+<2c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17280,42 +18103,42 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-158.24 385.08499999999987 Td
+59.24 355.60499999999985 Td
 /F5.0 11 Tf
-<3a> Tj
+<ca2020202020202020202020> 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
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
-163.74 385.08499999999987 Td
+125.24000000000001 355.60499999999985 Td
 /F5.0 11 Tf
-<20> Tj
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
-169.24 385.08499999999987 Td
+130.74 355.60499999999985 Td
 /F5.0 11 Tf
-<22646573637269626564627922> Tj
+<6d6574686f64> 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
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
-240.74 385.08499999999987 Td
+163.74 355.60499999999985 Td
 /F5.0 11 Tf
-<2c> Tj
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17324,20 +18147,20 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24 370.34499999999986 Td
+169.24 355.60499999999985 Td
 /F5.0 11 Tf
-<ca2020202020202020202020> Tj
+<20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-125.24000000000001 370.34499999999986 Td
+174.74 355.60499999999985 Td
 /F5.0 11 Tf
-<226872656622> Tj
+<3a> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17346,42 +18169,42 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-158.24 370.34499999999986 Td
+180.24 355.60499999999985 Td
 /F5.0 11 Tf
 <20> 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
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-163.74 370.34499999999986 Td
+185.74 355.60499999999985 Td
 /F5.0 11 Tf
-<3a> Tj
+<22> 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
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-169.24 370.34499999999986 Td
+191.24 355.60499999999985 Td
 /F5.0 11 Tf
-<20> Tj
+<474554> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-174.74 370.34499999999986 Td
+207.74 355.60499999999985 Td
 /F5.0 11 Tf
-<22687474703a2f2f6c6f63616c686f73743a383038302f7265737466756c2f646f6d61696e2d74797065732f544f444f22> Tj
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17390,7 +18213,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-444.24 370.34499999999986 Td
+213.24 355.60499999999985 Td
 /F5.0 11 Tf
 <2c> Tj
 ET
@@ -17401,42 +18224,42 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24 355.60499999999985 Td
+59.24 340.86499999999984 Td
 /F5.0 11 Tf
 <ca2020202020202020202020> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
-125.24000000000001 355.60499999999985 Td
+125.24000000000001 340.86499999999984 Td
 /F5.0 11 Tf
-<226d6574686f6422> Tj
+<22> 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
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
-169.24 355.60499999999985 Td
+130.74 340.86499999999984 Td
 /F5.0 11 Tf
-<20> Tj
+<74797065> 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
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
-174.74 355.60499999999985 Td
+152.74 340.86499999999984 Td
 /F5.0 11 Tf
-<3a> Tj
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17445,20 +18268,20 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-180.24 355.60499999999985 Td
+158.24 340.86499999999984 Td
 /F5.0 11 Tf
 <20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-185.74 355.60499999999985 Td
+163.74 340.86499999999984 Td
 /F5.0 11 Tf
-<2247455422> Tj
+<3a> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17467,86 +18290,86 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-213.24 355.60499999999985 Td
+169.24 340.86499999999984 Td
 /F5.0 11 Tf
-<2c> Tj
+<20> 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
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-59.24 340.86499999999984 Td
+174.74 340.86499999999984 Td
 /F5.0 11 Tf
-<ca2020202020202020202020> Tj
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-125.24000000000001 340.86499999999984 Td
+180.24 340.86499999999984 Td
 /F5.0 11 Tf
-<227479706522> Tj
+<6170706c69636174696f6e2f6a736f6e3b70726f66696c653d> 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
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-158.24 340.86499999999984 Td
+317.74 340.86499999999984 Td
 /F5.0 11 Tf
-<20> Tj
+<5c22> 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
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-163.74 340.86499999999984 Td
+328.74 340.86499999999984 Td
 /F5.0 11 Tf
-<3a> Tj
+<75726e3a6f72672e7265737466756c6f626a656374733a726570722d> 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
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-169.24 340.86499999999984 Td
+59.24 326.12499999999983 Td
 /F5.0 11 Tf
-<20> Tj
+<74797065732f646f6d61696e2d74797065> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-174.74 340.86499999999984 Td
+152.74 326.12499999999983 Td
 /F5.0 11 Tf
-<226170706c69636174696f6e2f6a736f6e3b70726f66696c653d5c2275726e3a6f72672e7265737466756c6f626a656374733a726570722d> Tj
+<5c22> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-59.24 326.12499999999983 Td
+163.74 326.12499999999983 Td
 /F5.0 11 Tf
-<74797065732f646f6d61696e2d747970655c2222> Tj
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17590,7 +18413,18 @@ ET
 BT
 81.24000000000001 296.6449999999998 Td
 /F5.0 11 Tf
-<5d2c> Tj
+<5d> 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
+86.74000000000001 296.6449999999998 Td
+/F5.0 11 Tf
+<2c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17606,13 +18440,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 281.9049999999998 Td
 /F5.0 11 Tf
-<22657874656e73696f6e7322> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
+
+BT
+86.74000000000001 281.9049999999998 Td
+/F5.0 11 Tf
+<657874656e73696f6e73> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
+
+BT
+141.74 281.9049999999998 Td
+/F5.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17628,8 +18484,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 152.74 281.9049999999998 Td
@@ -17672,13 +18528,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 103.24000000000001 267.16499999999985 Td
 /F5.0 11 Tf
-<226f696422> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
+
+BT
+108.74000000000001 267.16499999999985 Td
+/F5.0 11 Tf
+<6f6964> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
+
+BT
+125.24000000000001 267.16499999999985 Td
+/F5.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17694,8 +18572,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 136.24 267.16499999999985 Td
@@ -17716,13 +18594,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 147.24 267.16499999999985 Td
 /F5.0 11 Tf
-<22544f444f3a3022> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+152.74 267.16499999999985 Td
+/F5.0 11 Tf
+<544f444f3a30> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+185.74 267.16499999999985 Td
+/F5.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17744,7 +18644,18 @@ ET
 BT
 81.24000000000001 252.42499999999984 Td
 /F5.0 11 Tf
-<7d2c> Tj
+<7d> 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
+86.74000000000001 252.42499999999984 Td
+/F5.0 11 Tf
+<2c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17784,23 +18695,22 @@ Q
 
 endstream
 endobj
-141 0 obj
+140 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 140 0 R
+/Contents 139 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F5.0 53 0 R
-/F6.0 68 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 199 0 R
+/XObject << /Stamp1 198 0 R
 >>
 >>
 >>
 endobj
-142 0 obj
-<< /Length 15517
+141 0 obj
+<< /Length 16537
 >>
 stream
 q
@@ -18077,12 +18987,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24 399.1050000000003 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -18099,12 +19009,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 399.1050000000003 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -18121,12 +19031,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 399.1050000000003 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <437573746f6d657253657276696365> Tj
 ET
 
@@ -18165,12 +19075,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 384.3650000000003 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -18186,9 +19096,9 @@ BT
 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
+0.000 0.000 0.000 scn
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 384.3650000000003 Td
@@ -18226,7 +19136,18 @@ ET
 BT
 169.24 384.3650000000003 Td
 /F5.0 11 Tf
-<2829> Tj
+<28> 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
+174.74 384.3650000000003 Td
+/F5.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -18264,12 +19185,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000

<TRUNCATED>

[02/44] isis-site git commit: ISIS-1594: provide an 'edit' button

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/screencasts.html
----------------------------------------------------------------------
diff --git a/content/screencasts.html b/content/screencasts.html
index 16e1731..12f0aa5 100644
--- a/content/screencasts.html
+++ b/content/screencasts.html
@@ -1,12 +1,10 @@
 <!doctype html>
 <html class="no-js" lang="en">
-<head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-
-    <title>Screencasts</title>
-
-    <!--
+ <head> 
+  <meta charset="utf-8"> 
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"> 
+  <title>Screencasts</title> 
+  <!--
         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
@@ -23,31 +21,21 @@
         KIND, either express or implied.  See the License for the
         specific language governing permissions and limitations
         under the License.
-    -->
-
-    <!-- No caching headers -->
-    <meta http-equiv="cache-control" content="no-cache" />
-    <meta http-equiv="pragma" content="no-cache" />
-    <meta http-equiv="expires" content="-1" />
-
-
-    <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
-    <link href="./css/foundation/5.5.1/foundation.css" rel="stylesheet" />
-    <script src="./js/foundation/5.5.1/vendor/modernizr.js"></script>
-    <link href="./css/asciidoctor/colony.css" rel="stylesheet">
-    <link href="./css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-
-
-
-    <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
-    <!--[if lt IE 9]>
+    --> 
+  <!-- No caching headers --> 
+  <meta http-equiv="cache-control" content="no-cache"> 
+  <meta http-equiv="pragma" content="no-cache"> 
+  <meta http-equiv="expires" content="-1"> 
+  <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line --> 
+  <link href="./css/foundation/5.5.1/foundation.css" rel="stylesheet"> 
+  <script src="./js/foundation/5.5.1/vendor/modernizr.js"></script> 
+  <link href="./css/asciidoctor/colony.css" rel="stylesheet"> 
+  <link href="./css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet"> 
+  <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet"> 
+  <!--[if lt IE 9]>
       <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
-    <![endif]-->
-
-
-
-    <style type="text/css">
+    <![endif]--> 
+  <style type="text/css">
         pre code {
             background-color: inherit;
             border-style: none;
@@ -192,9 +180,8 @@ table.CodeRay td.code>pre{padding:0}
         color:#fff;
         font-size: 1.1em;
     }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         @media only screen and (min-width: 40.063em) {
           .top-bar {
             .contain-to-grid .top-bar {
@@ -205,9 +192,8 @@ table.CodeRay td.code>pre{padding:0}
         .row {
             max-width: 80rem;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .extended-quote,
         .extended-quote-first {
             margin-left: 40px;
@@ -231,9 +217,8 @@ table.CodeRay td.code>pre{padding:0}
             text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
         }
         
-    </style>
-
-    <style>
+    </style> 
+  <style>
         body {
           position: relative;
         }
@@ -255,6 +240,7 @@ table.CodeRay td.code>pre{padding:0}
 
         div#doc-content {
             margin-top: 30px;
+            padding-top: 30px;
         }
 
         div.documentation-page table.frame-all {
@@ -286,9 +272,8 @@ table.CodeRay td.code>pre{padding:0}
             min-height: 2000px;
         }
 
-    </style>
-
-    <style>
+    </style> 
+  <style>
 
         @media only screen and (min-width: 768px) {
           #toc.toc2 ul ul { margin-left: -10px; }
@@ -316,15 +301,13 @@ table.CodeRay td.code>pre{padding:0}
         body div#toc2 li.tocify-item.active a {
             color: red;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         footer {
             margin-top: 1000px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* overriding colony.css stylesheet */
         .literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
            /*padding: 1.25em 1.5625em 1.125em 1.5625em;*/
@@ -372,9 +355,8 @@ table.CodeRay td.code>pre{padding:0}
         .imageblock img {
             margin-bottom: 10px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* from http://ben.balter.com/2014/03/13/pages-anchor-links/ */
         .header-link {
           position: absolute;
@@ -395,9 +377,8 @@ table.CodeRay td.code>pre{padding:0}
         h6:hover .header-link {
           opacity: 1;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .top-bar
         {
             -webkit-transition-duration: .5s;
@@ -425,2518 +406,4262 @@ table.CodeRay td.code>pre{padding:0}
             -webkit-transition-property: -webkit-transform;
             transition-property: transform;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         #doc-content a.guide {
             color: white;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
+        .tocify {
+            margin-top: 80px;
+        }
+    </style> 
+  <style>
         .tocify {
             margin-top: 80px;
         }
-    </style>
-
-
-</script>
-
-</head>
-<body>
-
-<<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
-    <div class="github-fork-ribbon">
-        <a href="https://github.com/apache/isis#fork-destination-box">Fork me on GitHub</a>
-    </div>
-</div>
-
-
-<div class="row">
-
-    <div class="fixed contain-to-grid header">
-        <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
-            <ul class="title-area">
-                <li class="name">
-                    <h1>
-                        <a href="/index.html">Apache Isis&trade;</a>
-                    </h1>
-                </li>
-                <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
-                <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
-            </ul>
-
-            <section class="top-bar-section">
-                <ul class="right">
-
-                    <li class="has-form">
-                       <FORM class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
-                        <div class="row collapse">
-                            <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
-                            <INPUT type="hidden" name="cof" value="FORID:0">
-                            <INPUT class="form-control" name="q" type="text" placeholder="Search">
-                        </div>
-                    </FORM>
-                     </li>
-
-                </ul>
-
-                <!-- Left Nav Section -->
-                <ul class="left">
-
-                    <li><a href="/documentation.html">Documentation</a></li>
-                    <li><a href="/downloads.html">Downloads</a></li>
-                    <li><a href="/help.html">Help</a></li>
-                    <li><a href="/asf.html">@ASF</a></li>
-
-                </ul>
-
-            </section>
-        </nav>
-    </div>
-</div>
-
-<div class="row">
-
-    <div id="doc-content-left" class="large-9 medium-9 columns">
-
-
-        <div id="doc-content">
-          <div class="paragraph">
-<p><br/><br/></p>
-</div>
-<div class="paragraph">
-<p>We&#8217;ve prepared a number of screencasts to help you see what Apache Isis has to offer; the following were recorded using Apache Isis v1.12.x.</p>
-</div>
-<div class="paragraph">
-<p>While these each follow on from each other, you should be able to watch them in any order; the typical duration is
-3 minutes.  the number of each screencast (eg '<a href="https://www.youtube.com/watch?v=OTNHR5EdAs8" target="_blank">001</a>') is a link over
-to youtube.</p>
-</div>
-<div class="paragraph">
-<p>Or, if you have a little more time, you can watch the screencasts by playlist.  You can either watch
-<a href="https://www.youtube.com/playlist?list=PLbRpnAmQ6xsA-m4d2iwAuWrX1icJz0SnM">ALL</a> of them one after the other, or you
-can use one of the themed playlists to explore particular aspects of the framework.  The table below indicates which screencasts are in which playlist.</p>
-</div>
-<div class="paragraph">
-<p>There are some screencasts relating to the Apache Isis documentation: <a href="https://www.youtube.com/watch?v=vJYeuVfrctc" target="_blank">using/searching</a> docs, and <a href="https://www.youtube.com/watch?v=RQ_FFYd7npU" target="_blank">contributing patches/editing </a>.</p>
-</div>
-<div class="paragraph">
-<p>Finally, you can also find some screencasts for earlier versions of the framework <a href="./screencasts-older.html">here</a>.</p>
-</div>
-<table class="tableblock frame-all grid-all spread">
-<colgroup>
-<col style="width: 15.3846%;">
-<col style="width: 7.6923%;">
-<col style="width: 7.6923%;">
-<col style="width: 7.6923%;">
-<col style="width: 7.6923%;">
-<col style="width: 7.6923%;">
-<col style="width: 7.6923%;">
-<col style="width: 7.6923%;">
-<col style="width: 7.6923%;">
-<col style="width: 7.6923%;">
-<col style="width: 7.6923%;">
-<col style="width: 7.6924%;">
-</colgroup>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top" colspan="11"><div><div class="paragraph">
-<p><span class="big"><strong>Playlists</strong></span></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top" colspan="12"><div><div class="paragraph">
-<p><span class="big"><strong>Archetype, IDE, layouts</strong></span></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=OTNHR5EdAs8&amp;list=PLbRpnAmQ6xsBGB_mRAUob8WRBsSL_IsBO">Basic</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=pH02g0l2GKY&amp;list=PLbRpnAmQ6xsDjiy7vxKMB35ZKziuF6Aj8">Test</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=xVTjtiJM8XM&amp;list=PLbRpnAmQ6xsAcWmFO5WgK9XWylNR-Fwut">End-<br>
-user</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=KCJ1ZPPB3pA&amp;list=PLbRpnAmQ6xsBFovjRmBTku5tTUYYdoI9u">Layout</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=AXuxULuRtm0&amp;list=PLbRpnAmQ6xsDOfBbGIpIBQsXcR6snkkQ8">Add-<br>
-ons</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=7ToRKBOeemM&amp;list=PLbRpnAmQ6xsB4AopkyXgU3SkHK0bOwXDf">Design</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=3n_70HJ23uY&amp;list=PLbRpnAmQ6xsDwGTagOtuh5RAwVlqwwbPd">DB</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=6GPtec5Hu5Q&amp;list=PLbRpnAmQ6xsADOku9ewo08h-E-_Qf10vg">Dev</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=dfRZeYqzMtI&amp;list=PLbRpnAmQ6xsDKK0dXmJsmKvp9X7iJsfsG">Prog<br>
-mdl</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=lkZxRSS0Zwg&amp;list=PLbRpnAmQ6xsCHI10N1s25mWAHbAz5diHf">Misc</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/playlist?list=PLbRpnAmQ6xsA6NZtY0kW9epG9VclXl6e2">Con-<br>
-trib</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=RQ_FFYd7npU" target="_blank">000</a><br>
-Searching and using the Apache Isis docs</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=OTNHR5EdAs8" target="_blank">001</a><br>
-Generating an app using the <a href="guides/ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp archetype</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=6GPtec5Hu5Q" target="_blank">002</a><br>
-Importing the generated app into an <a href="guides/dg.html#_dg_ide">IDE</a><br></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=xVTjtiJM8XM" target="_blank">003</a><br>
-Walking through the main classes that make up the SimpleApp: <code>SimpleObject</code> persistent entity, <code>HomePageViewModel</code> <a href="guides/ugbtb.html#_ugbtb_view-models">view model</a> and <code>SimpleObjects</code> domain service (repository).</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=KCJ1ZPPB3pA" target="_blank">004</a><br>
-Using the optional <code>Xxx.layout.xml</code> file to provide <a href="guides/ugfun.html#_ugfun_object-layout_dynamic_xml">layout metadata</a> to dynamically render a domain object using the <a href="http://getbootstrap.com">Bootstrap 3</a> grid system.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top" colspan="12"><div><div class="paragraph">
-<p><span class="big"><strong>Fixture scripts, rules, tests</strong></span></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=OTNHR5EdAs8&amp;list=PLbRpnAmQ6xsBGB_mRAUob8WRBsSL_IsBO">Basic</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=pH02g0l2GKY&amp;list=PLbRpnAmQ6xsDjiy7vxKMB35ZKziuF6Aj8">Test</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=xVTjtiJM8XM&amp;list=PLbRpnAmQ6xsAcWmFO5WgK9XWylNR-Fwut">End-<br>
-user</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=KCJ1ZPPB3pA&amp;list=PLbRpnAmQ6xsBFovjRmBTku5tTUYYdoI9u">Layout</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=AXuxULuRtm0&amp;list=PLbRpnAmQ6xsDOfBbGIpIBQsXcR6snkkQ8">Add-<br>
-ons</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=7ToRKBOeemM&amp;list=PLbRpnAmQ6xsB4AopkyXgU3SkHK0bOwXDf">Design</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=3n_70HJ23uY&amp;list=PLbRpnAmQ6xsDwGTagOtuh5RAwVlqwwbPd">DB</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=6GPtec5Hu5Q&amp;list=PLbRpnAmQ6xsADOku9ewo08h-E-_Qf10vg">Dev</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=dfRZeYqzMtI&amp;list=PLbRpnAmQ6xsDKK0dXmJsmKvp9X7iJsfsG">Prog<br>
-mdl</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=lkZxRSS0Zwg&amp;list=PLbRpnAmQ6xsCHI10N1s25mWAHbAz5diHf">Misc</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/playlist?list=PLbRpnAmQ6xsA6NZtY0kW9epG9VclXl6e2">Con-<br>
-trib</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=pH02g0l2GKY" target="_blank">005</a><br>
-Using <a href="guides/ugtst.html#_ugtst_fixture-scripts">fixture scripts</a> to initialize the database, eg while prototyping and for demos</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=dXtmxmYxa30" target="_blank">006</a><br>
-Implementing <a href="guides/ugfun.html#_ugfun_how-tos_business-rules">business rules</a>for domain object members, using supporting methods ("see it, use it, do it")</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=imHfxQGUgV8" target="_blank">007</a><br>
-Writing <a href="guides/ugtst.html#_ugtst_unit-test-support">unit tests</a> for a domain object responsibility</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=-lAt4UWiBjE" target="_blank">008</a><br>
-Writing end-to-end <a href="guides/ugtst.html#_ugtst_integ-test-support">integration tests</a> for a domain object responsibility</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top" colspan="12"><div><div class="paragraph">
-<p><span class="big"><strong>Swagger UI, Maven plugin</strong></span></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=OTNHR5EdAs8&amp;list=PLbRpnAmQ6xsBGB_mRAUob8WRBsSL_IsBO">Basic</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=pH02g0l2GKY&amp;list=PLbRpnAmQ6xsDjiy7vxKMB35ZKziuF6Aj8">Test</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=xVTjtiJM8XM&amp;list=PLbRpnAmQ6xsAcWmFO5WgK9XWylNR-Fwut">End-<br>
-user</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=KCJ1ZPPB3pA&amp;list=PLbRpnAmQ6xsBFovjRmBTku5tTUYYdoI9u">Layout</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=AXuxULuRtm0&amp;list=PLbRpnAmQ6xsDOfBbGIpIBQsXcR6snkkQ8">Add-<br>
-ons</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=7ToRKBOeemM&amp;list=PLbRpnAmQ6xsB4AopkyXgU3SkHK0bOwXDf">Design</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=3n_70HJ23uY&amp;list=PLbRpnAmQ6xsDwGTagOtuh5RAwVlqwwbPd">DB</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=6GPtec5Hu5Q&amp;list=PLbRpnAmQ6xsADOku9ewo08h-E-_Qf10vg">Dev</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=dfRZeYqzMtI&amp;list=PLbRpnAmQ6xsDKK0dXmJsmKvp9X7iJsfsG">Prog<br>
-mdl</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=lkZxRSS0Zwg&amp;list=PLbRpnAmQ6xsCHI10N1s25mWAHbAz5diHf">Misc</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/playlist?list=PLbRpnAmQ6xsA6NZtY0kW9epG9VclXl6e2">Con-<br>
-trib</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=lkZxRSS0Zwg" target="_blank">009</a><br>
-Using the Swagger UI to access the <a href="guides/ugvro.html">REST API</a> automatically exposed for domain services, entities, and/or view models</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=yOh3WphhR1E" target="_blank">010</a><br>
-Using the <a href="#guides/rgmvn.adoc">Apache Isis maven plugin</a> to validate domain object models during the build process (rather than at runtime).</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top" colspan="12"><div><div class="paragraph">
-<p><span class="big"><strong>App Manifest</strong></span></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=1sNiR3Y84c0" target="_blank">011</a><br>
-How the framework uses the <a href="guides/rgcms.html#_rgcms_classes_AppManifest-bootstrapping"><code>AppManifest</code></a> is used to bootstrap the application</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top" colspan="12"><div><div class="paragraph">
-<p><span class="big"><strong>Actions</strong></span></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=OTNHR5EdAs8&amp;list=PLbRpnAmQ6xsBGB_mRAUob8WRBsSL_IsBO">Basic</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=pH02g0l2GKY&amp;list=PLbRpnAmQ6xsDjiy7vxKMB35ZKziuF6Aj8">Test</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=xVTjtiJM8XM&amp;list=PLbRpnAmQ6xsAcWmFO5WgK9XWylNR-Fwut">End-<br>
-user</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=KCJ1ZPPB3pA&amp;list=PLbRpnAmQ6xsBFovjRmBTku5tTUYYdoI9u">Layout</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=AXuxULuRtm0&amp;list=PLbRpnAmQ6xsDOfBbGIpIBQsXcR6snkkQ8">Add-<br>
-ons</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=7ToRKBOeemM&amp;list=PLbRpnAmQ6xsB4AopkyXgU3SkHK0bOwXDf">Design</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=3n_70HJ23uY&amp;list=PLbRpnAmQ6xsDwGTagOtuh5RAwVlqwwbPd">DB</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=6GPtec5Hu5Q&amp;list=PLbRpnAmQ6xsADOku9ewo08h-E-_Qf10vg">Dev</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=dfRZeYqzMtI&amp;list=PLbRpnAmQ6xsDKK0dXmJsmKvp9X7iJsfsG">Prog<br>
-mdl</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=lkZxRSS0Zwg&amp;list=PLbRpnAmQ6xsCHI10N1s25mWAHbAz5diHf">Misc</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/playlist?list=PLbRpnAmQ6xsA6NZtY0kW9epG9VclXl6e2">Con-<br>
-trib</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=dfRZeYqzMtI" target="_blank">012</a><br>
-Implementing business logic using a (no-arg) action, and associating with a property using either the <a href="guides/rgant.html#_rgant-MemberOrder"><code>@MemberOrder</code></a> annotations or using <a href="guides/ugfun.html#_ugfun_object-layout_dynamic_xml">dynamic (XML) layouts</a>.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=0naoVsWppuQ" target="_blank">013</a><br>
-Invoking (no-arg) action on multiple objects at once (using <a href="guides/rgant.html#_rgant-Action_invokeOn"><code>@Action#invokeOn()</code></a>, and using the <a href="guides/rgsvc.html#_rgsvc_api_ActionInvocationContext"><code>ActionInvocationContext</code></a> domain service for a smoother end-user experience.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top" colspan="12"><div><div class="paragraph">
-<p><span class="big"><strong>Titles and icons, UI event subscribers</strong></span></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=OTNHR5EdAs8&amp;list=PLbRpnAmQ6xsBGB_mRAUob8WRBsSL_IsBO">Basic</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=pH02g0l2GKY&amp;list=PLbRpnAmQ6xsDjiy7vxKMB35ZKziuF6Aj8">Test</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=xVTjtiJM8XM&amp;list=PLbRpnAmQ6xsAcWmFO5WgK9XWylNR-Fwut">End-<br>
-user</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=KCJ1ZPPB3pA&amp;list=PLbRpnAmQ6xsBFovjRmBTku5tTUYYdoI9u">Layout</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=AXuxULuRtm0&amp;list=PLbRpnAmQ6xsDOfBbGIpIBQsXcR6snkkQ8">Add-<br>
-ons</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=7ToRKBOeemM&amp;list=PLbRpnAmQ6xsB4AopkyXgU3SkHK0bOwXDf">Design</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=3n_70HJ23uY&amp;list=PLbRpnAmQ6xsDwGTagOtuh5RAwVlqwwbPd">DB</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=6GPtec5Hu5Q&amp;list=PLbRpnAmQ6xsADOku9ewo08h-E-_Qf10vg">Dev</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=dfRZeYqzMtI&amp;list=PLbRpnAmQ6xsDKK0dXmJsmKvp9X7iJsfsG">Prog<br>
-mdl</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=lkZxRSS0Zwg&amp;list=PLbRpnAmQ6xsCHI10N1s25mWAHbAz5diHf">Misc</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/playlist?list=PLbRpnAmQ6xsA6NZtY0kW9epG9VclXl6e2">Con-<br>
-trib</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=CwM430UH5WE" target="_blank">014</a><br>
-Using the <a href="guides/rgcms.html#_rgcms_methods_reserved_title"><code>title()</code></a>, <a href="guides/rgcms.html#_rgcms_methods_reserved_iconName"><code>iconName()</code></a> and <a href="guides/rgcms.html#_rgcms_methods_reserved_cssClass"><code>cssClass()</code></a> so that end-users can distinguish domain objects within the UI.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=7ToRKBOeemM" target="_blank">015</a><br>
-Moving the responsibility to specify the icon for a domain object out and into a subscriber, using the <a href="guides/rgcms.html#_rgcms_classes_uievent_IconUiEvent"><code>IconUiEvent</code></a> as per the <a href="guides/rgant.html#_rgant-DomainObjectLayout_iconUiEvent"><code>@DomainObjectLayout#iconUiEvent()</code></a> annotation</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top" colspan="12"><div><div class="paragraph">
-<p><span class="big"><strong>Derived collections</strong></span></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=ckT8Lt20SE4" target="_blank">016</a><br>
-How to implement a derived collection on a domain object.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top" colspan="12"><div><div class="paragraph">
-<p><span class="big"><strong>More on fixture scripts</strong></span></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=l_oZymgb65I" target="_blank">017</a><br>
-Extending a <a href="guides/ugtst.html#_ugtst_fixture-scripts">fixture script</a> to more easily demonstrate new functionality.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top" colspan="12"><div><div class="paragraph">
-<p><span class="big"><strong>Page size of collections</strong></span></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=39Hpd7C4Kvo" target="_blank">018</a><br>
-Using <a href="guides/ugfun.html#_ugfun_object-layout_dynamic_xml">dynamic (XML) layouts</a> to specify the page size for a domain object&#8217;s collection.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top" colspan="12"><div><div class="paragraph">
-<p><span class="big"><strong>Hints and end-user features</strong></span></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=OTNHR5EdAs8&amp;list=PLbRpnAmQ6xsBGB_mRAUob8WRBsSL_IsBO">Basic</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=pH02g0l2GKY&amp;list=PLbRpnAmQ6xsDjiy7vxKMB35ZKziuF6Aj8">Test</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=xVTjtiJM8XM&amp;list=PLbRpnAmQ6xsAcWmFO5WgK9XWylNR-Fwut">End-<br>
-user</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=KCJ1ZPPB3pA&amp;list=PLbRpnAmQ6xsBFovjRmBTku5tTUYYdoI9u">Layout</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=AXuxULuRtm0&amp;list=PLbRpnAmQ6xsDOfBbGIpIBQsXcR6snkkQ8">Add-<br>
-ons</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=7ToRKBOeemM&amp;list=PLbRpnAmQ6xsB4AopkyXgU3SkHK0bOwXDf">Design</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=3n_70HJ23uY&amp;list=PLbRpnAmQ6xsDwGTagOtuh5RAwVlqwwbPd">DB</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=6GPtec5Hu5Q&amp;list=PLbRpnAmQ6xsADOku9ewo08h-E-_Qf10vg">Dev</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=dfRZeYqzMtI&amp;list=PLbRpnAmQ6xsDKK0dXmJsmKvp9X7iJsfsG">Prog<br>
-mdl</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=lkZxRSS0Zwg&amp;list=PLbRpnAmQ6xsCHI10N1s25mWAHbAz5diHf">Misc</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/playlist?list=PLbRpnAmQ6xsA6NZtY0kW9epG9VclXl6e2">Con-<br>
-trib</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=0d713-V4vrg" target="_blank">019</a><br>
-Demonstrates how Apache Isis' <a href="#guides/ugvw.adoc">Wicket viewer</a> remembers the state of rendered domain objects, and how the end-user of the
- application can clear these UI hints using the (framework-provided) <a href="guides/rgcms.html#_rgcms_classes_mixins_Object_clearHints">"clear hints"</a> action.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=Kqch-XNlBMA" target="_blank">020</a><br>
-Demonstrates how the end-user can copy and share URLs for domain objects - including UI hints - using Apache Isis' <a href="#guides/ugvw.adoc">Wicket viewer</a>.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=a0QQLT_16To" target="_blank">021</a><br>
-Demonstrates how the end-user can use bookmarks and breadcrumbs within Apache Isis' <a href="#guides/ugvw.adoc">Wicket viewer</a>, and how the developer can ensure that <a href="guides/rgant.html#_rgant-DomainObjectLayout_bookmarking">domain objects</a> and (<a href="guides/rgant.html#_rgant-Action_semantics">query-only</a>) <a href="guides/rgant.html#_rgant-ActionLayout_bookmarking">actions</a> can be bookmarked.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top" colspan="12"><div><div class="paragraph">
-<p><span class="big"><strong>Decoupling (mixins &amp; subscribers)</strong></span></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=OTNHR5EdAs8&amp;list=PLbRpnAmQ6xsBGB_mRAUob8WRBsSL_IsBO">Basic</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=pH02g0l2GKY&amp;list=PLbRpnAmQ6xsDjiy7vxKMB35ZKziuF6Aj8">Test</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=xVTjtiJM8XM&amp;list=PLbRpnAmQ6xsAcWmFO5WgK9XWylNR-Fwut">End-<br>
-user</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=KCJ1ZPPB3pA&amp;list=PLbRpnAmQ6xsBFovjRmBTku5tTUYYdoI9u">Layout</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=AXuxULuRtm0&amp;list=PLbRpnAmQ6xsDOfBbGIpIBQsXcR6snkkQ8">Add-<br>
-ons</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=7ToRKBOeemM&amp;list=PLbRpnAmQ6xsB4AopkyXgU3SkHK0bOwXDf">Design</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=3n_70HJ23uY&amp;list=PLbRpnAmQ6xsDwGTagOtuh5RAwVlqwwbPd">DB</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=6GPtec5Hu5Q&amp;list=PLbRpnAmQ6xsADOku9ewo08h-E-_Qf10vg">Dev</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=dfRZeYqzMtI&amp;list=PLbRpnAmQ6xsDKK0dXmJsmKvp9X7iJsfsG">Prog<br>
-mdl</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=lkZxRSS0Zwg&amp;list=PLbRpnAmQ6xsCHI10N1s25mWAHbAz5diHf">Misc</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/playlist?list=PLbRpnAmQ6xsA6NZtY0kW9epG9VclXl6e2">Con-<br>
-trib</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=Wn5215K7_Jg" target="_blank">022</a><br>
-Shows how to refactor a domain object to move an action implementation out of the domain object itself, and instead implement as a <a href="guides/ugbtb.html#_ugbtb_decoupling_mixins">mixin</a> (useful for decoupling).</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=m633OEBpWqQ" target="_blank">023</a><br>
-Shows how to refactor a domain object to move (derived) collections out of the domain object and reimplement as a <a href="guides/ugbtb.html#_ugbtb_decoupling_mixins">mixin</a>.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=-AQJb9GtIqI" target="_blank">024</a><br>
-Using a domain event <a href="guides/rgcms.html#_rgcms_classes_super_AbstractSubscriber">subscriber</a> to <a href="guides/ugbtb.html#_ugbtb_decoupling_event-bus">decouple</a> and abstract business rules ( <a href="guides/rgcms.html#_rgcms_methods_prefixes_validate">validation</a>).</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=6GjLW0hlrm4" target="_blank">025</a><br>
-Using a domain event <a href="guides/rgcms.html#_rgcms_classes_super_AbstractSubscriber">subscriber</a> to hide functionality, in this
-  case the <a href="guides/rgcms.html#_rgcms_classes_mixins_Object_clearHints">"clear hints"</a> action automatically provided by the framework.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top" colspan="12"><div><div class="paragraph">
-<p><span class="big"><strong>Titles using the @Title annotation</strong></span></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=qj4bMkQRBUY" target="_blank">026</a><br>
-Using the <a href="guides/rgant.html#_rgant-Title"><code>@Title</code></a> annotation (instead of the <a href="guides/rgcms.html#_rgcms_methods_reserved_title"><code>title()</code></a> reserved method) to obtain the title of a domain object, so that the end-user can distinguish one object from another.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top" colspan="12"><div><div class="paragraph">
-<p><span class="big"><strong>Integration testing of mixins</strong></span></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=yi52Gbd3lmY" target="_blank">027</a><br>
-How to write an <a href="guides/ugtst.html#_ugtst_integ-test-support">integration test</a> for an <a href="guides/rgant.html#_rgant-Mixin">mixin</a>.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top" colspan="12"><div><div class="paragraph">
-<p><span class="big"><strong>Removing boilerplate</strong></span></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=OTNHR5EdAs8&amp;list=PLbRpnAmQ6xsBGB_mRAUob8WRBsSL_IsBO">Basic</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=pH02g0l2GKY&amp;list=PLbRpnAmQ6xsDjiy7vxKMB35ZKziuF6Aj8">Test</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=xVTjtiJM8XM&amp;list=PLbRpnAmQ6xsAcWmFO5WgK9XWylNR-Fwut">End-<br>
-user</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=KCJ1ZPPB3pA&amp;list=PLbRpnAmQ6xsBFovjRmBTku5tTUYYdoI9u">Layout</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=AXuxULuRtm0&amp;list=PLbRpnAmQ6xsDOfBbGIpIBQsXcR6snkkQ8">Add-<br>
-ons</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=7ToRKBOeemM&amp;list=PLbRpnAmQ6xsB4AopkyXgU3SkHK0bOwXDf">Design</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=3n_70HJ23uY&amp;list=PLbRpnAmQ6xsDwGTagOtuh5RAwVlqwwbPd">DB</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=6GPtec5Hu5Q&amp;list=PLbRpnAmQ6xsADOku9ewo08h-E-_Qf10vg">Dev</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=dfRZeYqzMtI&amp;list=PLbRpnAmQ6xsDKK0dXmJsmKvp9X7iJsfsG">Prog<br>
-mdl</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=lkZxRSS0Zwg&amp;list=PLbRpnAmQ6xsCHI10N1s25mWAHbAz5diHf">Misc</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/playlist?list=PLbRpnAmQ6xsA6NZtY0kW9epG9VclXl6e2">Con-<br>
-trib</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=SLJPBruFMKY" target="_blank">028</a><br>
-Using <a href="https://projectlombok.org/">Project Lombok</a> to remove boilerplate from your domain objects (getters and setters).</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=AXuxULuRtm0" target="_blank">029</a><br>
-Using the (non-ASF) <a href="http://github.com/isisaddons/isis-metamodel-paraname8">Isis addons' paraname8</a> module to remove boilerplate from your domain object (<a href="guides/rgant.html#_rgant-ParameterLayout_named"><code>@ParameterLayout#named()</code></a> annotation attribute on action parameters).</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top" colspan="12"><div><div class="paragraph">
-<p><span class="big"><strong>Action validation</strong></span></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=OTNHR5EdAs8&amp;list=PLbRpnAmQ6xsBGB_mRAUob8WRBsSL_IsBO">Basic</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=pH02g0l2GKY&amp;list=PLbRpnAmQ6xsDjiy7vxKMB35ZKziuF6Aj8">Test</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=xVTjtiJM8XM&amp;list=PLbRpnAmQ6xsAcWmFO5WgK9XWylNR-Fwut">End-<br>
-user</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=KCJ1ZPPB3pA&amp;list=PLbRpnAmQ6xsBFovjRmBTku5tTUYYdoI9u">Layout</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=AXuxULuRtm0&amp;list=PLbRpnAmQ6xsDOfBbGIpIBQsXcR6snkkQ8">Add-<br>
-ons</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=7ToRKBOeemM&amp;list=PLbRpnAmQ6xsB4AopkyXgU3SkHK0bOwXDf">Design</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=3n_70HJ23uY&amp;list=PLbRpnAmQ6xsDwGTagOtuh5RAwVlqwwbPd">DB</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=6GPtec5Hu5Q&amp;list=PLbRpnAmQ6xsADOku9ewo08h-E-_Qf10vg">Dev</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=dfRZeYqzMtI&amp;list=PLbRpnAmQ6xsDKK0dXmJsmKvp9X7iJsfsG">Prog<br>
-mdl</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=lkZxRSS0Zwg&amp;list=PLbRpnAmQ6xsCHI10N1s25mWAHbAz5diHf">Misc</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/playlist?list=PLbRpnAmQ6xsA6NZtY0kW9epG9VclXl6e2">Con-<br>
-trib</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=ORoEYlg6XFM" target="_blank">030</a><br>
-How to validate action parameters using a supporting <a href="guides/rgcms.html#_rgcms_methods_prefixes_validate"><code>validateNXxx()</code></a> method.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=1Vlzob89pYI" target="_blank">031</a><br>
-How to validate action parameters using the <a href="guides/rgant.html#_rgant-Parameter_mustSatisfy"><code>@Parameter#mustSatisfy()</code></a>  and the Specification interface.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top" colspan="12"><div><div class="paragraph">
-<p><span class="big"><strong>Instantiating/Initializing Objects</strong></span></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=fYJjXAepWAs" target="_blank">032</a><br>
-How to instantiate/initialize objects using <a href="guides/rgsvc.html#_rgsvc_api_RepositoryService"><code>RepositoryService</code></a>, <a href="guides/rgsvc.html#_rgsvc_api_ServiceRegistry"><code>ServiceRegistry</code></a> and/or <a href="guides/rgsvc.html#_rgsvc_api_FactoryService"><code>FactoryService</code></a>.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top" colspan="12"><div><div class="paragraph">
-<p><span class="big"><strong>Property and parameter choices</strong></span></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=OTNHR5EdAs8&amp;list=PLbRpnAmQ6xsBGB_mRAUob8WRBsSL_IsBO">Basic</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=pH02g0l2GKY&amp;list=PLbRpnAmQ6xsDjiy7vxKMB35ZKziuF6Aj8">Test</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=xVTjtiJM8XM&amp;list=PLbRpnAmQ6xsAcWmFO5WgK9XWylNR-Fwut">End-<br>
-user</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=KCJ1ZPPB3pA&amp;list=PLbRpnAmQ6xsBFovjRmBTku5tTUYYdoI9u">Layout</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=AXuxULuRtm0&amp;list=PLbRpnAmQ6xsDOfBbGIpIBQsXcR6snkkQ8">Add-<br>
-ons</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=7ToRKBOeemM&amp;list=PLbRpnAmQ6xsB4AopkyXgU3SkHK0bOwXDf">Design</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=3n_70HJ23uY&amp;list=PLbRpnAmQ6xsDwGTagOtuh5RAwVlqwwbPd">DB</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=6GPtec5Hu5Q&amp;list=PLbRpnAmQ6xsADOku9ewo08h-E-_Qf10vg">Dev</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=dfRZeYqzMtI&amp;list=PLbRpnAmQ6xsDKK0dXmJsmKvp9X7iJsfsG">Prog<br>
-mdl</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=lkZxRSS0Zwg&amp;list=PLbRpnAmQ6xsCHI10N1s25mWAHbAz5diHf">Misc</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/playlist?list=PLbRpnAmQ6xsA6NZtY0kW9epG9VclXl6e2">Con-<br>
-trib</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=cQ06PoMNDPw" target="_blank">033</a><br>
-How to provide a set of <a href="guides/rgcms.html#_rgcms_methods_prefixes_choices">choices</a> (a drop-down list) when editing a property.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=afEnYKljBQs" target="_blank">034</a><br>
-How to provide a set of <a href="guides/rgcms.html#_rgcms_methods_prefixes_choices">choices</a> (a drop-down list) when invoking an action.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=fKo6aTPK-gk" target="_blank">035</a><br>
-How to use the <a href="guides/rgcms.html#_rgcms_methods_prefixes_choices">choices</a> supporting methods as a source for default values within a <a href="guides/ugtst.html#_ugtst_fixture-scripts">fixture script</a>.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=ZWOzmwCJVzA" target="_blank">036</a><br>
-How to use an enum for choices (drop down list) for both a property or an action parameter.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top" colspan="12"><div><div class="paragraph">
-<p><span class="big"><strong>Hiding columns</strong></span></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=OTNHR5EdAs8&amp;list=PLbRpnAmQ6xsBGB_mRAUob8WRBsSL_IsBO">Basic</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=pH02g0l2GKY&amp;list=PLbRpnAmQ6xsDjiy7vxKMB35ZKziuF6Aj8">Test</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=xVTjtiJM8XM&amp;list=PLbRpnAmQ6xsAcWmFO5WgK9XWylNR-Fwut">End-<br>
-user</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=KCJ1ZPPB3pA&amp;list=PLbRpnAmQ6xsBFovjRmBTku5tTUYYdoI9u">Layout</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=AXuxULuRtm0&amp;list=PLbRpnAmQ6xsDOfBbGIpIBQsXcR6snkkQ8">Add-<br>
-ons</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=7ToRKBOeemM&amp;list=PLbRpnAmQ6xsB4AopkyXgU3SkHK0bOwXDf">Design</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=3n_70HJ23uY&amp;list=PLbRpnAmQ6xsDwGTagOtuh5RAwVlqwwbPd">DB</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=6GPtec5Hu5Q&amp;list=PLbRpnAmQ6xsADOku9ewo08h-E-_Qf10vg">Dev</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=dfRZeYqzMtI&amp;list=PLbRpnAmQ6xsDKK0dXmJsmKvp9X7iJsfsG">Prog<br>
-mdl</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=lkZxRSS0Zwg&amp;list=PLbRpnAmQ6xsCHI10N1s25mWAHbAz5diHf">Misc</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/playlist?list=PLbRpnAmQ6xsA6NZtY0kW9epG9VclXl6e2">Con-<br>
-trib</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=1SCyBlMM2Bo" target="_blank">037</a><br>
-How to hide properties as columns in tables (parented collections or standalone collections), using the dynamic XML layout (equivalent to <a href="guides/rgant.html#_rgant-PropertyLayout_hidden"><code>@PropertyLayout#hidden()</code></a>).</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=H11yby1Xkbc" target="_blank">038</a><br>
-How to hide properties as columns in tables, using CSS.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top" colspan="12"><div><div class="paragraph">
-<p><span class="big"><strong>Fixture scripts defaults / fake data</strong></span></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=OTNHR5EdAs8&amp;list=PLbRpnAmQ6xsBGB_mRAUob8WRBsSL_IsBO">Basic</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=pH02g0l2GKY&amp;list=PLbRpnAmQ6xsDjiy7vxKMB35ZKziuF6Aj8">Test</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=xVTjtiJM8XM&amp;list=PLbRpnAmQ6xsAcWmFO5WgK9XWylNR-Fwut">End-<br>
-user</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=KCJ1ZPPB3pA&amp;list=PLbRpnAmQ6xsBFovjRmBTku5tTUYYdoI9u">Layout</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=AXuxULuRtm0&amp;list=PLbRpnAmQ6xsDOfBbGIpIBQsXcR6snkkQ8">Add-<br>
-ons</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=7ToRKBOeemM&amp;list=PLbRpnAmQ6xsB4AopkyXgU3SkHK0bOwXDf">Design</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=3n_70HJ23uY&amp;list=PLbRpnAmQ6xsDwGTagOtuh5RAwVlqwwbPd">DB</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=6GPtec5Hu5Q&amp;list=PLbRpnAmQ6xsADOku9ewo08h-E-_Qf10vg">Dev</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=dfRZeYqzMtI&amp;list=PLbRpnAmQ6xsDKK0dXmJsmKvp9X7iJsfsG">Prog<br>
-mdl</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=lkZxRSS0Zwg&amp;list=PLbRpnAmQ6xsCHI10N1s25mWAHbAz5diHf">Misc</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/playlist?list=PLbRpnAmQ6xsA6NZtY0kW9epG9VclXl6e2">Con-<br>
-trib</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=NKaR7ZedI8E" target="_blank">039</a><br>
-Using the <a href="guides/rgcms.html#_rgcms_classes_super_FixtureScript"><code>FixtureScript</code></a> <code>defaultParam(&#8230;&#8203;)</code> method to reflectively default parameters to fixture scripts that have not been set by the caller.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://www.youtube.com/watch?v=-jMiD9n1L5U" target="_blank">040</a><br>
-Using the (non-ASF) <a href="http://github.com/isisaddons/isis-module-fakedata">Isis addons' fakedata</a> module&#8217;s <code>FakeDataService</code> to provide fake (random) names within a fixture script.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>x</p>
-</div></div></td>
-<td class="tableblock halign-left

<TRUNCATED>

[27/44] isis-site git commit: ISIS-1594: provide an 'edit' button

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/guides/rgsvc.html
----------------------------------------------------------------------
diff --git a/content/guides/rgsvc.html b/content/guides/rgsvc.html
index b4ba83e..5ab2ef1 100644
--- a/content/guides/rgsvc.html
+++ b/content/guides/rgsvc.html
@@ -1,12 +1,10 @@
 <!doctype html>
 <html class="no-js" lang="en">
-<head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-
-    <title>Domain Services</title>
-
-    <!--
+ <head> 
+  <meta charset="utf-8"> 
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"> 
+  <title>Domain Services</title> 
+  <!--
         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
@@ -23,31 +21,21 @@
         KIND, either express or implied.  See the License for the
         specific language governing permissions and limitations
         under the License.
-    -->
-
-    <!-- No caching headers -->
-    <meta http-equiv="cache-control" content="no-cache" />
-    <meta http-equiv="pragma" content="no-cache" />
-    <meta http-equiv="expires" content="-1" />
-
-
-    <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
-    <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet" />
-    <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script>
-    <link href="../css/asciidoctor/colony.css" rel="stylesheet">
-    <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-
-
-
-    <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
-    <!--[if lt IE 9]>
+    --> 
+  <!-- No caching headers --> 
+  <meta http-equiv="cache-control" content="no-cache"> 
+  <meta http-equiv="pragma" content="no-cache"> 
+  <meta http-equiv="expires" content="-1"> 
+  <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line --> 
+  <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet"> 
+  <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script> 
+  <link href="../css/asciidoctor/colony.css" rel="stylesheet"> 
+  <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet"> 
+  <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet"> 
+  <!--[if lt IE 9]>
       <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
-    <![endif]-->
-
-
-
-    <style type="text/css">
+    <![endif]--> 
+  <style type="text/css">
         pre code {
             background-color: inherit;
             border-style: none;
@@ -192,9 +180,8 @@ table.CodeRay td.code>pre{padding:0}
         color:#fff;
         font-size: 1.1em;
     }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         @media only screen and (min-width: 40.063em) {
           .top-bar {
             .contain-to-grid .top-bar {
@@ -205,9 +192,8 @@ table.CodeRay td.code>pre{padding:0}
         .row {
             max-width: 80rem;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .extended-quote,
         .extended-quote-first {
             margin-left: 40px;
@@ -231,9 +217,8 @@ table.CodeRay td.code>pre{padding:0}
             text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
         }
         
-    </style>
-
-    <style>
+    </style> 
+  <style>
         body {
           position: relative;
         }
@@ -255,6 +240,7 @@ table.CodeRay td.code>pre{padding:0}
 
         div#doc-content {
             margin-top: 30px;
+            padding-top: 30px;
         }
 
         div.documentation-page table.frame-all {
@@ -286,9 +272,8 @@ table.CodeRay td.code>pre{padding:0}
             min-height: 2000px;
         }
 
-    </style>
-
-    <style>
+    </style> 
+  <style>
 
         @media only screen and (min-width: 768px) {
           #toc.toc2 ul ul { margin-left: -10px; }
@@ -316,15 +301,13 @@ table.CodeRay td.code>pre{padding:0}
         body div#toc2 li.tocify-item.active a {
             color: red;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         footer {
             margin-top: 1000px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* overriding colony.css stylesheet */
         .literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
            /*padding: 1.25em 1.5625em 1.125em 1.5625em;*/
@@ -372,9 +355,8 @@ table.CodeRay td.code>pre{padding:0}
         .imageblock img {
             margin-bottom: 10px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* from http://ben.balter.com/2014/03/13/pages-anchor-links/ */
         .header-link {
           position: absolute;
@@ -395,9 +377,8 @@ table.CodeRay td.code>pre{padding:0}
         h6:hover .header-link {
           opacity: 1;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .top-bar
         {
             -webkit-transition-duration: .5s;
@@ -425,224 +406,153 @@ table.CodeRay td.code>pre{padding:0}
             -webkit-transition-property: -webkit-transform;
             transition-property: transform;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         #doc-content a.guide {
             color: white;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
+        .tocify {
+            margin-top: 80px;
+        }
+    </style> 
+  <style>
         .tocify {
             margin-top: 80px;
         }
-    </style>
-
-
-</script>
-
-</head>
-<body>
-
-<<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
-    <div class="github-fork-ribbon">
-        <a href="https://github.com/apache/isis#fork-destination-box">Fork me on GitHub</a>
-    </div>
-</div>
-
-
-<div class="row">
-
-    <div class="fixed contain-to-grid header">
-        <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
-            <ul class="title-area">
-                <li class="name">
-                    <h1>
-                        <a href="/index.html">Apache Isis&trade;</a>
-                    </h1>
-                </li>
-                <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
-                <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
-            </ul>
-
-            <section class="top-bar-section">
-                <ul class="right">
-
-                    <li class="has-form">
-                       <FORM class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
-                        <div class="row collapse">
-                            <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
-                            <INPUT type="hidden" name="cof" value="FORID:0">
-                            <INPUT class="form-control" name="q" type="text" placeholder="Search">
-                        </div>
-                    </FORM>
-                     </li>
-
-                </ul>
-
-                <!-- Left Nav Section -->
-                <ul class="left">
-
-                    <li><a href="/documentation.html">Documentation</a></li>
-                    <li><a href="/downloads.html">Downloads</a></li>
-                    <li><a href="/help.html">Help</a></li>
-                    <li><a href="/asf.html">@ASF</a></li>
-
-                </ul>
-
-            </section>
-        </nav>
-    </div>
-</div>
-
-<div class="row">
-
-    <div id="doc-content-left" class="large-9 medium-9 columns">
-
-
-        <div id="doc-content">
-          <div class="sect1">
-<h2 id="_rgsvc">1. Domain Services</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>This guide documents Apache Isis' domain services, both those that act as an API (implemented by the framework for
-your domain objects to call), and those domain services that act as an SPI (implemented by your domain application and
-which are called by the framework).</p>
-</div>
-<div class="sect2">
-<h3 id="_other_guides">1.1. Other Guides</h3>
-<div class="paragraph">
-<p>Apache Isis documentation is broken out into a number of user, reference and "supporting procedures" guides.</p>
-</div>
-<div class="paragraph">
-<p>The user guides available are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="ugfun.html">Fundamentals</a></p>
-</li>
-<li>
-<p><a href="ugvw.html">Wicket viewer</a></p>
-</li>
-<li>
-<p><a href="ugvro.html">Restful Objects viewer</a></p>
-</li>
-<li>
-<p><a href="ugdno.html">DataNucleus object store</a></p>
-</li>
-<li>
-<p><a href="ugsec.html">Security</a></p>
-</li>
-<li>
-<p><a href="ugtst.html">Testing</a></p>
-</li>
-<li>
-<p><a href="ugbtb.html">Beyond the Basics</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The reference guides are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="rgant.html">Annotations</a></p>
-</li>
-<li>
-<p><a href="#">Domain Services</a> (this guide)</p>
-</li>
-<li>
-<p><a href="rgcfg.html">Configuration Properties</a></p>
-</li>
-<li>
-<p><a href="rgcms.html">Classes, Methods and Schema</a></p>
-</li>
-<li>
-<p><a href="rgmvn.html">Apache Isis Maven plugin</a></p>
-</li>
-<li>
-<p><a href="rgfis.html">Framework Internal Services</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The remaining guides are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="dg.html">Developers' Guide</a> (how to set up a development environment
-for Apache Isis and contribute back to the project)</p>
-</li>
-<li>
-<p><a href="cgcom.html">Committers' Guide</a> (release procedures and related practices)</p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_rgsvc_intro">2. Introduction</h2>
-<div class="sectionbody">
-<div class="sect2">
-<h3 id="_rgsvc_intro_types-of-domain-services">2.1. Types of Domain Service</h3>
-<div class="paragraph">
-<p>The domain services also group into various broad categories.  Many support functionality of the various layers of the
-system (presentation layer, application layer, core domain, persistence layer); others exist to allow the domain objects
-to integrate with other bounded contexts, or provide various metadata (eg for development-time tooling).  The diagram
-below shows these categories:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/reference-services/categories.png"><img src="images/reference-services/categories.png" alt="categories" width="600px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>A small number of domain services can be considered both API and SPI; a good example is the <a href="#_rgsvc_api_EmailService"><code>EmailService</code></a> that is of direct use for domain objects wishing to send out emails,
-but is also used by the framework to support the <a href="ugvw.html#_ugvw_features_user-registration">user registration</a>
-functionality supported by the <a href="ugvw.html">Wicket viewer</a>.   The same is true of the <a href="#_rgsvc_api_EventBusService"><code>EventBusService</code></a>; this can be used by domain objects to broadcast arbitrary events,
-but is also used by the framework to automatically emit events for
-<a href="rgant.html#_rgant-Action_domainEvent"><code>@Action#domainEvent()</code></a> etc.</p>
-</div>
-<div class="paragraph">
-<p>For these hybrid services we have categorized the service as an "API" service.  This chapter therefore contains only
-the strictly SPI services.</p>
-</div>
-<div class="paragraph">
-<p>This rest of this guide is broken out into several chapters, one for each of the various types/categories of domain
-service.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_rgsvc_intro_public-api">2.2. Public API vs Internal Services</h3>
-<div class="paragraph">
-<p>The vast majority of Apache Isis' domain services are defined in Apache Isis' applib (<code>o.a.i.core:isis-core-applib</code>
-module) as stable, public classes.  Importantly, this also minimizes the coupling between your code and Apache Isis,
-allowing you to easily mock out these services in your unit tests.</p>
-</div>
-<div class="paragraph">
-<p>The framework also defines a number of "internal" services.  These are not part of the framework&#8217;s formal API, in that
-they use classes that are outside of the applib.  These internal framework services should be thought of as part of the
-internal design of the framework, and are liable to change from release to release.  The internal framework services
-are documented in the <a href="rgfis.html">Framework Internal Services</a> guide.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_rgsvc_intro_using-the-services">2.3. Using the services</h3>
-<div class="paragraph">
-<p>Apache Isis includes an extensive number of domain services for your domain objects to use; simply define the service
-as an annotated field and Apache Isis will inject the service into your object.</p>
-</div>
-<div class="paragraph">
-<p>For example:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">Customer</span> {
+    </style>  
+ </head> 
+ <body> 
+  <div class="row"> 
+   <div class="fixed contain-to-grid header"> 
+    <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem"> 
+     <ul class="title-area"> 
+      <li class="name"> <h1> <a href="/index.html">Apache Isis\u2122</a> </h1> </li> 
+      <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone --> 
+      <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li> 
+     </ul> 
+     <section class="top-bar-section"> 
+      <ul class="right"> 
+       <li class="has-form"> 
+        <form class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse"> 
+         <div class="row collapse"> 
+          <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya"> 
+          <input type="hidden" name="cof" value="FORID:0"> 
+          <input class="form-control" name="q" type="text" placeholder="Search"> 
+         </div> 
+        </form> </li> 
+      </ul> 
+      <!-- Left Nav Section --> 
+      <ul class="left"> 
+       <li><a href="/documentation.html">Documentation</a></li> 
+       <li><a href="/downloads.html">Downloads</a></li> 
+       <li><a href="/help.html">Help</a></li> 
+       <li><a href="/asf.html">@ASF</a></li> 
+      </ul> 
+     </section> 
+    </nav> 
+   </div> 
+  </div> 
+  <div class="row"> 
+   <div id="doc-content-left" class="large-9 medium-9 columns"> 
+    <div id="doc-content">
+     <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/rgsvc.adoc&quot;" style="float: right; font-size: small; padding: 6px;  "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+     <div class="sect1"> 
+      <h2 id="_rgsvc">1. Domain Services</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_rgsvc.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>This guide documents Apache Isis' domain services, both those that act as an API (implemented by the framework for your domain objects to call), and those domain services that act as an SPI (implemented by your domain application and which are called by the framework).</p> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_other_guides">1.1. Other Guides</h3> 
+        <div class="paragraph"> 
+         <p>Apache Isis documentation is broken out into a number of user, reference and "supporting procedures" guides.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The user guides available are:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><a href="ugfun.html">Fundamentals</a></p> </li> 
+          <li> <p><a href="ugvw.html">Wicket viewer</a></p> </li> 
+          <li> <p><a href="ugvro.html">Restful Objects viewer</a></p> </li> 
+          <li> <p><a href="ugdno.html">DataNucleus object store</a></p> </li> 
+          <li> <p><a href="ugsec.html">Security</a></p> </li> 
+          <li> <p><a href="ugtst.html">Testing</a></p> </li> 
+          <li> <p><a href="ugbtb.html">Beyond the Basics</a></p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The reference guides are:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><a href="rgant.html">Annotations</a></p> </li> 
+          <li> <p><a href="#">Domain Services</a> (this guide)</p> </li> 
+          <li> <p><a href="rgcfg.html">Configuration Properties</a></p> </li> 
+          <li> <p><a href="rgcms.html">Classes, Methods and Schema</a></p> </li> 
+          <li> <p><a href="rgmvn.html">Apache Isis Maven plugin</a></p> </li> 
+          <li> <p><a href="rgfis.html">Framework Internal Services</a></p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The remaining guides are:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><a href="dg.html">Developers' Guide</a> (how to set up a development environment for Apache Isis and contribute back to the project)</p> </li> 
+          <li> <p><a href="cgcom.html">Committers' Guide</a> (release procedures and related practices)</p> </li> 
+         </ul> 
+        </div> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_rgsvc_intro">2. Introduction</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_rgsvc_intro.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="sect2"> 
+        <h3 id="_rgsvc_intro_types-of-domain-services">2.1. Types of Domain Service</h3> 
+        <div class="paragraph"> 
+         <p>The domain services also group into various broad categories. Many support functionality of the various layers of the system (presentation layer, application layer, core domain, persistence layer); others exist to allow the domain objects to integrate with other bounded contexts, or provide various metadata (eg for development-time tooling). The diagram below shows these categories:</p> 
+        </div> 
+        <div class="imageblock"> 
+         <div class="content"> 
+          <a class="image" href="images/reference-services/categories.png"><img src="images/reference-services/categories.png" alt="categories" width="600px"></a> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>A small number of domain services can be considered both API and SPI; a good example is the <a href="#_rgsvc_api_EmailService"><code>EmailService</code></a> that is of direct use for domain objects wishing to send out emails, but is also used by the framework to support the <a href="ugvw.html#_ugvw_features_user-registration">user registration</a> functionality supported by the <a href="ugvw.html">Wicket viewer</a>. The same is true of the <a href="#_rgsvc_api_EventBusService"><code>EventBusService</code></a>; this can be used by domain objects to broadcast arbitrary events, but is also used by the framework to automatically emit events for <a href="rgant.html#_rgant-Action_domainEvent"><code>@Action#domainEvent()</code></a> etc.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>For these hybrid services we have categorized the service as an "API" service. This chapter therefore contains only the strictly SPI services.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>This rest of this guide is broken out into several chapters, one for each of the various types/categories of domain service.</p> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_rgsvc_intro_public-api">2.2. Public API vs Internal Services</h3> 
+        <div class="paragraph"> 
+         <p>The vast majority of Apache Isis' domain services are defined in Apache Isis' applib (<code>o.a.i.core:isis-core-applib</code> module) as stable, public classes. Importantly, this also minimizes the coupling between your code and Apache Isis, allowing you to easily mock out these services in your unit tests.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The framework also defines a number of "internal" services. These are not part of the framework\u2019s formal API, in that they use classes that are outside of the applib. These internal framework services should be thought of as part of the internal design of the framework, and are liable to change from release to release. The internal framework services are documented in the <a href="rgfis.html">Framework Internal Services</a> guide.</p> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_rgsvc_intro_using-the-services">2.3. Using the services</h3> 
+        <div class="paragraph"> 
+         <p>Apache Isis includes an extensive number of domain services for your domain objects to use; simply define the service as an annotated field and Apache Isis will inject the service into your object.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>For example:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">Customer</span> {
 
     <span class="directive">public</span> <span class="type">void</span> sendEmail( <span class="predefined-type">String</span> subject, <span class="predefined-type">String</span> body) {
         <span class="predefined-type">List</span>&lt;<span class="predefined-type">String</span>&gt; cc = <span class="predefined-type">Collections</span>.emptyList;
@@ -655,98 +565,87 @@ as an annotated field and Apache Isis will inject the service into your object.<
 
     <span class="annotation">@Inject</span>                                                            <i class="conum" data-value="1"></i><b>(1)</b>
     EmailService emailService;
-}</code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td>Service automatically injected by the framework.</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>For objects that are already persisted, the service is automatically injected just after the object is rehydrated by
-JDO/DataNucleus.</p>
-</div>
-<div class="paragraph">
-<p>For transient objects (instantiated programmatically), the <a href="#_rgsvc_api_FactoryService"><code>FactoryService</code></a>'s
-<code>instantiate()</code> method (or the deprecated <a href="#_rgsvc_api_DomainObjectContainer"><code>DomainObjectContainer</code></a>'s
-<code>newTransientInstance()</code> method) will automatically inject the services.</p>
-</div>
-<div class="paragraph">
-<p>Alternatively the object can be instantiated simply using <code>new</code>, then services injected using
-<a href="#_rgsvc_api_ServiceRegistry"><code>ServiceRegistry</code></a>'s <code>injectServicesInto(&#8230;&#8203;)</code> method (or the deprecated
-<a href="#_rgsvc_api_DomainObjectContainer"><code>DomainObjectContainer</code></a>'s <code>injectServicesInto(&#8230;&#8203;)</code> method).</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_rgsvc_intro_overriding-the-services">2.4. Overriding the services</h3>
-<div class="paragraph">
-<p>The framework provides default implementations for many of the domain services.  This is convenient, but sometimes you
-will want to replace the default implementation with your own service implementation.</p>
-</div>
-<div class="paragraph">
-<p>The trick is to use the <a href="rgant.html#_rgant-DomainServiceLayout_menuOrder"><code>@DomainServiceLayout#menuOrder()</code></a>
-attribute, specifying a low number (typically <code>"1"</code>).</p>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>For a small number of domain services, all implementations are used (following the chain-of-responsibility pattern),
-not just the first one.  The services in question are:
-<a href="#_rgsvc_spi_ContentMappingService"><code>ContentMappingService</code></a>,
-<a href="#_rgsvc_spi_GridSystemService"><code>GridSystemService</code></a>, and
-<a href="#_rgsvc_spi_RoutingService"><code>RoutingService</code></a>.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>For example, suppose you wanted to provide your own implementation of
-<a href="#_rgsvc_api_LocaleProvider"><code>LocaleProvider</code></a>.  Here&#8217;s how:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@DomainService</span>(
+}</code></pre> 
+         </div> 
+        </div> 
+        <div class="colist arabic"> 
+         <table> 
+          <tbody>
+           <tr> 
+            <td><i class="conum" data-value="1"></i><b>1</b></td> 
+            <td>Service automatically injected by the framework.</td> 
+           </tr> 
+          </tbody>
+         </table> 
+        </div> 
+        <div class="paragraph"> 
+         <p>For objects that are already persisted, the service is automatically injected just after the object is rehydrated by JDO/DataNucleus.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>For transient objects (instantiated programmatically), the <a href="#_rgsvc_api_FactoryService"><code>FactoryService</code></a>'s <code>instantiate()</code> method (or the deprecated <a href="#_rgsvc_api_DomainObjectContainer"><code>DomainObjectContainer</code></a>'s <code>newTransientInstance()</code> method) will automatically inject the services.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Alternatively the object can be instantiated simply using <code>new</code>, then services injected using <a href="#_rgsvc_api_ServiceRegistry"><code>ServiceRegistry</code></a>'s <code>injectServicesInto(\u2026\u200b)</code> method (or the deprecated <a href="#_rgsvc_api_DomainObjectContainer"><code>DomainObjectContainer</code></a>'s <code>injectServicesInto(\u2026\u200b)</code> method).</p> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_rgsvc_intro_overriding-the-services">2.4. Overriding the services</h3> 
+        <div class="paragraph"> 
+         <p>The framework provides default implementations for many of the domain services. This is convenient, but sometimes you will want to replace the default implementation with your own service implementation.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The trick is to use the <a href="rgant.html#_rgant-DomainServiceLayout_menuOrder"><code>@DomainServiceLayout#menuOrder()</code></a> attribute, specifying a low number (typically <code>"1"</code>).</p> 
+        </div> 
+        <div class="admonitionblock note"> 
+         <table> 
+          <tbody>
+           <tr> 
+            <td class="icon"> <i class="fa icon-note" title="Note"></i> </td> 
+            <td class="content"> 
+             <div class="paragraph"> 
+              <p>For a small number of domain services, all implementations are used (following the chain-of-responsibility pattern), not just the first one. The services in question are: <a href="#_rgsvc_spi_ContentMappingService"><code>ContentMappingService</code></a>, <a href="#_rgsvc_spi_GridSystemService"><code>GridSystemService</code></a>, and <a href="#_rgsvc_spi_RoutingService"><code>RoutingService</code></a>.</p> 
+             </div> </td> 
+           </tr> 
+          </tbody>
+         </table> 
+        </div> 
+        <div class="paragraph"> 
+         <p>For example, suppose you wanted to provide your own implementation of <a href="#_rgsvc_api_LocaleProvider"><code>LocaleProvider</code></a>. Here\u2019s how:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@DomainService</span>(
         nature = NatureOfService.DOMAIN
 )
 <span class="annotation">@DomainServiceLayout</span>(
-        menuOrder = <span class="string"><span class="delimiter">&quot;</span><span class="content">1</span><span class="delimiter">&quot;</span></span>                             <i class="conum" data-value="1"></i><b>(1)</b>
+        menuOrder = <span class="string"><span class="delimiter">"</span><span class="content">1</span><span class="delimiter">"</span></span>                             <i class="conum" data-value="1"></i><b>(1)</b>
 )
 <span class="directive">public</span> <span class="type">class</span> <span class="class">MyLocaleProvider</span> <span class="directive">implements</span> LocaleProvider {
     <span class="annotation">@Override</span>
     <span class="directive">public</span> <span class="predefined-type">Locale</span> getLocale() {
         <span class="keyword">return</span> ...
     }
-}</code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td>takes precedence over the default implementation.</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>It&#8217;s also quite common to want to decorate the existing implementation (ie have your own implementation delegate to the
-default); this is also possible and quite easy (if using <code>1.10.0</code> or later).  The idea is to have the framework
-inject all implementations of the service, and then to delegate to the first one that isn&#8217;t "this" one:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@DomainService</span>(nature=NatureOfService.DOMAIN)
+}</code></pre> 
+         </div> 
+        </div> 
+        <div class="colist arabic"> 
+         <table> 
+          <tbody>
+           <tr> 
+            <td><i class="conum" data-value="1"></i><b>1</b></td> 
+            <td>takes precedence over the default implementation.</td> 
+           </tr> 
+          </tbody>
+         </table> 
+        </div> 
+        <div class="paragraph"> 
+         <p>It\u2019s also quite common to want to decorate the existing implementation (ie have your own implementation delegate to the default); this is also possible and quite easy (if using <code>1.10.0</code> or later). The idea is to have the framework inject all implementations of the service, and then to delegate to the first one that isn\u2019t "this" one:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@DomainService</span>(nature=NatureOfService.DOMAIN)
 <span class="annotation">@DomainServiceLayout</span>(
-        menuOrder = <span class="string"><span class="delimiter">&quot;</span><span class="content">1</span><span class="delimiter">&quot;</span></span>                                                                 <i class="conum" data-value="1"></i><b>(1)</b>
+        menuOrder = <span class="string"><span class="delimiter">"</span><span class="content">1</span><span class="delimiter">"</span></span>                                                                 <i class="conum" data-value="1"></i><b>(1)</b>
 )
 <span class="directive">public</span> <span class="type">class</span> <span class="class">MyLocaleProvider</span> <span class="directive">implements</span> LocaleProvider {
     <span class="annotation">@Override</span>
@@ -758,484 +657,390 @@ inject all implementations of the service, and then to delegate to the first one
     }
     <span class="annotation">@Inject</span>
     <span class="predefined-type">List</span>&lt;LocaleProvider&gt; localeProviders;                                               <i class="conum" data-value="4"></i><b>(4)</b>
-}</code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td>takes precedence over the default implementation when injected elsewhere.</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="2"></i><b>2</b></td>
-<td>this implementation merely delegates to the default implementation</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="3"></i><b>3</b></td>
-<td>find the first implementation that isn&#8217;t <em>this</em> implementation (else infinite loop!)</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="4"></i><b>4</b></td>
-<td>injects all implementations, including this implemenation</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>The above code could be improved by caching the delegateLocaleProvider once located (rather than searching each time).</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_rgsvc_intro_commands-and-events">2.5. Command and Events</h3>
-<div class="paragraph">
-<p>A good number of the domain services manage the execution of action invocations/property edits, along with the state
-of domain objects that are modified as a result of these.  These services capture information which can then be used
-for various purposes, most notably for auditing or for publishing events, or for deferring execution such that the
-execution be performed in the background at some later date.</p>
-</div>
-<div class="paragraph">
-<p>The diagram below shows how these services fit together.  The outline boxes are services while the coloured boxes
-represent data structures - defined in the applib and therefore accessible to domain applications - which hold various
-information about the executions.</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/reference-services/commands-and-events.png"><img src="images/reference-services/commands-and-events.png" alt="commands and events" width="960px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>To explain:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>the (request-scoped) <a href="#_rgsvc_api_CommandContext"><code>CommandContext</code></a> captures the user&#8217;s intention to
-invoke an action or edit a property; this is held by the <code>Command</code> object.</p>
-</li>
-<li>
-<p>if a <a href="#_rgsvc_spi_CommandService"><code>CommandService</code></a> has been configured, then this will be used to
-create the <code>Command</code> object implementation, generally so that it can then also be persisted.<br></p>
-<div class="paragraph">
-<p>If the action or property is annotated to be invoked in the background (using
-<a href="rgant.html#_rgant-Action_command"><code>@Action#command&#8230;&#8203;()</code></a> or
-<a href="rgant.html#_rgant-Property_command"><code>@Property#command&#8230;&#8203;()</code></a>) then no further work is done. But,
-if the action/property is to be executed in the foreground, then the interaction continues.</p>
-</div>
-</li>
-<li>
-<p>the (request-scoped) <a href="#_rgsvc_api_InteractionContext"><code>InteractionContext</code></a> domain service acts as a
-factory for the <code>Interaction</code> object, which keeps track of the call-graph of executions (<code>Interaction.Execution</code>)
-of either action invocations or property edits.  In the majority of cases there is likely to be just a single top-level
-node of this graph, but for applications that use the <a href="#_rgsvc_api_WrapperFactory"><code>WrapperFactory</code></a>
-extensively each successive call results in a new child execution.</p>
-</li>
-<li>
-<p>before and after each action invocation/property edit, a <a href="rgcms.html#_rgcms_classes_domainevent">domain event</a> is
-may be broadcast to all subscribers.  Whether this occurs depends on whether the action/property has been annotated
-(using <a href="rgant.html#_rgant-Action_domainEvent"><code>@Action#domainEvent()</code></a> or
-<a href="rgant.html#_rgant-Property_domainEvent"><code>@Property#domainEvent()</code></a>).<br></p>
-<div class="paragraph">
-<p>(Note that susbcribers will also receive events for vetoing the action/property; this is not shown on the diagram).</p>
-</div>
-</li>
-<li>
-<p>As each execution progresses, and objects that are modified are "enlisted" into the (internal)
-<a href="rgfis.html#_rgfis_spi_ChangedObjectsServiceInternal"><code>ChangedObjectsServiceInternal</code></a> domain service.  Metrics as
-to which objects are merely loaded into memory are also captured using the
-<a href="#_rgsvc_api_MetricsService"><code>MetricsService</code></a> (not shown on the diagram).</p>
-</li>
-<li>
-<p>At the end of each execution, details of that execution are published through the (internal)
-<a href="rgfis.html#_rgfis_spi_PublisherServiceInternal"><code>PublisherServiceInternal</code></a> domain service.  This is only done for
-actions/properties annotated appropriate (with <a href="rgant.html#_rgant-Action_publishing"><code>@Action#publishing()</code></a> or
-<a href="rgant.html#_rgant-Property_publishing"><code>@Property#publishing()</code></a>). <br></p>
-<div class="paragraph">
-<p>The internal service delegates in turn to any registered
-<a href="#_rgsvc_spi_PublishingService"><code>PublishingService</code></a> (deprecated) and also to any
-registered <a href="#_rgsvc_spi_PublisherService"><code>PublisherService</code></a>s (there may be more than one).</p>
-</div>
-</li>
-<li>
-<p>At the end of each transaction, details of all changed objects are published, again through the (internal)
-<a href="rgfis.html#_rgfis_spi_PublisherServiceInternal"><code>PublisherServiceInternal</code></a> to any registered <code>PublishingService</code>
-or <code>PublisherService</code> implementations.  Only domain objects specified to be published with
-<a href="rgant.html#_rgant-DomainObject_publishing"><code>@DomainObject#publishing()</code></a> are published.<br></p>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>Note that it&#8217;s possible for there to be more than one transaction per top-level interaction, by virtue of the
-<a href="#_rgsvc_api_TransactionService"><code>TransactionService</code></a>.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-</li>
-<li>
-<p>Also at the end of each transaction, details of all changed properties are passed to any registered
-<a href="#_rgsvc_spi_AuditerService"><code>AuditerService</code></a> or
-<a href="#_rgsvc_spi_AuditingService"><code>AuditingService</code></a> (the latter deprecated) by way of the (internal)
-<a href="rgfis.html#_rgfis_spi_AuditingServiceInternal"><code>AuditingServiceInternal</code></a> domain service.</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>Implementations of <a href="#_rgsvc_spi_CommandService"><code>CommandService</code></a> can use the <code>Command#getMemento()</code>
-method to obtain a XML equivalent of that <code>Command</code>, reified using the <a href="rgcms.html#_rgcms_schema-cmd"><code>cmd.xsd</code></a>
-schema. This can be converted back into a <code>CommandDto</code> using the <code>CommandDtoUtils</code> utility class (part of the applib).</p>
-</div>
-<div class="paragraph">
-<p>Similarly, implementations of <a href="#_rgsvc_spi_PublisherService"><code>PublisherService</code></a> can use the
-<code>InteractionDtoUtils</code> utility class to obtain a <code>InteractionDto</code> representing the interaction, either just for a single
-execution or for the entire call-graph.  This can be converted into XML in a similar fashion.</p>
-</div>
-<div class="paragraph">
-<p>Likewise, the <code>PublishedObjects</code> class passed to the <code>PublisherService</code> at the end of the interaction provides the
-<code>PublishedObjects#getDto()</code> method which returns a <code>ChangesDto</code> instance.  This can be converted into XML using the
-<code>ChangesDtoUtils</code> utility class.</p>
-</div>
-<div class="paragraph">
-<p>One final point: multiple <a href="#_rgsvc_spi_PublisherService"><code>PublisherService</code></a> implementations are supported
-because different implementations may have different responsibilities.  For example, the (non-ASF)
-<a href="http://github.com/isisaddons/isis-module-publishmq">Isis addons' publishmq</a> module is responsible for publishing
-messages onto an ActiveMQ event bus, for inter-system communication.  However, the SPI can also be used for profiling;
-each execution within the call-graph contains metrics of the number of objects loaded or modified as a result of that
-execution, and thus could be used for application profiling.  The framework provides a default
-<code>PublisherServiceLogging</code> implementation that logs this using SLF4J.</p>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_rgsvc_presentation-layer-spi">3. Presentation Layer SPI</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Domain service SPIs for the presentation layer influence how the Apache Isis viewers behave.</p>
-</div>
-<div class="paragraph">
-<p>The table below summarizes the presentation layer SPIs defined by Apache Isis.  It also lists their corresponding implementation, either a default implementation provided by Apache Isis itself, or provided by one of the in (non-ASF) <a href="http://www.isisaddons.org">Isis Addons</a> modules.</p>
-</div>
-<table class="tableblock frame-all grid-all spread">
-<caption class="title">Table 1. Presentation Layer SPI</caption>
-<colgroup>
-<col style="width: 25%;">
-<col style="width: 50%;">
-<col style="width: 12.5%;">
-<col style="width: 12.5%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">SPI</th>
-<th class="tableblock halign-left valign-top">Description</th>
-<th class="tableblock halign-left valign-top">Implementation</th>
-<th class="tableblock halign-left valign-top">Notes</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_ContentMappingService"><code>o.a.i.applb.</code><br>
-<code>services.conmap</code><br>
-<code>ContentMappingService</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>(Attempt to) map the returned data into the representation required by the client&#8217;s HTTP <code>Accept</code> header.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Replaces (and simplifies) the earlier <code>ContentMappingService</code> that defined an SPI using classes internal to the
-framework.<br>
-+
-No default implementation.</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_EmailNotificationService"><code>o.a.i.applib.</code><br>
-<code>services.userreg</code><br>
-<code>EmailNotificationService</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Notify a user during <a href="#_rgsvc_spi_UserRegistrationService">self-registration</a> of users.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>EmailNotificationService-</code><br>
-<code>Default</code><br>
-<code>o.a.i.core</code><br>
-<code>isis-core-runtime</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">depends on:<br>
-a configured <code>EmailService</code></p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_ErrorReportingService"><code>o.a.i.applib.</code><br>
-<code>services.error</code><br>
-<code>ErrorReportingService</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Record details of an error occurring in the system (eg in an external incident recording system such as JIRA), and return a more friendly (jargon-free) message to display to the end user, with optional reference (eg <code>XXX-1234</code>).</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">(none)</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_ExceptionRecognizer"><code>o.a.i.applib.</code><br>
-<code>services.exceprecog</code><br>
-<code>ExceptionRecognizer2</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Convert certain exceptions (eg foreign or unique key violation in the database) into a format that can be rendered to the end-user.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>ExceptionRecognizer-</code><br>
-<code>CompositeFor-</code><br>
-<code>JdoObjectStore</code><br>
-<code>o.a.i.core</code><br>
-<code>isis-core-applib</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Extensible using composite pattern if required</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_GridSystemService"><code>o.a.i.applib.</code><br>
-<code>services.grid</code><br>
-<code>GridSystemService</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Validates and normalizes the grid layout for a domain class (with respect to a particular grid
-system such as Bootstrap3), also providing a default grid (for those domain classes where there is no grid layout).</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>GridSystemServiceBS3</code><br>
-<code>o.a.i.core</code><br>
-<code>isis-core-metamodel</code></p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_GridLoaderService"><code>o.a.i.applib.</code><br>
-<code>services.grid</code><br>
-<code>GridLoaderService</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Responsible for loading a grid layout for a domain class, eg from a <code>layout.xml</code> file.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>GridLoaderServiceDefault</code><br>
-<code>o.a.i.core</code><br>
-<code>isis-core-metamodel</code></p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_GridService"><code>o.a.i.applib.</code><br>
-<code>services.grid</code><br>
-<code>GridService</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>A facade on top of both <a href="#_rgsvc_spi_GridLoaderService"><code>GridLoaderService</code></a> and
-<a href="#_rgsvc_spi_GridSystemService"><code>GridSystemService</code></a>, thus being able to return normalized
-grids for any domain class.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>GridServiceDefault</code><br>
-<code>o.a.i.core</code><br>
-<code>isis-core-metamodel</code></p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_HintStore"><code>o.a.i.applib.</code><br>
-<code>services.hint</code><br>
-<code>HintStore</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Stores UI hints on a per-object basis. For example, the viewer remembers which tabs are selected, and for collections which view is selected (eg table or hidden), which page of a table to render, or whether "show all" (rows) is toggled.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>HintStoreUsingWicketSession</code><br>
-<code>o.a.i.viewer</code><br>
-<code>isis-viewer-wicket-impl</code></p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_LocaleProvider"><code>o.a.i.applib.</code><br>
-<code>services.i18n</code><br>
-<code>LocaleProvider</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Request-scoped service to return the locale of the current user, in support of i18n (ie so that the app&#8217;s UI, messages and exceptions can be translated to the required locale by the <a href="#_rgsvc_spi_TranslationService"><code>TranslationService</code></a>.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>LocaleProviderWicket</code><br>
-<code>o.a.i.viewer</code><br>
-<code>isis-viewer-wicket-impl</code></p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_RoutingService"><code>o.a.i.applib.</code><br>
-<code>services.routing</code><br>
-<code>RoutingService</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Return an alternative object than that returned by an action.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>RoutingServiceDefault</code><br>
-<code>o.a.i.core</code><br>
-<code>isis-core-applib</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">The default implementation will return the home page (per <a href="#_rgsvc_api_HomePageProviderService"><code>HomePageProviderService</code></a>) if a void or null is returned.<br>
-Used by the <a href="ugvw.html">Wicket viewer</a> only.</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_TableColumnOrderService"><code>o.a.i.applib.</code><br>
-<code>services.tablecol</code><br>
-<code>TableColumn-</code><br>
-<code>OrderService</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Allows the columns of a parented or standalone table to be reordered, based upon the parent object, collection id and type of object in the collection..</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>TableColumn-</code><br>
-<code>OrderService.Default</code><br>
-<code>o.a.i.core</code><br>
-<code>isis-core-applib</code></p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_TranslationService"><code>o.a.i.applib.</code><br>
-<code>services.i18n</code><br>
-<code>TranslationService</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Translate an app&#8217;s UI, messages and exceptions for the current user (as per the locale provided by <a href="#_rgsvc_spi_LocaleProvider"><code>LocalProvider</code></a>.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>TranslationServicePo</code><br>
-<code>o.a.i.core</code><br>
-<code>isis-core-runtime</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">related services: <code>TranslationServicePoMenu</code><br>
-depends on:<br>
-<code>TranslationsResolver</code>, <code>LocaleProvider</code></p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_TranslationsResolver"><code>o.a.i.applib.</code><br>
-<code>services.i18n</code><br>
-<code>TranslationsResolver</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Obtain translations for a particuar phrase and locale, in support of i18n (ie so that the app&#8217;s UI, messages and exceptions can be translated to the required locale by the <a href="#_rgsvc_spi_TranslationService"><code>TranslationService</code></a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>TranslationsResolverWicket</code><br>
-<code>o.a.i.viewer</code><br>
-<code>isis-viewer-wicket-impl</code></p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_UrlEncodingService"><code>o.a.i.applib.</code><br>
-<code>services.urlencoding</code><br>
-<code>UrlEncodingService</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Converts strings into a form safe for use within a URL.  Used to convert view models mementos into usable URL form.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>UrlEncodingService</code><br>
-<code>UsingBaseEncoding</code><br>
-<code>o.a.i.applib</code><br>
-<code>isis-core-applib</code></p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_UserProfileService"><code>o.a.i.applib.</code><br>
-<code>services.userprof</code><br>
-<code>UserProfileService</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Obtain an alternative (usually enriched/customized) name for the current user, to render in the UI.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-</tbody>
-</table>
-<div class="paragraph">
-<p>Key:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><code>o.a.i</code> is an abbreviation for <code>org.apache.isis</code></p>
-</li>
-<li>
-<p><code>o.ia.m</code> is an abbreviation for <code>org.isisaddons.module</code></p>
-</li>
-<li>
-<p><code>o.a.i.c.m.s</code> is an abbreviation for <code>org.apache.isis.core.metamodel.services</code></p>
-</li>
-<li>
-<p><code>o.a.i.c.r.s</code> is an abbreviation for <code>org.apache.isis.core.runtime.services</code></p>
-</li>
-</ul>
-</div>
-<div class="sect2">
-<h3 id="_rgsvc_spi_ContentMappingService">3.1. <code>ContentMappingService</code></h3>
-<div class="paragraph">
-<p>The <code>ContentMappingService</code> supports the (default implementation of the)
-<a href="rgfis.html#_rgfis_spi_ContentNegotiationService"><code>ContentNegotiationService</code></a> allowing the
-<a href="ugvro.html">RestfulObjects viewer</a> to allow domain objects to be transformed into some other format as specified
-by the HTTP <code>Accept</code> header.</p>
-</div>
-<div class="paragraph">
-<p>See <a href="rgfis.html#_rgfis_spi_ContentNegotiationService"><code>ContentNegotiationService</code></a> for further discussion.</p>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>Unlike most other domain services, the framework (that is, <code>ContentNegotiationService</code>) will check <em>all</em> available
-implementations of <code>ContentMappingService</code> to convert the domain object to the requested media type, rather than merely
-the first implementation found; in other words it uses the chain-of-responsibility pattern.  Services are checked
-in the ordering defined by <a href="rgant.html#_rgant-DomainServiceLayout_menuOrder"><code>@DomainServiceLayout#menuOrder()</code></a>).
-The mapped object used will be the first non-<code>null</code> result returned by an implementation.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="sect3">
-<h4 id="_spi">3.1.1. SPI</h4>
-<div class="paragraph">
-<p>The SPI defined by this service is:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">interface</span> <span class="class">ContentMappingService</span> {
+}</code></pre> 
+         </div> 
+        </div> 
+        <div class="colist arabic"> 
+         <table> 
+          <tbody>
+           <tr> 
+            <td><i class="conum" data-value="1"></i><b>1</b></td> 
+            <td>takes precedence over the default implementation when injected elsewhere.</td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="2"></i><b>2</b></td> 
+            <td>this implementation merely delegates to the default implementation</td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="3"></i><b>3</b></td> 
+            <td>find the first implementation that isn\u2019t <em>this</em> implementation (else infinite loop!)</td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="4"></i><b>4</b></td> 
+            <td>injects all implementations, including this implemenation</td> 
+           </tr> 
+          </tbody>
+         </table> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The above code could be improved by caching the delegateLocaleProvider once located (rather than searching each time).</p> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_rgsvc_intro_commands-and-events">2.5. Command and Events</h3> 
+        <div class="paragraph"> 
+         <p>A good number of the domain services manage the execution of action invocations/property edits, along with the state of domain objects that are modified as a result of these. These services capture information which can then be used for various purposes, most notably for auditing or for publishing events, or for deferring execution such that the execution be performed in the background at some later date.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The diagram below shows how these services fit together. The outline boxes are services while the coloured boxes represent data structures - defined in the applib and therefore accessible to domain applications - which hold various information about the executions.</p> 
+        </div> 
+        <div class="imageblock"> 
+         <div class="content"> 
+          <a class="image" href="images/reference-services/commands-and-events.png"><img src="images/reference-services/commands-and-events.png" alt="commands and events" width="960px"></a> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>To explain:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p>the (request-scoped) <a href="#_rgsvc_api_CommandContext"><code>CommandContext</code></a> captures the user\u2019s intention to invoke an action or edit a property; this is held by the <code>Command</code> object.</p> </li> 
+          <li> <p>if a <a href="#_rgsvc_spi_CommandService"><code>CommandService</code></a> has been configured, then this will be used to create the <code>Command</code> object implementation, generally so that it can then also be persisted.<br></p> 
+           <div class="paragraph"> 
+            <p>If the action or property is annotated to be invoked in the background (using <a href="rgant.html#_rgant-Action_command"><code>@Action#command\u2026\u200b()</code></a> or <a href="rgant.html#_rgant-Property_command"><code>@Property#command\u2026\u200b()</code></a>) then no further work is done. But, if the action/property is to be executed in the foreground, then the interaction continues.</p> 
+           </div> </li> 
+          <li> <p>the (request-scoped) <a href="#_rgsvc_api_InteractionContext"><code>InteractionContext</code></a> domain service acts as a factory for the <code>Interaction</code> object, which keeps track of the call-graph of executions (<code>Interaction.Execution</code>) of either action invocations or property edits. In the majority of cases there is likely to be just a single top-level node of this graph, but for applications that use the <a href="#_rgsvc_api_WrapperFactory"><code>WrapperFactory</code></a> extensively each successive call results in a new child execution.</p> </li> 
+          <li> <p>before and after each action invocation/property edit, a <a href="rgcms.html#_rgcms_classes_domainevent">domain event</a> is may be broadcast to all subscribers. Whether this occurs depends on whether the action/property has been annotated (using <a href="rgant.html#_rgant-Action_domainEvent"><code>@Action#domainEvent()</code></a> or <a href="rgant.html#_rgant-Property_domainEvent"><code>@Property#domainEvent()</code></a>).<br></p> 
+           <div class="paragraph"> 
+            <p>(Note that susbcribers will also receive events for vetoing the action/property; this is not shown on the diagram).</p> 
+           </div> </li> 
+          <li> <p>As each execution progresses, and objects that are modified are "enlisted" into the (internal) <a href="rgfis.html#_rgfis_spi_ChangedObjectsServiceInternal"><code>ChangedObjectsServiceInternal</code></a> domain service. Metrics as to which objects are merely loaded into memory are also captured using the <a href="#_rgsvc_api_MetricsService"><code>MetricsService</code></a> (not shown on the diagram).</p> </li> 
+          <li> <p>At the end of each execution, details of that execution are published through the (internal) <a href="rgfis.html#_rgfis_spi_PublisherServiceInternal"><code>PublisherServiceInternal</code></a> domain service. This is only done for actions/properties annotated appropriate (with <a href="rgant.html#_rgant-Action_publishing"><code>@Action#publishing()</code></a> or <a href="rgant.html#_rgant-Property_publishing"><code>@Property#publishing()</code></a>). <br></p> 
+           <div class="paragraph"> 
+            <p>The internal service delegates in turn to any registered <a href="#_rgsvc_spi_PublishingService"><code>PublishingService</code></a> (deprecated) and also to any registered <a href="#_rgsvc_spi_PublisherService"><code>PublisherService</code></a>s (there may be more than one).</p> 
+           </div> </li> 
+          <li> <p>At the end of each transaction, details of all changed objects are published, again through the (internal) <a href="rgfis.html#_rgfis_spi_PublisherServiceInternal"><code>PublisherServiceInternal</code></a> to any registered <code>PublishingService</code> or <code>PublisherService</code> implementations. Only domain objects specified to be published with <a href="rgant.html#_rgant-DomainObject_publishing"><code>@DomainObject#publishing()</code></a> are published.<br></p> 
+           <div class="admonitionblock note"> 
+            <table> 
+             <tbody>
+              <tr> 
+               <td class="icon"> <i class="fa icon-note" title="Note"></i> </td> 
+               <td class="content"> 
+                <div class="paragraph"> 
+                 <p>Note that it\u2019s possible for there to be more than one transaction per top-level interaction, by virtue of the <a href="#_rgsvc_api_TransactionService"><code>TransactionService</code></a>.</p> 
+                </div> </td> 
+              </tr> 
+             </tbody>
+            </table> 
+           </div> </li> 
+          <li> <p>Also at the end of each transaction, details of all changed properties are passed to any registered <a href="#_rgsvc_spi_AuditerService"><code>AuditerService</code></a> or <a href="#_rgsvc_spi_AuditingService"><code>AuditingService</code></a> (the latter deprecated) by way of the (internal) <a href="rgfis.html#_rgfis_spi_AuditingServiceInternal"><code>AuditingServiceInternal</code></a> domain service.</p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Implementations of <a href="#_rgsvc_spi_CommandService"><code>CommandService</code></a> can use the <code>Command#getMemento()</code> method to obtain a XML equivalent of that <code>Command</code>, reified using the <a href="rgcms.html#_rgcms_schema-cmd"><code>cmd.xsd</code></a> schema. This can be converted back into a <code>CommandDto</code> using the <code>CommandDtoUtils</code> utility class (part of the applib).</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Similarly, implementations of <a href="#_rgsvc_spi_PublisherService"><code>PublisherService</code></a> can use the <code>InteractionDtoUtils</code> utility class to obtain a <code>InteractionDto</code> representing the interaction, either just for a single execution or for the entire call-graph. This can be converted into XML in a similar fashion.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Likewise, the <code>PublishedObjects</code> class passed to the <code>PublisherService</code> at the end of the interaction provides the <code>PublishedObjects#getDto()</code> method which returns a <code>ChangesDto</code> instance. This can be converted into XML using the <code>ChangesDtoUtils</code> utility class.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>One final point: multiple <a href="#_rgsvc_spi_PublisherService"><code>PublisherService</code></a> implementations are supported because different implementations may have different responsibilities. For example, the (non-ASF) <a href="http://github.com/isisaddons/isis-module-publishmq">Isis addons' publishmq</a> module is responsible for publishing messages onto an ActiveMQ event bus, for inter-system communication. However, the SPI can also be used for profiling; each execution within the call-graph contains metrics of the number of objects loaded or modified as a result of that execution, and thus could be used for application profiling. The framework provides a default <code>PublisherServiceLogging</code> implementation that logs this using SLF4J.</p> 
+        </div> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_rgsvc_presentation-layer-spi">3. Presentation Layer SPI</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_rgsvc_presentation-layer-spi.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>Domain service SPIs for the presentation layer influence how the Apache Isis viewers behave.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>The table below summarizes the presentation layer SPIs defined by Apache Isis. It also lists their corresponding implementation, either a default implementation provided by Apache Isis itself, or provided by one of the in (non-ASF) <a href="http://www.isisaddons.org">Isis Addons</a> modules.</p> 
+       </div> 
+       <table class="tableblock frame-all grid-all spread"> 
+        <caption class="title">
+         Table 1. Presentation Layer SPI
+        </caption> 
+        <colgroup> 
+         <col style="width: 25%;"> 
+         <col style="width: 50%;"> 
+         <col style="width: 12.5%;"> 
+         <col style="width: 12.5%;"> 
+        </colgroup> 
+        <thead> 
+         <tr> 
+          <th class="tableblock halign-left valign-top">SPI</th> 
+          <th class="tableblock halign-left valign-top">Description</th> 
+          <th class="tableblock halign-left valign-top">Implementation</th> 
+          <th class="tableblock halign-left valign-top">Notes</th> 
+         </tr> 
+        </thead> 
+        <tbody> 
+         <tr> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_ContentMappingService"><code>o.a.i.applb.</code><br> <code>services.conmap</code><br> <code>ContentMappingService</code></a></p></td> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="paragraph"> 
+             <p>(Attempt to) map the returned data into the representation required by the client\u2019s HTTP <code>Accept</code> header.</p> 
+            </div>
+           </div></td> 
+          <td class="tableblock halign-left valign-top"></td> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock">Replaces (and simplifies) the earlier <code>ContentMappingService</code> that defined an SPI using classes internal to the framework.<br> + No default implementation.</p></td> 
+         </tr> 
+         <tr> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_EmailNotificationService"><code>o.a.i.applib.</code><br> <code>services.userreg</code><br> <code>EmailNotificationService</code></a></p></td> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="paragraph"> 
+             <p>Notify a user during <a href="#_rgsvc_spi_UserRegistrationService">self-registration</a> of users.</p> 
+            </div>
+           </div></td> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock"><code>EmailNotificationService-</code><br> <code>Default</code><br> <code>o.a.i.core</code><br> <code>isis-core-runtime</code></p></td> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock">depends on:<br> a configured <code>EmailService</code></p></td> 
+         </tr> 
+         <tr> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_ErrorReportingService"><code>o.a.i.applib.</code><br> <code>services.error</code><br> <code>ErrorReportingService</code></a></p></td> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="paragraph"> 
+             <p>Record details of an error occurring in the system (eg in an external incident recording system such as JIRA), and return a more friendly (jargon-free) message to display to the end user, with optional reference (eg <code>XXX-1234</code>).</p> 
+            </div>
+           </div></td> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock">(none)</p></td> 
+          <td class="tableblock halign-left valign-top"></td> 
+         </tr> 
+         <tr> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_ExceptionRecognizer"><code>o.a.i.applib.</code><br> <code>services.exceprecog</code><br> <code>ExceptionRecognizer2</code></a></p></td> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="paragraph"> 
+             <p>Convert certain exceptions (eg foreign or unique key violation in the database) into a format that can be rendered to the end-user.</p> 
+            </div>
+           </div></td> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock"><code>ExceptionRecognizer-</code><br> <code>CompositeFor-</code><br> <code>JdoObjectStore</code><br> <code>o.a.i.core</code><br> <code>isis-core-applib</code></p></td> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock">Extensible using composite pattern if required</p></td> 
+         </tr> 
+         <tr> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_GridSystemService"><code>o.a.i.applib.</code><br> <code>services.grid</code><br> <code>GridSystemService</code></a></p></td> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="paragraph"> 
+             <p>Validates and normalizes the grid layout for a domain class (with respect to a particular grid system such as Bootstrap3), also providing a default grid (for those domain classes where there is no grid layout).</p> 
+            </div>
+           </div></td> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock"><code>GridSystemServiceBS3</code><br> <code>o.a.i.core</code><br> <code>isis-core-metamodel</code></p></td> 
+          <td class="tableblock halign-left valign-top"></td> 
+         </tr> 
+         <tr> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_GridLoaderService"><code>o.a.i.applib.</code><br> <code>services.grid</code><br> <code>GridLoaderService</code></a></p></td> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="paragraph"> 
+             <p>Responsible for loading a grid layout for a domain class, eg from a <code>layout.xml</code> file.</p> 
+            </div>
+           </div></td> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock"><code>GridLoaderServiceDefault</code><br> <code>o.a.i.core</code><br> <code>isis-core-metamodel</code></p></td> 
+          <td class="tableblock halign-left valign-top"></td> 
+         </tr> 
+         <tr> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_GridService"><code>o.a.i.applib.</code><br> <code>services.grid</code><br> <code>GridService</code></a></p></td> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="paragraph"> 
+             <p>A facade on top of both <a href="#_rgsvc_spi_GridLoaderService"><code>GridLoaderService</code></a> and <a href="#_rgsvc_spi_GridSystemService"><code>GridSystemService</code></a>, thus being able to return normalized grids for any domain class.</p> 
+            </div>
+           </div></td> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock"><code>GridServiceDefault</code><br> <code>o.a.i.core</code><br> <code>isis-core-metamodel</code></p></td> 
+          <td class="tableblock halign-left valign-top"></td> 
+         </tr> 
+         <tr> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_HintStore"><code>o.a.i.applib.</code><br> <code>services.hint</code><br> <code>HintStore</code></a></p></td> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="paragraph"> 
+             <p>Stores UI hints on a per-object basis. For example, the viewer remembers which tabs are selected, and for collections which view is selected (eg table or hidden), which page of a table to render, or whether "show all" (rows) is toggled.</p> 
+            </div>
+           </div></td> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock"><code>HintStoreUsingWicketSession</code><br> <code>o.a.i.viewer</code><br> <code>isis-viewer-wicket-impl</code></p></td> 
+          <td class="tableblock halign-left valign-top"></td> 
+         </tr> 
+         <tr> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_LocaleProvider"><code>o.a.i.applib.</code><br> <code>services.i18n</code><br> <code>LocaleProvider</code></a></p></td> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="paragraph"> 
+             <p>Request-scoped service to return the locale of the current user, in support of i18n (ie so that the app\u2019s UI, messages and exceptions can be translated to the required locale by the <a href="#_rgsvc_spi_TranslationService"><code>TranslationService</code></a>.</p> 
+            </div>
+           </div></td> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock"><code>LocaleProviderWicket</code><br> <code>o.a.i.viewer</code><br> <code>isis-viewer-wicket-impl</code></p></td> 
+          <td class="tableblock halign-left valign-top"></td> 
+         </tr> 
+         <tr> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_RoutingService"><code>o.a.i.applib.</code><br> <code>services.routing</code><br> <code>RoutingService</code></a></p></td> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="paragraph"> 
+             <p>Return an alternative object than that returned by an action.</p> 
+            </div>
+           </div></td> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock"><code>RoutingServiceDefault</code><br> <code>o.a.i.core</code><br> <code>isis-core-applib</code></p></td> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock">The default implementation will return the home page (per <a href="#_rgsvc_api_HomePageProviderService"><code>HomePageProviderService</code></a>) if a void or null is returned.<br> Used by the <a href="ugvw.html">Wicket viewer</a> only.</p></td> 
+         </tr> 
+         <tr> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_TableColumnOrderService"><code>o.a.i.applib.</code><br> <code>services.tablecol</code><br> <code>TableColumn-</code><br> <code>OrderService</code></a></p></td> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="paragraph"> 
+             <p>Allows the columns of a parented or standalone table to be reordered, based upon the parent object, collection id and type of object in the collection..</p> 
+            </div>
+           </div></td> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock"><code>TableColumn-</code><br> <code>OrderService.Default</code><br> <code>o.a.i.core</code><br> <code>isis-core-applib</code></p></td> 
+          <td class="tableblock halign-left valign-top"></td> 
+         </tr> 
+         <tr> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_TranslationService"><code>o.a.i.applib.</code><br> <code>services.i18n</code><br> <code>TranslationService</code></a></p></td> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="paragraph"> 
+             <p>Translate an app\u2019s UI, messages and exceptions for the current user (as per the locale provided by <a href="#_rgsvc_spi_LocaleProvider"><code>LocalProvider</code></a>.</p> 
+            </div>
+           </div></td> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock"><code>TranslationServicePo</code><br> <code>o.a.i.core</code><br> <code>isis-core-runtime</code></p></td> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock">related services: <code>TranslationServicePoMenu</code><br> depends on:<br> <code>TranslationsResolver</code>, <code>LocaleProvider</code></p></td> 
+         </tr> 
+         <tr> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_TranslationsResolver"><code>o.a.i.applib.</code><br> <code>services.i18n</code><br> <code>TranslationsResolver</code></a></p></td> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="paragraph"> 
+             <p>Obtain translations for a particuar phrase and locale, in support of i18n (ie so that the app\u2019s UI, messages and exceptions can be translated to the required locale by the <a href="#_rgsvc_spi_TranslationService"><code>TranslationService</code></a></p> 
+            </div>
+           </div></td> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock"><code>TranslationsResolverWicket</code><br> <code>o.a.i.viewer</code><br> <code>isis-viewer-wicket-impl</code></p></td> 
+          <td class="tableblock halign-left valign-top"></td> 
+         </tr> 
+         <tr> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_UrlEncodingService"><code>o.a.i.applib.</code><br> <code>services.urlencoding</code><br> <code>UrlEncodingService</code></a></p></td> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="paragraph"> 
+             <p>Converts strings into a form safe for use within a URL. Used to convert view models mementos into usable URL form.</p> 
+            </div>
+           </div></td> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock"><code>UrlEncodingService</code><br> <code>UsingBaseEncoding</code><br> <code>o.a.i.applib</code><br> <code>isis-core-applib</code></p></td> 
+          <td class="tableblock halign-left valign-top"></td> 
+         </tr> 
+         <tr> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgsvc_spi_UserProfileService"><code>o.a.i.applib.</code><br> <code>services.userprof</code><br> <code>UserProfileService</code></a></p></td> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="paragraph"> 
+             <p>Obtain an alternative (usually enriched/customized) name for the current user, to render in the UI.</p> 
+            </div>
+           </div></td> 
+          <td class="tableblock halign-left valign-top"></td> 
+          <td class="tableblock halign-left valign-top"></td> 
+         </tr> 
+        </tbody> 
+       </table> 
+       <div class="paragraph"> 
+        <p>Key:</p> 
+       </div> 
+       <div class="ulist"> 
+        <ul> 
+         <li> <p><code>o.a.i</code> is an abbreviation for <code>org.apache.isis</code></p> </li> 
+         <li> <p><code>o.ia.m</code> is an abbreviation for <code>org.isisaddons.module</code></p> </li> 
+         <li> <p><code>o.a.i.c.m.s</code> is an abbreviation for <code>org.apache.isis.core.metamodel.services</code></p> </li> 
+         <li> <p><code>o.a.i.c.r.s</code> is an abbreviation for <code>org.apache.isis.core.runtime.services</code></p> </li> 
+        </ul> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_rgsvc_spi_ContentMappingService">3.1. <code>ContentMappingService</code></h3> 
+        <div class="paragraph"> 
+         <p>The <code>ContentMappingService</code> supports the (default implementation of the) <a href="rgfis.html#_rgfis_spi_ContentNegotiationService"><code>ContentNegotiationService</code></a> allowing the <a href="ugvro.html">RestfulObjects viewer</a> to allow domain objects to be transformed into some other format as specified by the HTTP <code>Accept</code> header.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>See <a href="rgfis.html#_rgfis_spi_ContentNegotiationService"><code>ContentNegotiationService</code></a> for further discussion.</p> 
+        </div> 
+        <div class="admonitionblock note"> 
+         <table> 
+          <tbody>
+           <tr> 
+            <td class="icon"> <i class="fa icon-note" title="Note"></i> </td> 
+            <td class="content"> 
+             <div class="paragraph"> 
+              <p>Unlike most other domain services, the framework (that is, <code>ContentNegotiationService</code>) will check <em>all</em> available implementations of <code>ContentMappingService</code> to convert the domain object to the requested media type, rather than merely the first implementation found; in other words it uses the chain-of-responsibility pattern. Services are checked in the ordering defined by <a href="rgant.html#_rgant-DomainServiceLayout_menuOrder"><code>@DomainServiceLayout#menuOrder()</code></a>). The mapped object used will be the first non-<code>null</code> result returned by an implementation.</p> 
+             </div> </td> 
+           </tr> 
+          </tbody>
+         </table> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_spi">3.1.1. SPI</h4> 
+         <div class="paragraph"> 
+          <p>The SPI defined by this service is:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">interface</span> <span class="class">ContentMappingService</span> {
     <span class="predefined-type">Object</span> map(<span class="predefined-type">Object</span> object,                           <i class="conum" data-value="1"></i><b>(1)</b>
                <span class="predefined-type">List</span>&lt;MediaType&gt; acceptableMediaTypes);   <i class="conum" data-value="2"></i><b>(2)</b>
-}</code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td>typically the input is a domain object (whose structure might change over time), and the output is a DTO (whose structure is guaranteed to be preserved over time)</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="2"></i><b>2</b></td>
-<td>as per the caller&#8217;s HTTP <code>Accept</code> header</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>In versions prior to <code>v1.12.0</code>, this interface resided in a different package, internal to the
-<a href="#ugvro.adoc">Restful Objects</a> viewer, and defined a slightly different signature that used an internal enum:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">interface</span> <span class="class">ContentMappingService</span> {
+}</code></pre> 
+          </div> 
+         </div> 
+         <div class="colist arabic"> 
+          <table> 
+           <tbody>
+            <tr> 
+             <td><i class="conum" data-value="1"></i><b>1</b></td> 
+             <td>typically the input is a domain object (whose structure might change over time), and the output is a DTO (whose structure is guaranteed to be preserved over time)</td> 
+            </tr> 
+            <tr> 
+             <td><i class="conum" data-value="2"></i><b>2</b></td> 
+             <td>as per the caller\u2019s HTTP <code>Accept</code> header</td> 
+            </tr> 
+           </tbody>
+          </table> 
+         </div> 
+         <div class="paragraph"> 
+          <p>In versions prior to <code>v1.12.0</code>, this interface resided in a different package, internal to the <a href="#ugvro.adoc">Restful Objects</a> viewer, and defined a slightly different signature that used an internal enum:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">interface</span> <span class="class">ContentMappingService</span> {
     <span class="predefined-type">Object</span> map(<span class="predefined-type">Object</span> object,
                <span class="predefined-type">List</span>&lt;MediaType&gt; acceptableMediaTypes,
                RepresentationType representationType);   <i class="conum" data-value="1"></i><b>(1)</b>
 
-}</code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td>enum representing the requested representation; only ever take a value of <code>DOMAIN_OBJECT</code> or <code>ACTION_RESULT</code>.</td>
-</tr>
-</table>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_implementations">3.1.2. Implementations</h4>
-<div class="paragraph">
-<p>No default implementations are provided by Apache Isis framework itself.</p>
-</div>
-<div class="paragraph">
-<p>However, the (non-ASF) <a href="http://github.com/isisaddons/isis-app-todoapp">Isis addons' todoapp</a> includes a sample implementation to convert its <code>ToDoItem</code> entity into a (JAXB annotated) <code>ToDoItemDto</code>.  The source code is:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@DomainService</span>(nature = NatureOfService.DOMAIN)
+}</code></pre> 
+          </div> 
+         </div> 
+         <div class="colist arabic"> 
+          <table> 
+           <tbody>
+            <tr> 
+             <td><i class="conum" data-value="1"></i><b>1</b></td> 
+             <td>enum representing the requested representation; only ever take a value of <code>DOMAIN_OBJECT</code> or <code>ACTION_RESULT</code>.</td> 
+            </tr> 
+           </tbody>
+          </table> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_implementations">3.1.2. Implementations</h4> 
+         <div class="paragraph"> 
+          <p>No default implementations are provided by Apache Isis framework itself.</p> 
+         </div> 
+    

<TRUNCATED>

[22/44] isis-site git commit: ISIS-1594: provide an 'edit' button

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/guides/ugbtb.pdf
----------------------------------------------------------------------
diff --git a/content/guides/ugbtb.pdf b/content/guides/ugbtb.pdf
index db04499..c542b87 100644
--- a/content/guides/ugbtb.pdf
+++ b/content/guides/ugbtb.pdf
@@ -4,16 +4,16 @@
 << /Title (Beyond the Basics)
 /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:20170214224358+00'00')
-/ModDate (D:20170214224358+00'00')
+/CreationDate (D:20170307234308+00'00')
+/ModDate (D:20170307234308+00'00')
 >>
 endobj
 2 0 obj
 << /Type /Catalog
 /Pages 3 0 R
 /Names 16 0 R
-/Outlines 669 0 R
-/PageLabels 720 0 R
+/Outlines 668 0 R
+/PageLabels 719 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 39 0 R 48 0 R 52 0 R 67 0 R 83 0 R 89 0 R 100 0 R 111 0 R 117 0 R 124 0 R 127 0 R 133 0 R 137 0 R 139 0 R 141 0 R 147 0 R 151 0 R 157 0 R 163 0 R 169 0 R 173 0 R 175 0 R 186 0 R 197 0 R 204 0 R 216 0 R 219 0 R 227 0 R 240 0 R 246 0 R 254 0 R 257 0 R 264 0 R 267 0 R 271 0 R 273 0 R 275 0 R 280 0 R 284 0 R 293 0 R 300 0 R 304 0 R 315 0 R 324 0 R 335 0 R 337 0 R 350 0 R 360 0 R 363 0 R 371 0 R 373 0 R 375 0 R 386 0 R 390 0 R 404 0 R 414 0 R 420 0 R 423 0 R 429 0 R 437 0 R 449 0 R 456 0 R 461 0 R 464 0 R 471 0 R 478 0 R 484 0 R 494 0 R 502 0 R 509 0 R 521 0 R 528 0 R 534 0 R 537 0 R 543 0 R 547 0 R 551 0 R 553 0 R 556 0 R 560 0 R 562 0 R 566 0 R]
+/Kids [7 0 R 10 0 R 12 0 R 14 0 R 39 0 R 48 0 R 52 0 R 67 0 R 83 0 R 89 0 R 100 0 R 110 0 R 116 0 R 123 0 R 126 0 R 132 0 R 136 0 R 138 0 R 140 0 R 146 0 R 150 0 R 156 0 R 162 0 R 168 0 R 172 0 R 174 0 R 185 0 R 196 0 R 203 0 R 215 0 R 218 0 R 226 0 R 239 0 R 245 0 R 253 0 R 256 0 R 263 0 R 266 0 R 270 0 R 272 0 R 274 0 R 279 0 R 283 0 R 292 0 R 299 0 R 303 0 R 314 0 R 323 0 R 334 0 R 336 0 R 349 0 R 359 0 R 362 0 R 370 0 R 372 0 R 374 0 R 385 0 R 389 0 R 403 0 R 413 0 R 419 0 R 422 0 R 428 0 R 436 0 R 448 0 R 455 0 R 460 0 R 463 0 R 470 0 R 477 0 R 483 0 R 493 0 R 501 0 R 508 0 R 520 0 R 527 0 R 533 0 R 536 0 R 542 0 R 546 0 R 550 0 R 552 0 R 555 0 R 559 0 R 561 0 R 565 0 R]
 >>
 endobj
 4 0 obj
@@ -78,13 +78,13 @@ endobj
 endobj
 8 0 obj
 << /Type /Font
-/BaseFont /AAAACY+NotoSerif
+/BaseFont /AAAACP+NotoSerif
 /Subtype /TrueType
-/FontDescriptor 722 0 R
+/FontDescriptor 721 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 724 0 R
-/ToUnicode 723 0 R
+/Widths 723 0 R
+/ToUnicode 722 0 R
 >>
 endobj
 9 0 obj
@@ -1673,7 +1673,7 @@ endobj
 /F4.0 43 0 R
 >>
 >>
-/Annots [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 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]
+/Annots [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 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]
 >>
 endobj
 11 0 obj
@@ -2108,7 +2108,7 @@ endobj
 /F4.0 43 0 R
 >>
 >>
-/Annots [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 659 0 R 660 0 R 661 0 R 662 0 R 663 0 R 664 0 R 665 0 R 666 0 R 667 0 R]
+/Annots [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 659 0 R 660 0 R 661 0 R 662 0 R 663 0 R 664 0 R 665 0 R 666 0 R]
 >>
 endobj
 13 0 obj
@@ -2793,7 +2793,7 @@ endobj
 /Font << /F2.0 18 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 668 0 R
+/XObject << /Stamp1 667 0 R
 >>
 >>
 /Annots [19 0 R 20 0 R 21 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 33 0 R 34 0 R 35 0 R 36 0 R 37 0 R]
@@ -2808,18 +2808,18 @@ endobj
 >>
 endobj
 17 0 obj
-<< /Kids [165 0 R 469 0 R 289 0 R 410 0 R 166 0 R 382 0 R 540 0 R 201 0 R 345 0 R 498 0 R]
+<< /Kids [164 0 R 468 0 R 288 0 R 409 0 R 165 0 R 381 0 R 539 0 R 200 0 R 344 0 R 497 0 R]
 >>
 endobj
 18 0 obj
 << /Type /Font
-/BaseFont /AAAACZ+NotoSerif-Bold
+/BaseFont /AAAACQ+NotoSerif-Bold
 /Subtype /TrueType
-/FontDescriptor 726 0 R
+/FontDescriptor 725 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 728 0 R
-/ToUnicode 727 0 R
+/Widths 727 0 R
+/ToUnicode 726 0 R
 >>
 endobj
 19 0 obj
@@ -3778,7 +3778,7 @@ endobj
 /F4.0 43 0 R
 /F5.1 45 0 R
 >>
-/XObject << /Stamp1 668 0 R
+/XObject << /Stamp1 667 0 R
 >>
 >>
 /Annots [46 0 R]
@@ -3789,13 +3789,13 @@ endobj
 endobj
 41 0 obj
 << /Type /Font
-/BaseFont /AAAADA+NotoSerif-Italic
+/BaseFont /AAAACR+NotoSerif-Italic
 /Subtype /TrueType
-/FontDescriptor 730 0 R
+/FontDescriptor 729 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 732 0 R
-/ToUnicode 731 0 R
+/Widths 731 0 R
+/ToUnicode 730 0 R
 >>
 endobj
 42 0 obj
@@ -3803,13 +3803,13 @@ endobj
 endobj
 43 0 obj
 << /Type /Font
-/BaseFont /AAAADB+mplus1mn-regular
+/BaseFont /AAAACS+mplus1mn-regular
 /Subtype /TrueType
-/FontDescriptor 734 0 R
+/FontDescriptor 733 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 736 0 R
-/ToUnicode 735 0 R
+/Widths 735 0 R
+/ToUnicode 734 0 R
 >>
 endobj
 44 0 obj
@@ -3817,13 +3817,13 @@ endobj
 endobj
 45 0 obj
 << /Type /Font
-/BaseFont /AAAADC+FontAwesome
+/BaseFont /AAAACT+FontAwesome
 /Subtype /TrueType
-/FontDescriptor 738 0 R
+/FontDescriptor 737 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 740 0 R
-/ToUnicode 739 0 R
+/Widths 739 0 R
+/ToUnicode 738 0 R
 >>
 endobj
 46 0 obj
@@ -4277,7 +4277,7 @@ endobj
 /F1.0 8 0 R
 /F3.0 41 0 R
 >>
-/XObject << /Stamp1 668 0 R
+/XObject << /Stamp1 667 0 R
 >>
 >>
 >>
@@ -5222,7 +5222,7 @@ endobj
 /F3.0 41 0 R
 /F1.1 60 0 R
 >>
-/XObject << /Stamp1 668 0 R
+/XObject << /Stamp1 667 0 R
 >>
 >>
 /Annots [53 0 R 54 0 R 55 0 R 56 0 R 58 0 R 59 0 R 61 0 R 62 0 R 63 0 R 64 0 R 65 0 R]
@@ -5299,13 +5299,13 @@ endobj
 endobj
 60 0 obj
 << /Type /Font
-/BaseFont /AAAADD+NotoSerif
+/BaseFont /AAAACU+NotoSerif
 /Subtype /TrueType
-/FontDescriptor 742 0 R
+/FontDescriptor 741 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 744 0 R
-/ToUnicode 743 0 R
+/Widths 743 0 R
+/ToUnicode 742 0 R
 >>
 endobj
 61 0 obj
@@ -6328,7 +6328,7 @@ endobj
 /F2.0 18 0 R
 /F5.1 45 0 R
 >>
-/XObject << /Stamp1 668 0 R
+/XObject << /Stamp1 667 0 R
 >>
 >>
 /Annots [68 0 R 69 0 R 71 0 R 72 0 R 73 0 R 74 0 R 75 0 R 76 0 R 77 0 R 78 0 R 79 0 R 81 0 R]
@@ -7624,7 +7624,7 @@ endobj
 /F2.0 18 0 R
 /F4.0 43 0 R
 >>
-/XObject << /Stamp1 668 0 R
+/XObject << /Stamp1 667 0 R
 >>
 >>
 /Annots [84 0 R 85 0 R 86 0 R 87 0 R]
@@ -8498,7 +8498,7 @@ endobj
 /F1.0 8 0 R
 /F4.0 43 0 R
 >>
-/XObject << /Stamp1 668 0 R
+/XObject << /Stamp1 667 0 R
 >>
 >>
 /Annots [90 0 R 92 0 R 93 0 R 94 0 R 95 0 R 96 0 R 97 0 R 98 0 R]
@@ -8593,7 +8593,7 @@ endobj
 >>
 endobj
 99 0 obj
-<< /Length 43935
+<< /Length 47229
 >>
 stream
 q
@@ -8627,13 +8627,13 @@ h
 S
 Q
 /DeviceRGB cs
-0.000 0.533 0.000 scn
+0.000 0.400 0.600 scn
 /DeviceRGB CS
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 SCN
 
 BT
 59.24 783.0649999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <7061636b616765> Tj
 ET
 
@@ -8650,101 +8650,13 @@ 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
+0.000 0.800 1.000 scn
+0.000 0.800 1.000 SCN
 
 BT
 103.24000000000001 783.0649999999999 Td
 /F4.0 11 Tf
-<746f646f617070> 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
-141.74 783.0649999999999 Td
-/F4.0 11 Tf
-<2e> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-147.24 783.0649999999999 Td
-/F4.0 11 Tf
-<617070> 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
-163.74 783.0649999999999 Td
-/F4.0 11 Tf
-<2e> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-169.24 783.0649999999999 Td
-/F4.0 11 Tf
-<766965776d6f64656c73> 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
-224.24 783.0649999999999 Td
-/F4.0 11 Tf
-<2e> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-229.74 783.0649999999999 Td
-/F4.0 11 Tf
-<746f646f6974656d> 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
-273.74 783.0649999999999 Td
-/F4.0 11 Tf
-<2e> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-279.24 783.0649999999999 Td
-/F4.0 11 Tf
-<7631> Tj
+<746f646f6170702e6170702e766965776d6f64656c732e746f646f6974656d2e7631> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -8782,8 +8694,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 59.24 768.3249999999999 Td
@@ -8848,13 +8760,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 185.74 768.3249999999999 Td
 /F4.0 11 Tf
-<22746f446f4974656d44746f22> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+191.24 768.3249999999999 Td
+/F4.0 11 Tf
+<746f446f4974656d44746f> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+251.74 768.3249999999999 Td
+/F4.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -8892,8 +8826,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 59.24 753.585 Td
@@ -9013,13 +8947,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 125.24000000000001 724.105 Td
 /F4.0 11 Tf
-<226d616a6f7256657273696f6e22> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+130.74 724.105 Td
+/F4.0 11 Tf
+<6d616a6f7256657273696f6e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+196.74 724.105 Td
+/F4.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9046,13 +9002,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 213.24 724.105 Td
 /F4.0 11 Tf
-<226d696e6f7256657273696f6e22> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+218.74 724.105 Td
+/F4.0 11 Tf
+<6d696e6f7256657273696f6e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+284.74 724.105 Td
+/F4.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9079,13 +9057,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 125.24000000000001 709.365 Td
 /F4.0 11 Tf
-<226465736372697074696f6e22> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+130.74 709.365 Td
+/F4.0 11 Tf
+<6465736372697074696f6e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+191.24 709.365 Td
+/F4.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9112,13 +9112,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 207.74 709.365 Td
 /F4.0 11 Tf
-<2263617465676f727922> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+213.24 709.365 Td
+/F4.0 11 Tf
+<63617465676f7279> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+257.24 709.365 Td
+/F4.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9151,7 +9173,29 @@ ET
 BT
 273.74 709.365 Td
 /F4.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+279.24 709.365 Td
+/F4.0 11 Tf
+<2e> 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
+284.74 709.365 Td
+/F4.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9167,13 +9211,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 125.24000000000001 694.625 Td
 /F4.0 11 Tf
-<22746f446f4974656d22> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+130.74 694.625 Td
+/F4.0 11 Tf
+<746f446f4974656d> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+174.74 694.625 Td
+/F4.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9200,13 +9266,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 191.24 694.625 Td
 /F4.0 11 Tf
-<2273696d696c61724974656d7322> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+196.74 694.625 Td
+/F4.0 11 Tf
+<73696d696c61724974656d73> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+262.74 694.625 Td
+/F4.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9244,8 +9332,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 59.24 650.405 Td
@@ -9343,8 +9431,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 257.24 635.665 Td
@@ -9365,8 +9453,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 284.74 635.665 Td
@@ -9409,12 +9497,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24 606.185 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -9431,12 +9519,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 606.185 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -9453,12 +9541,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 606.185 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <546f446f4974656d56315f31> Tj
 ET
 
@@ -9475,12 +9563,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 202.24 606.185 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <696d706c656d656e7473> Tj
 ET
 
@@ -9563,8 +9651,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 591.4449999999999 Td
@@ -9629,12 +9717,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 207.74 591.4449999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <74727565> Tj
 ET
 
@@ -9706,13 +9794,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 323.24 591.4449999999999 Td
 /F4.0 11 Tf
-<223122> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+328.74 591.4449999999999 Td
+/F4.0 11 Tf
+<31> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+334.24 591.4449999999999 Td
+/F4.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9761,12 +9871,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 576.7049999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -9783,12 +9893,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 119.74000000000001 576.7049999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <66696e616c> Tj
 ET
 
@@ -9805,8 +9915,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 152.74 576.7049999999999 Td
@@ -9844,7 +9954,18 @@ ET
 BT
 273.74 576.7049999999999 Td
 /F4.0 11 Tf
-<2829> Tj
+<28> 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
+279.24 576.7049999999999 Td
+/F4.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9882,12 +10003,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 301.24 576.7049999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <72657475726e> Tj
 ET
 
@@ -9904,13 +10025,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 339.74 576.7049999999999 Td
 /F4.0 11 Tf
-<223122> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+345.24 576.7049999999999 Td
+/F4.0 11 Tf
+<31> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+350.74 576.7049999999999 Td
+/F4.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9959,8 +10102,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 561.9649999999999 Td
@@ -10025,12 +10168,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 207.74 561.9649999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <74727565> Tj
 ET
 
@@ -10102,13 +10245,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 323.24 561.9649999999999 Td
 /F4.0 11 Tf
-<223122> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+328.74 561.9649999999999 Td
+/F4.0 11 Tf
+<31> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+334.24 561.9649999999999 Td
+/F4.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -10157,12 +10322,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 547.2249999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -10179,8 +10344,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 547.2249999999999 Td
@@ -10218,7 +10383,18 @@ ET
 BT
 240.74 547.2249999999999 Td
 /F4.0 11 Tf
-<2829> Tj
+<28> 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
+246.24 547.2249999999999 Td
+/F4.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -10256,12 +10432,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 268.24 547.2249999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <72657475726e> Tj
 ET
 
@@ -10278,13 +10454,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 306.74 547.2249999999999 Td
 /F4.0 11 Tf
-<223122> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+312.24 547.2249999999999 Td
+/F4.0 11 Tf
+<31> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+317.74 547.2249999999999 Td
+/F4.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -10333,8 +10531,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 517.7449999999999 Td
@@ -10399,12 +10597,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 207.74 517.7449999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <74727565> Tj
 ET
 
@@ -10454,8 +10652,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 503.00499999999994 Td
@@ -10476,8 +10674,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 125.24000000000001 503.00499999999994 Td
@@ -10498,12 +10696,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 488.26499999999993 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <70726f746563746564> Tj
 ET
 
@@ -10520,8 +10718,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 136.24 488.26499999999993 Td
@@ -10575,8 +10773,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 473.5249999999999 Td
@@ -10641,12 +10839,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 207.74 473.5249999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <74727565> Tj
 ET
 
@@ -10674,8 +10872,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 458.7849999999999 Td
@@ -10696,8 +10894,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 125.24000000000001 458.7849999999999 Td
@@ -10718,12 +10916,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 444.0449999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <70726f746563746564> Tj
 ET
 
@@ -10740,8 +10938,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 136.24 444.0449999999999 Td
@@ -10801,7 +10999,29 @@ ET
 BT
 81.24000000000001 429.3049999999999 Td
 /F4.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+86.74000000000001 429.3049999999999 Td
+/F4.0 11 Tf
+<2e> 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
+92.24000000000001 429.3049999999999 Td
+/F4.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -10817,8 +11037,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 399.8249999999999 Td
@@ -10839,8 +11059,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 125.24000000000001 399.8249999999999 Td
@@ -10883,12 +11103,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 385.08499999999987 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <70726f746563746564> Tj
 ET
 
@@ -10960,8 +11180,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 370.34499999999986 Td
@@ -11004,8 +11224,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 355.60499999999985 Td
@@ -11070,13 +11290,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 185.74 355.60499999999985 Td
 /F4.0 11 Tf
-<22746f646f4974656d22> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+191.24 355.60499999999985 Td
+/F4.0 11 Tf
+<746f646f4974656d> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+235.24 355.60499999999985 Td
+/F4.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -11103,8 +11345,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 340.86499999999984 Td
@@ -11125,8 +11367,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 125.24000000000001 340.86499999999984 Td
@@ -11147,12 +11389,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 326.12499999999983 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <70726f746563746564> Tj
 ET
 
@@ -11169,8 +11411,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 136.24 326.12499999999983 Td
@@ -11290,8 +11532,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 334.24 326.12499999999983 Td
@@ -11307,7 +11549,29 @@ ET
 BT
 400.24 326.12499999999983 Td
 /F4.0 11 Tf
-<28293b> Tj
+<28> 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
+405.74 326.12499999999983 Td
+/F4.0 11 Tf
+<29> 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
+411.24 326.12499999999983 Td
+/F4.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -11687,40 +11951,28 @@ endobj
 /MediaBox [0 0 595.28 841.89]
 /Contents 99 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F6.0 101 0 R
-/F4.0 43 0 R
-/F4.1 102 0 R
+/Font << /F4.0 43 0 R
+/F4.1 101 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 668 0 R
+/XObject << /Stamp1 667 0 R
 >>
 >>
-/Annots [103 0 R 104 0 R 105 0 R 106 0 R 107 0 R 108 0 R 109 0 R]
+/Annots [102 0 R 103 0 R 104 0 R 105 0 R 106 0 R 107 0 R 108 0 R]
 >>
 endobj
 101 0 obj
 << /Type /Font
-/BaseFont /AAAADE+mplus1mn-bold
+/BaseFont /AAAACV+mplus1mn-regular
 /Subtype /TrueType
-/FontDescriptor 746 0 R
+/FontDescriptor 745 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 748 0 R
-/ToUnicode 747 0 R
+/Widths 747 0 R
+/ToUnicode 746 0 R
 >>
 endobj
 102 0 obj
-<< /Type /Font
-/BaseFont /AAAADF+mplus1mn-regular
-/Subtype /TrueType
-/FontDescriptor 750 0 R
-/FirstChar 32
-/LastChar 255
-/Widths 752 0 R
-/ToUnicode 751 0 R
->>
-endobj
-103 0 obj
 << /Border [0 0 0]
 /Dest (_ugbtb_view-models_jaxb_versioning)
 /Subtype /Link
@@ -11728,7 +11980,7 @@ endobj
 /Type /Annot
 >>
 endobj
-104 0 obj
+103 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -11739,7 +11991,7 @@ endobj
 /Type /Annot
 >>
 endobj
-105 0 obj
+104 0 obj
 << /Border [0 0 0]
 /Dest (_ugbtb_view-models_jaxb_versioning)
 /Subtype /Link
@@ -11747,7 +11999,7 @@ endobj
 /Type /Annot
 >>
 endobj
-106 0 obj
+105 0 obj
 << /Border [0 0 0]
 /Dest (_ugbtb_view-models_jaxb_versioning)
 /Subtype /Link
@@ -11755,7 +12007,7 @@ endobj
 /Type /Annot
 >>
 endobj
-107 0 obj
+106 0 obj
 << /Border [0 0 0]
 /Dest (_ugbtb_view-models_jaxb_versioning)
 /Subtype /Link
@@ -11763,7 +12015,7 @@ endobj
 /Type /Annot
 >>
 endobj
-108 0 obj
+107 0 obj
 << /Border [0 0 0]
 /Dest (_ugbtb_view-models_jaxb_referencing-domain-entities)
 /Subtype /Link
@@ -11771,7 +12023,7 @@ endobj
 /Type /Annot
 >>
 endobj
-109 0 obj
+108 0 obj
 << /Border [0 0 0]
 /Dest (_ugbtb_view-models_jaxb_referencing-domain-entities)
 /Subtype /Link
@@ -11779,8 +12031,8 @@ endobj
 /Type /Annot
 >>
 endobj
-110 0 obj
-<< /Length 21058
+109 0 obj
+<< /Length 21116
 >>
 stream
 q
@@ -12309,12 +12561,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24 485.66500000000013 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <7061636b616765> Tj
 ET
 
@@ -12331,13 +12583,13 @@ 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
+0.000 0.800 1.000 scn
+0.000 0.800 1.000 SCN
 
 BT
 103.24000000000001 485.66500000000013 Td
 /F4.0 11 Tf
-<746f646f617070> Tj
+<746f646f6170702e6170702e766965776d6f64656c732e746f646f6974656d2e7631> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -12346,20 +12598,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-141.74 485.66500000000013 Td
-/F4.0 11 Tf
-<2e> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-147.24 485.66500000000013 Td
+290.24 485.66500000000013 Td
 /F4.0 11 Tf
-<617070> Tj
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -12368,96 +12609,41 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-163.74 485.66500000000013 Td
+59.24 470.9250000000001 Td
 /F4.0 11 Tf
 <2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-169.24 485.66500000000013 Td
-/F4.0 11 Tf
-<766965776d6f64656c73> 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
-224.24 485.66500000000013 Td
+64.74000000000001 470.9250000000001 Td
 /F4.0 11 Tf
 <2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-229.74 485.66500000000013 Td
-/F4.0 11 Tf
-<746f646f6974656d> 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
-273.74 485.66500000000013 Td
+70.24000000000001 470.9250000000001 Td
 /F4.0 11 Tf
 <2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-279.24 485.66500000000013 Td
-/F4.0 11 Tf
-<7631> 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
-290.24 485.66500000000013 Td
-/F4.0 11 Tf
-<3b> 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
-59.24 470.9250000000001 Td
-/F4.0 11 Tf
-<2e2e2e> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
-
-BT
 59.24 456.1850000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -12474,12 +12660,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 456.1850000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -12496,12 +12682,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 456.1850000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <546f446f4974656d56315f31> Tj
 ET
 
@@ -12518,12 +12704,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 202.24 456.1850000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <696d706c656d656e7473> Tj
 ET
 
@@ -12590,7 +12776,29 @@ ET
 BT
 81.24000000000001 441.4450000000001 Td
 /F4.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+86.74000000000001 441.4450000000001 Td
+/F4.0 11 Tf
+<2e> 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
+92.24000000000001 441.4450000000001 Td
+/F4.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -12606,8 +12814,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 426.7050000000001 Td
@@ -12628,8 +12836,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 125.24000000000001 426.7050000000001 Td
@@ -12650,12 +12858,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 411.96500000000015 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <70726f746563746564> Tj
 ET
 
@@ -12787,8 +12995,8 @@ f
 h
 S
 Q
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 59.24 320.7050000000001 Td
@@ -12831,8 +13039,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 301.24 320.7050000000001 Td
@@ -12853,12 +13061,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24 305.9650000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -12875,12 +13083,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 305.9650000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -12897,12 +13105,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 305.9650000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <546f446f4974656d> Tj
 ET
 
@@ -12925,7 +13133,29 @@ ET
 BT
 180.24 305.9650000000001 Td
 /F4.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+185.74 305.9650000000001 Td
+/F4.0 11 Tf
+<2e> 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
+191.24 305.9650000000001 Td
+/F4.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -12969,7 +13199,29 @@ ET
 BT
 81.24000000000001 291.2250000000001 Td
 /F4.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+86.74000000000001 291.2250000000001 Td
+/F4.0 11 Tf
+<2e> 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
+92.24000000000001 291.2250000000001 Td
+/F4.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -13106,27 +13358,26 @@ Q
 
 endstream
 endobj
-111 0 obj
+110 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 110 0 R
+/Contents 109 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 18 0 R
 /F1.0 8 0 R
 /F4.0 43 0 R
-/F6.0 101 0 R
 >>
-/XObject << /Stamp1 668 0 R
+/XObject << /Stamp1 667 0 R
 >>
 >>
-/Annots [113 0 R 114 0 R 115 0 R]
+/Annots [112 0 R 113 0 R 114 0 R]
 >>
 endobj
-112 0 obj
-[111 0 R /XYZ 0 841.89 null]
+111 0 obj
+[110 0 R /XYZ 0 841.89 null]
 endobj
-113 0 obj
+112 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -13137,7 +13388,7 @@ endobj
 /Type /Annot
 >>
 endobj
-114 0 obj
+113 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -13148,7 +13399,7 @@ endobj
 /Type /Annot
 >>
 endobj
-115 0 obj
+114 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -13159,8 +13410,8 @@ endobj
 /Type /Annot
 >>
 endobj
-116 0 obj
-<< /Length 19695
+115 0 obj
+<< /Length 19679
 >>
 stream
 q
@@ -13194,13 +13445,13 @@ h
 S
 Q
 /DeviceRGB cs
-0.000 0.533 0.000 scn
+0.000 0.400 0.600 scn
 /DeviceRGB CS
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 SCN
 
 BT
 59.24 783.0649999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <7061636b616765> Tj
 ET
 
@@ -13217,13 +13468,13 @@ 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
+0.000 0.800 1.000 scn
+0.000 0.800 1.000 SCN
 
 BT
 103.24000000000001 783.0649999999999 Td
 /F4.0 11 Tf
-<746f646f617070> Tj
+<746f646f6170702e6170702e766965776d6f64656c732e746f646f6974656d2e7631> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -13232,20 +13483,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-141.74 783.0649999999999 Td
-/F4.0 11 Tf
-<2e> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-147.24 783.0649999999999 Td
+290.24 783.0649999999999 Td
 /F4.0 11 Tf
-<617070> Tj
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -13254,96 +13494,41 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-163.74 783.0649999999999 Td
+59.24 768.3249999999999 Td
 /F4.0 11 Tf
 <2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-169.24 783.0649999999999 Td
-/F4.0 11 Tf
-<766965776d6f64656c73> 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
-224.24 783.0649999999999 Td
+64.74000000000001 768.3249999999999 Td
 /F4.0 11 Tf
 <2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-229.74 783.0649999999999 Td
-/F4.0 11 Tf
-<746f646f6974656d> 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
-273.74 783.0649999999999 Td
+70.24000000000001 768.3249999999999 Td
 /F4.0 11 Tf
 <2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-279.24 783.0649999999999 Td
-/F4.0 11 Tf
-<7631> 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
-290.24 783.0649999999999 Td
-/F4.0 11 Tf
-<3b> 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
-59.24 768.3249999999999 Td
-/F4.0 11 Tf
-<2e2e2e> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
-
-BT
 59.24 753.585 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -13360,12 +13545,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 753.585 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -13382,12 +13567,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 753.585 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <546f446f4974656d56315f31> Tj
 ET
 
@@ -13404,12 +13589,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 202.24 753.585 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <696d706c656d656e7473> Tj
 ET
 
@@ -13476,7 +13661,29 @@ ET
 BT
 81.24000000000001 738.845 Td
 /F4.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+86.74000000000001 738.845 Td
+/F4.0 11 Tf
+<2e> 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
+92.24000000000001 738.845 Td
+/F4.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -13492,8 +13699,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 724.105 Td
@@ -13514,8 +13721,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 709.365 Td
@@ -13580,13 +13787,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 185.74 709.365 Td
 /F4.0 11 Tf
-<22746f646f4974656d22> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+191.24 709.365 Td
+/F4.0 11 Tf
+<746f646f4974656d> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+235.24 709.365 Td
+/F4.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -13613,8 +13842,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 694.625 Td
@@ -13635,8 +13864,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 125.24000000000001 694.625 Td
@@ -13657,12 +13886,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 679.885 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <70726f746563746564> Tj
 ET
 
@@ -13679,8 +13908,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 136.24 679.885 Td
@@ -13800,8 +14029,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 334.24 679.885 Td
@@ -13817,7 +14046,29 @@ ET
 BT
 400.24 679.885 Td
 /F4.0 11 Tf
-<28293b> Tj
+<28> 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
+405.74 679.885 Td
+/F4.0 11 Tf
+<29> 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
+411.24 679.885 Td
+/F4.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -14370,25 +14621,24 @@ Q
 
 endstream
 endobj
-117 0 obj
+116 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 116 0 R
+/Contents 115 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F6.0 101 0 R
-/F4.0 43 0 R
+/Font << /F4.0 43 0 R
 /F1.0 8 0 R
 /F2.0 18 0 R
 /F5.1 45 0 R
 >>
-/XObject << /Stamp1 668 0 R
+/XObject << /Stamp1 667 0 R
 >>
 >>
-/Annots [118 0 R 119 0 R 121 0 R 122 0 R]
+/Annots [117 0 R 118 0 R 120 0 R 121 0 R]
 >>
 endobj
-118 0 obj
+117 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -14399,7 +14649,7 @@ endobj
 /Type /Annot
 >>
 endobj
-119 0 obj
+118 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -14410,10 +14660,10 @@ endobj
 /Type /Annot
 >>
 endobj
-120 0 obj
-[117 0 R /XYZ 0 504.77 null]
+119 0 obj
+[116 0 R /XYZ 0 504.77 null]
 endobj
-121 0 obj
+120 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -14424,7 +14674,7 @@ endobj
 /Type /Annot
 >>
 endobj
-122 0 obj
+121 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -14435,8 +14685,8 @@ endobj
 /Type /Annot
 >>
 endobj
-123 0 obj
-<< /Length 37575
+122 0 obj
+<< /Length 38607
 >>
 stream
 q
@@ -14470,9 +14720,9 @@ h
 S
 Q
 /DeviceRGB cs
-0.333 0.333 0.333 scn
+0.600 0.600 1.000 scn
 /DeviceRGB CS
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 SCN
 
 BT
 59.24 783.0649999999999 Td
@@ -14493,8 +14743,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 97.74000000000001 783.0649999999999 Td
@@ -14515,8 +14765,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 119.74000000000001 783.0649999999999 Td
@@ -14537,8 +14787,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 147.24 783.0649999999999 Td
@@ -14559,8 +14809,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 207.74 783.0649999999999 Td
@@ -14636,13 +14886,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 169.24 768.3249999999999 Td
 /F4.0 11 Tf
-<22687474703a2f2f766965776d6f64656c732e6170702e746f646f6170702f746f646f6974656d2f76312f44746f2e78736422> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+174.74 768.3249999999999 Td
+/F4.0 11 Tf
+<687474703a2f2f766965776d6f64656c732e6170702e746f646f6170702f746f646f6974656d2f76312f44746f2e787364> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+444.24 768.3249999999999 Td
+/F4.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -14757,8 +15029,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 147.24 738.845 Td
@@ -14779,8 +15051,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 185.74 738.845 Td
@@ -14801,8 +15073,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 207.74 738.845 Td
@@ -14823,8 +15095,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 235.24 738.845 Td
@@ -14845,8 +15117,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 295.74 738.845 Td
@@ -14922,13 +15194,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 273.74 724.105 Td
 /F4.0 11 Tf
-<22687474703a2f2f697369732e6170616368652e6f72672f736368656d612f636f6d6d6f6e22> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+279.24 724.105 Td
+/F4.0 11 Tf
+<687474703a2f2f697369732e6170616368652e6f72672f736368656d612f636f6d6d6f6e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+477.24 724.105 Td
+/F4.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -14999,13 +15293,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 240.74 709.365 Td
 /F4.0 11 Tf
-<22636f6d22> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+246.24 709.365 Td
+/F4.0 11 Tf
+<636f6d> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+262.74 709.365 Td
+/F4.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -15049,7 +15365,18 @@ ET
 BT
 103.24000000000001 679.885 Td
 /F4.0 11 Tf
-<7d2c> Tj
+<7d> 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
+108.74000000000001 679.885 Td
+/F4.0 11 Tf
+<2c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -15131,8 +15458,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 251.74 665.145 Td
@@ -15153,8 +15480,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 273.74 665.145 Td
@@ -15175,8 +15502,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 301.24 665.145 Td
@@ -15197,8 +15524,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 361.74 665.145 Td
@@ -15219,8 +15546,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 416.74 665.145 Td
@@ -15241,12 +15568,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24 635.665 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <7061636b616765> Tj
 ET
 
@@ -15263,101 +15590,13 @@ 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
+0.000 0.800 1.000 scn
+0.000 0.800 1.000 SCN
 
 BT
 103.24000000000001 635.665 Td
 /F4.0 11 Tf
-<746f646f617070> 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
-141.74 635.665 Td
-/F4.0 11 Tf
-<2e> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-147.24 635.665 Td
-/F4.0 11 Tf
-<617070> 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
-163.74 635.665 Td
-/F4.0 11 Tf
-<2e> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-169.24 635.665 Td
-/F4.0 11 Tf
-<766965776d6f64656c73> 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
-224.24 635.665 Td
-/F4.0 11 Tf
-<2e> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-229.74 635.665 Td
-/F4.0 11 Tf
-<746f646f6974656d> 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
-273.74 635.665 Td
-/F4.0 11 Tf
-<2e> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-279.24 635.665 Td
-/F4.0 11 Tf
-<7631> Tj
+<746f646f6170702e6170702e766965776d6f64656c732e746f646f6974656d2e7631> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -15559,12 +15798,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.239999999999995 424.6850000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <7061636b616765> Tj
 ET
 
@@ -15581,13 +15820,13 @@ 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
+0.000 0.800 1.000 scn
+0.000 0.800 1.000 SCN
 
 BT
 103.24 424.6850000000001 Td
 /F4.0 11 Tf
-<746f646f617070> Tj
+<746f646f6170702e6170702e766965776d6f64656c732e746f646f6974656d2e7631> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -15596,20 +15835,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-141.74 424.6850000000001 Td
-/F4.0 11 Tf
-<2e> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-147.24 424.6850000000001 Td
+290.24 424.6850000000001 Td
 /F4.0 11 Tf
-<617070> Tj
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -15618,20 +15846,20 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-163.74 424.6850000000001 Td
+295.74 424.6850000000001 Td
 /F4.0 11 Tf
-<2e> Tj
+<2020202020> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
 
 BT
-169.24 424.6850000000001 Td
-/F4.0 11 Tf
-<766965776d6f64656c73> Tj
+323.24 424.6850000000001 Td
+/F4.1 11 Tf
+<21> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -15640,75 +15868,31 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-224.24 424.6850000000001 Td
+59.239999999999995 409.9450000000001 Td
 /F4.0 11 Tf
 <2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-229.74 424.6850000000001 Td
-/F4.0 11 Tf
-<746f646f6974656d> 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
-273.74 424.6850000000001 Td
+64.74 409.9450000000001 Td
 /F4.0 11 Tf
 <2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-279.24 424.6850000000001 Td
-/F4.0 11 Tf
-<7631> 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
-290.24 424.6850000000001 Td
-/F4.0 11 Tf
-<3b> 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
-295.74 424.6850000000001 Td
+70.24 409.9450000000001 Td
 /F4.0 11 Tf
-<2020202020> Tj
-ET
-
-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
-
-BT
-323.24 424.6850000000001 Td
-/F4.1 11 Tf
-<21> Tj
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -15717,19 +15901,8 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.239999999999995 409.9450000000001 Td
-/F4.0 11 Tf
-<2e2e2e> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
-
-BT
 59.239999999999995 395.2050000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -15746,12 +15919,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74 395.2050000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -15768,12 +15941,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 395.2050000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <546f446f4974656d56315f31> Tj
 ET
 
@@ -15790,12 +15963,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 202.24 395.2050000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <696d706c656d656e7473> Tj
 ET
 
@@ -15884,7 +16057,29 @@ ET
 BT
 81.24 380.4650000000001 Td
 /F4.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+86.74 380.4650000000001 Td
+/F4.0 11 Tf
+<2e> 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
+92.24 380.4650000000001 Td
+/F4.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16038,12 +16233,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.239999999999995 170.5250000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -16060,12 +16255,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74 170.5250000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -16082,12 +16277,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 170.5250000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <546f446f4974656d56315f31> Tj
 ET
 
@@ -16104,12 +16299,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 202.24 170.5250000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <696d706c656d656e7473> Tj
 ET
 
@@ -16170,8 +16365,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24 155.78500000000008 Td
@@ -16236,12 +16431,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 207.74 155.78500000000008 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <74727565> Tj
 ET
 
@@ -16313,13 +16508,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 323.24 155.78500000000008 Td
 /F4.0 11 Tf
-<223122> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+328.74 155.78500000000008 Td
+/F4.0 11 Tf
+<31> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+334.24 155.78500000000008 Td
+/F4.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16346,12 +16563,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24 141.0450000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -16368,12 +16585,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 119.74 141.0450000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <66696e616c> Tj
 ET
 
@@ -16390,8 +16607,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 152.74 141.0450000000001 Td
@@ -16429,7 +16646,18 @@ ET
 BT
 273.74 141.0450000000001 Td
 /F4.0 11 Tf
-<2829> Tj
+<28> 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
+279.24 141.0450000000001 Td
+/F4.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16467,12 +16695,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 301.24 141.0450000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <72657475726e> Tj
 ET
 
@@ -16489,13 +16717,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 339.74 141.0450000000001 Td
 /F4.0 11 Tf
-<223122> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+345.24 141.0450000000001 Td
+/F4.0 11 Tf
+<31> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+350.74 141.0450000000001 Td
+/F4.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16566,8 +16816,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24 126.30500000000009 Td
@@ -16632,12 +16882,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 207.74 126.30500000000009 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <74727565> Tj
 ET
 
@@ -16709,13 +16959,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 323.24 126.30500000000009 Td
 /F4.0 11 Tf
-<223122> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+328.74 126.30500000000009 Td
+/F4.0 11 Tf
+<31> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+334.24 126.30500000000009 Td
+/F4.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16742,12 +17014,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24 111.5650000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -16764,8 +17036,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74 111.5650000000001 Td
@@ -16803,7 +17075,18 @@ ET
 BT
 240.74 111.5650000000001 Td
 /F4.0 11 Tf
-<2829> Tj
+<28> 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
+246.24 111.5650000000001 Td
+/F4.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16841,12 +17124,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 268.24 111.5650000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <72657475726e> Tj
 ET
 
@@ -16863,13 +17146,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 306.74 111.5650000000001 Td
 /F4.0 11 Tf
-<223122> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+312.24 111.5650000000001 Td
+/F4.0 11 Tf
+<31> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+317.74 111.5650000000001 Td
+/F4.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16946,7 +17251,29 @@ ET
 BT
 81.24 96.8250000000001 Td
 /F4.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+86.74 96.8250000000001 Td
+/F4.0 11 Tf
+<2e> 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
+92.24 96.8250000000001 Td
+/F4.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16986,24 +17313,23 @@ Q
 
 endstream
 endobj
-124 0 obj
+123 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 123 0 R
+/Contents 122 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F4.0 43 0 R
-/F4.1 102 0 R
-/F6.0 101 0 R
+/F4.1 101 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 668 0 R
+/XObject << /Stamp1 667 0 R
 >>
 >>
-/Annots [125 0 R]
+/Annots [124 0 R]
 >>
 endobj
-125 0 obj
+124 0 obj
 << /Border [0 0 0]
 /Dest (_ugbtb_view-models_jaxb_using-packages-to-version)
 /Subtype /Link
@@ -17011,8 +17337,8 @@ endobj
 /Type /Annot
 >>
 endobj
-126 0 obj
-<< /Length 24484
+125 0 obj
+<< /Length 26106
 >>
 stream
 q
@@ -17171,12 +17497,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.239999999999995 614.825 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -17193,12 +17519,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74 614.825 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -17215,12 +17541,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 614.825 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <546f446f4974656d56315f32> Tj
 ET
 
@@ -17237,12 +17563,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 202.24 614.825 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <696d706c656d656e7473> Tj
 ET
 
@@ -17303,8 +17629,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24 600.085 Td
@@ -17369,12 +17695,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 207.74 600.085 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <74727565> Tj
 ET
 
@@ -17446,13 +17772,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 323.24 600.085 Td
 /F4.0 11 Tf
-<223122> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+328.74 600.085 Td
+/F4.0 11 Tf
+<31> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+334.24 600.085 Td
+/F4.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17479,12 +17827,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24 585.345 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -17501,12 +17849,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 119.74 585.345 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <66696e616c> Tj
 ET
 
@@ -17523,8 +17871,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 152.74 585.345 Td
@@ -17562,7 +17910,18 @@ ET
 BT
 273.74 585.345 Td
 /F4.0 11 Tf
-<2829> Tj
+<28> 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
+279.24 585.345 Td
+/F4.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17600,12 +17959,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 301.24 585.345 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <72657475726e> Tj
 ET
 
@@ -17622,13 +17981,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 339.74 585.345 Td
 /F4.0 11 Tf
-<223122> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+345.24 585.345 Td
+/F4.0 11 Tf
+<31> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+350.74 585.345 Td
+/F4.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17677,8 +18058,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24 570.6050000000001 Td
@@ -17743,12 +18124,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 207.74 570.6050000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <74727565> Tj
 ET
 
@@ -17820,13 +18201,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 323.24 570.6050000000001 Td
 /F4.0 11 Tf
-<223222> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+328.74 570.6050000000001 Td
+/F4.0 11 Tf
+<32> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+334.24 570.6050000000001 Td
+/F4.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17853,12 +18256,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24 555.865 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -17875,8 +18278,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74 555.865 Td
@@ -17914,7 +18317,18 @@ ET
 BT
 240.74 555.865 Td
 /F4.0 11 Tf
-<2829> Tj
+<28> 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
+246.24 555.865 Td
+/F4.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17952,12 +18366,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 268.24 555.865 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <72657475726e> Tj
 ET
 
@@ -17974,13 +18388,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 306.74 555.865 Td
 /F4.0 11 Tf
-<223222> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+312.24 555.865 Td
+/F4.0 11 Tf
+<32> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+317.74 555.865 Td
+/F4.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -18035,7 +18471,29 @@ ET
 BT
 81.24 541.1250000000001 Td
 /F4.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+86.74 541.1250000000001 Td
+/F4.0 11 Tf
+<2e> 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
+92.24 541.1250000000001 Td
+/F4.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -18559,29 +19017,28 @@ Q
 
 endstream
 endobj
-127 0 obj
+126 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 126 0 R
+/Contents 125 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F4.1 102 0 R
+/Font << /F4.1 101 0 R
 /F1.0 8 0 R
-/F6.0 101 0 R
 /F4.0 43 0 R
 /F3.0 41 0 R
 /F2.0 18 0 R
 >>
-/XObject << /Stamp1 668 0 R
+/XObject << /Stamp1 667 0 R
 >>
 >>
-/Annots [129 0 R 130 0 R 131 0 R]
+/Annots [128 0 R 129 0 R 130 0 R]
 >>
 endobj
-128 0 obj
-[127 0 R /XYZ 0 369.7900000000001 null]
+127 0 obj
+[126 0 R /XYZ 0 369.7900000000001 null]
 endobj
-129 0 obj
+128 0 obj
 << /Border [0 0 0]
 /Dest (_ugbtb_view-models_jaxb_referencing-domain-entities)
 /Subtype /Link
@@ -18589,7 +19046,7 @@ endobj
 /Type /Annot
 >>
 endobj
-130 0 obj
+129 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -18600,7 +19057,7 @@ endobj
 /Type /Annot
 >>
 endobj
-131 0 obj
+130 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -18611,8 +19068,8 @@ endobj
 /Type /Annot
 >>
 endobj
-132 0 obj
-<< /Length 22358
+131 0 obj
+<< /Length 22668
 >>
 stream
 q
@@ -18751,12 +19208,12 @@ f
 h
 S
 Q
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 59.24 740.255 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c70726f6a656374> Tj
 ET
 
@@ -18773,8 +19230,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.310 0.624 0.812 scn
+0.310 0.624 0.812 SCN
 
 BT
 108.74000000000001 740.255 Td
@@ -18795,12 +19252,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 130.74 740.255 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3e> Tj
 ET
 
@@ -18817,12 +19274,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 81.24000000000001 725.515 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c617274696661637449643e> Tj
 ET
 
@@ -18839,12 +19296,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 207.74 725.515 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f617274696661637449643e> Tj
 ET
 
@@ -18861,12 +19318,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 81.24000000000001 710.7750000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c646570656e64656e636965733e> Tj
 ET
 
@@ -18883,12 +19340,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 103.24000000000001 696.0350000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c646570656e64656e63793e> Tj
 ET
 
@@ -18905,12 +19362,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 125.24000000000001 681.2950000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c67726f757049643e> Tj
 ET
 
@@ -18927,12 +19384,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 273.74 681.2950000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f67726f757049643e> Tj
 ET
 
@@ -18949,12 +19406,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 125.24000000000001 666.5550000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c617274696661637449643e> Tj
 ET
 
@@ -18971,12 +19428,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 251.74 666.5550000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f617274696661637449643e> Tj
 ET
 
@@ -18993,12 +19450,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 103.24000000000001 651.815 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f646570656e64656e63793e> Tj
 ET
 
@@ -19015,12 +19472,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 81.24000000000001 637.075 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f646570656e64656e636965733e> Tj
 ET
 
@@ -19037,12 +19494,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 81.24000000000001 622.335 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c70726f66696c65733e> Tj
 ET
 
@@ -19059,12 +19516,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 103.24000000000001 607.595 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c70726f66696c653e> Tj
 ET
 
@@ -19081,12 +19538,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 125.24000000000001 592.855 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c69643e> Tj
 ET
 
@@ -19103,12 +19560,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 191.24 592.855 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f69643e> Tj
 ET
 
@@ -19125,12 +19582,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 125.24000000000001 578.115 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c61637469766174696f6e3e> Tj
 ET
 
@@ -19147,12 +19604,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 147.24 563.375 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c70726f70657274793e> Tj
 ET
 
@@ -19169,12 +19626,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 169.24 548.635 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c6e616d653e> Tj
 ET
 
@@ -19191,12 +19648,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 279.24 548.635 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f6e616d653e> Tj
 ET
 
@@ -19213,12 +19670,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 147.24 533.895 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f70726f70657274793e> Tj
 ET
 
@@ -19235,12 +19692,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 125.24000000000001 519.155 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f61637469766174696f6e3e> Tj
 ET
 
@@ -19252,7 +19709,18 @@ ET
 BT
 59.24 504.41499999999996 Td
 /F4.0 11 Tf
-<ca20202020202020202020202e2e2e> Tj
+<ca2020202020202020202020> 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
+125.24000000000001 504.41499999999996 Td
+/F4.0 11 Tf
+<2e2e2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -19268,12 +19736,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 103.24000000000001 489.675 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f70726f66696c653e> Tj
 ET
 
@@ -19290,12 +19758,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 103.24000000000001 474.935 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c70726f66696c653e> Tj
 ET
 
@@ -19312,12 +19780,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 125.24000000000001 460.195 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c69643e> Tj
 ET
 
@@ -19334,12 +19802,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 163.74 460.195 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f69643e> Tj
 ET
 
@@ -19356,12 +19824,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 125.24000000000001 445.455 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c61637469766174696f6e3e> Tj
 ET
 
@@ -19378,12 +19846,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 147.24 430.715 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c70726f70657274793e> Tj
 ET
 
@@ -19400,12 +19868,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 169.24 415.97499999999997 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c6e616d653e> Tj
 ET
 
@@ -19422,12 +19890,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 251.74 415.97499999999997 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f6e616d653e> Tj
 ET
 
@@ -19444,12 +19912,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 147.24 401.23499999999996 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f70726f70657274793e> Tj
 ET
 
@@ -19466,12 +19934,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 125.24000000000001 386.49499999999995 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f61637469766174696f6e3e> Tj
 ET
 
@@ -19483,7 +19951,18 @@ ET
 BT
 59.24 371.75499999999994 Td
 /F4.0 11 Tf
-<ca20202020202020202020202e2e2e> Tj
+<ca2020202020202020202020> 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
+125.24000000000001 371.75499999999994 Td
+/F4.0 11 Tf
+<2e2e2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -19499,12 +19978,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 103.24000000000001 357.01499999999993 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f70726f66696c653e> Tj
 ET
 
@@ -19521,23 +20000,23 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 81.24000000000001 342.2749999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f70726f66696c65733e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 59.24 327.5349999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f70726f6a6563743e> Tj
 ET
 
@@ -19645,12 +20124,12 @@ q
 S
 [ ] 0 d
 Q
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 59.24 251.0149999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c6275696c643e> Tj
 ET
 
@@ -19667,12 +20146,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 81.24000000000001 236.27499999999992 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c706c7567696e733e> Tj
 ET
 
@@ -19689,12 +20168,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 103.24000000000001 221.5349999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c706c7567696e3e> Tj
 ET
 
@@ -19711,12 +20190,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 125.24000000000001 206.7949999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c67726f757049643e> Tj
 ET
 
@@ -19733,12 +20212,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 284.74 206.7949999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f67726f757049643e> Tj
 ET
 
@@ -19755,12 +20234,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 125.24000000000001 192.0549999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c617274696661637449643e> Tj
 ET
 
@@ -19777,12 +20256,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 284.74 192.0549999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f617274696661637449643e> Tj
 ET
 
@@ -19799,12 +20278,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 125.24000000000001 177.3149999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c76657273696f6e3e> Tj
 ET
 
@@ -19821,12 +20300,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 257.24 177.3149999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f76657273696f6e3e> Tj
 ET
 
@@ -19843,12 +20322,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 125.24000000000001 162.57499999999993 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c636f6e66696775726174696f6e3e> Tj
 ET
 
@@ -19865,12 +20344,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 147.24 147.83499999999992 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c6170704d616e69666573743e> Tj
 ET
 
@@ -19887,12 +20366,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 383.74 147.83499999999992 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f6170704d616e69666573743e> Tj
 ET
 
@@ -19909,12 +20388,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 147.24 133.0949999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c6a617862436c61737365733e> Tj
 ET
 
@@ -19931,12 +20410,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 169.24 118.35499999999993 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c6a617862436c6173733e> Tj
 ET
 
@@ -19953,12 +20432,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 317.74 103.61499999999992 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f6a617862436c6173733e> Tj
 ET
 
@@ -19975,12 +20454,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 147.24 88.87499999999991 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f6a617862436c61737365733e> Tj
 ET
 
@@ -19997,12 +20476,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 147.24 74.1349999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c73657061726174653e> Tj
 ET
 
@@ -20019,12 +20498,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 229.74 74.1349999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f73657061726174653e> Tj
 ET
 
@@ -20041,12 +20520,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 147.24 59.3949999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c636f6d6d6f6e536368656d61733e> Tj
 ET
 
@@ -20063,12 +20542,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 257.24 59.3949999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f636f6d6d6f6e536368656d61733e> Tj
 ET
 
@@ -20098,23 +20577,22 @@ Q
 
 endstream
 endobj
-133 0 obj
+132 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 132 0 R
+/Contents 131 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F4.0 43 0 R
-/F6.0 101 0 R
 >>
-/XObject << /Stamp1 668 0 R
+/XObject << /Stamp1 667 0 R
 >>
 >>
-/Annots [134 0 R 135 0 R]
+/Annots [133 0 R 134 0 R]
 >>
 endobj
-134 0 obj
+133 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -20125,7 +20603,7 @@ endobj
 /Type /Annot
 >>
 endobj
-135 0 obj
+134 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -20136,7 +20614,7 @@ endobj
 /Type /Annot
 >>
 endobj
-136 0 obj
+135 0 obj
 << /Length 23103
 >>
 stream
@@ -20193,12 +20671,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 125.24000000000001 796.43 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f636f6e66696775726174696f6e3e> Tj
 ET
 
@@ -20215,12 +20693,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 125.24000000000001 781.6899999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c646570656e64656e636965733e> Tj
 ET
 
@@ -20237,12 +20715,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 147.24 766.95 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c646570656e64656e63793e> Tj
 ET
 
@@ -20259,12 +20737,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 169.24 752.21 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c67726f757049643e> Tj
 ET
 
@@ -20281,12 +20759,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 317.74 752.21 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f67726f757049643e> Tj
 ET
 
@@ -20303,12 +20781,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 169.24 737.47 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c617274696661637449643e> Tj
 ET
 
@@ -20325,12 +20803,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 295.74 737.47 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f617274696661637449643e> Tj
 ET
 
@@ -20347,12 +20825,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 1

<TRUNCATED>

[04/44] isis-site git commit: ISIS-1594: provide an 'edit' button

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/release-notes.html
----------------------------------------------------------------------
diff --git a/content/release-notes.html b/content/release-notes.html
index eed9d54..e283e04 100644
--- a/content/release-notes.html
+++ b/content/release-notes.html
@@ -1,12 +1,10 @@
 <!doctype html>
 <html class="no-js" lang="en">
-<head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-
-    <title>Release Notes</title>
-
-    <!--
+ <head> 
+  <meta charset="utf-8"> 
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"> 
+  <title>Release Notes</title> 
+  <!--
         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
@@ -23,31 +21,21 @@
         KIND, either express or implied.  See the License for the
         specific language governing permissions and limitations
         under the License.
-    -->
-
-    <!-- No caching headers -->
-    <meta http-equiv="cache-control" content="no-cache" />
-    <meta http-equiv="pragma" content="no-cache" />
-    <meta http-equiv="expires" content="-1" />
-
-
-    <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
-    <link href="./css/foundation/5.5.1/foundation.css" rel="stylesheet" />
-    <script src="./js/foundation/5.5.1/vendor/modernizr.js"></script>
-    <link href="./css/asciidoctor/colony.css" rel="stylesheet">
-    <link href="./css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-
-
-
-    <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
-    <!--[if lt IE 9]>
+    --> 
+  <!-- No caching headers --> 
+  <meta http-equiv="cache-control" content="no-cache"> 
+  <meta http-equiv="pragma" content="no-cache"> 
+  <meta http-equiv="expires" content="-1"> 
+  <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line --> 
+  <link href="./css/foundation/5.5.1/foundation.css" rel="stylesheet"> 
+  <script src="./js/foundation/5.5.1/vendor/modernizr.js"></script> 
+  <link href="./css/asciidoctor/colony.css" rel="stylesheet"> 
+  <link href="./css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet"> 
+  <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet"> 
+  <!--[if lt IE 9]>
       <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
-    <![endif]-->
-
-
-
-    <style type="text/css">
+    <![endif]--> 
+  <style type="text/css">
         pre code {
             background-color: inherit;
             border-style: none;
@@ -192,9 +180,8 @@ table.CodeRay td.code>pre{padding:0}
         color:#fff;
         font-size: 1.1em;
     }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         @media only screen and (min-width: 40.063em) {
           .top-bar {
             .contain-to-grid .top-bar {
@@ -205,9 +192,8 @@ table.CodeRay td.code>pre{padding:0}
         .row {
             max-width: 80rem;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .extended-quote,
         .extended-quote-first {
             margin-left: 40px;
@@ -231,9 +217,8 @@ table.CodeRay td.code>pre{padding:0}
             text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
         }
         
-    </style>
-
-    <style>
+    </style> 
+  <style>
         body {
           position: relative;
         }
@@ -255,6 +240,7 @@ table.CodeRay td.code>pre{padding:0}
 
         div#doc-content {
             margin-top: 30px;
+            padding-top: 30px;
         }
 
         div.documentation-page table.frame-all {
@@ -286,9 +272,8 @@ table.CodeRay td.code>pre{padding:0}
             min-height: 2000px;
         }
 
-    </style>
-
-    <style>
+    </style> 
+  <style>
 
         @media only screen and (min-width: 768px) {
           #toc.toc2 ul ul { margin-left: -10px; }
@@ -316,15 +301,13 @@ table.CodeRay td.code>pre{padding:0}
         body div#toc2 li.tocify-item.active a {
             color: red;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         footer {
             margin-top: 1000px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* overriding colony.css stylesheet */
         .literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
            /*padding: 1.25em 1.5625em 1.125em 1.5625em;*/
@@ -372,9 +355,8 @@ table.CodeRay td.code>pre{padding:0}
         .imageblock img {
             margin-bottom: 10px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* from http://ben.balter.com/2014/03/13/pages-anchor-links/ */
         .header-link {
           position: absolute;
@@ -395,9 +377,8 @@ table.CodeRay td.code>pre{padding:0}
         h6:hover .header-link {
           opacity: 1;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .top-bar
         {
             -webkit-transition-duration: .5s;
@@ -425,5979 +406,3617 @@ table.CodeRay td.code>pre{padding:0}
             -webkit-transition-property: -webkit-transform;
             transition-property: transform;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         #doc-content a.guide {
             color: white;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .tocify {
             margin-top: 80px;
         }
-    </style>
-
-
-</script>
-
-</head>
-<body>
-
-<<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
-    <div class="github-fork-ribbon">
-        <a href="https://github.com/apache/isis#fork-destination-box">Fork me on GitHub</a>
-    </div>
-</div>
-
-
-<div class="row">
-
-    <div class="fixed contain-to-grid header">
-        <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
-            <ul class="title-area">
-                <li class="name">
-                    <h1>
-                        <a href="/index.html">Apache Isis&trade;</a>
-                    </h1>
-                </li>
-                <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
-                <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
-            </ul>
-
-            <section class="top-bar-section">
-                <ul class="right">
-
-                    <li class="has-form">
-                       <FORM class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
-                        <div class="row collapse">
-                            <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
-                            <INPUT type="hidden" name="cof" value="FORID:0">
-                            <INPUT class="form-control" name="q" type="text" placeholder="Search">
-                        </div>
-                    </FORM>
-                     </li>
-
-                </ul>
-
-                <!-- Left Nav Section -->
-                <ul class="left">
-
-                    <li><a href="/documentation.html">Documentation</a></li>
-                    <li><a href="/downloads.html">Downloads</a></li>
-                    <li><a href="/help.html">Help</a></li>
-                    <li><a href="/asf.html">@ASF</a></li>
-
-                </ul>
-
-            </section>
-        </nav>
-    </div>
-</div>
-
-<div class="row">
-
-    <div id="doc-content-left" class="large-9 medium-9 columns">
-
-
-        <div id="doc-content">
-          <div class="sect1">
-<h2 id="_summary">Summary</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>This table summarises all releases of Apache Isis to date.</p>
-</div>
-<table class="tableblock frame-all grid-all spread">
-<colgroup>
-<col style="width: 7.6923%;">
-<col style="width: 15.3846%;">
-<col style="width: 30.7692%;">
-<col style="width: 7.6923%;">
-<col style="width: 7.6923%;">
-<col style="width: 7.6923%;">
-<col style="width: 23.077%;">
-</colgroup>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Version</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Date</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Release notes</p>
-</div></div></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">Features</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">Improves</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">Bugs</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>JIRA relnotes</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.14.0">1.14.0</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">19-02-2017</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Actions with collection parameters, metamodel validations.</p>
-</div></div></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">3</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">11</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">11</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&amp;version=12338898">Release notes for v1.14.0</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.13.2.1">1.13.2.1</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">03-jan-2017</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Patch release for simpleapp archetype only (docker images, regular actions instead of mixins)</p>
-</div></div></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">0</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">2</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">0</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&amp;version=12338937">Release notes for v1.13.2.1</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.13.2.1">1.13.2</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">14-dec-2016</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Patch release, modular simpleapp archetype</p>
-</div></div></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">2</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">9</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">5</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&amp;version=12338744">Release notes for v1.13.2</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.13.1">1.13.1</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">30-oct-2016</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Patch release, better support for docker</p>
-</div></div></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">1</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">13</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">21</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&amp;version=12337967">Release notes for v1.13.1</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.13.0">1.13.0</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">11-jul-2016</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Commands, interactions and internal refactorings</p>
-</div></div></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">27</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">50</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">23</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&amp;version=12335362">Release notes for v1.13.0</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.12.2">1.12.2</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">06-jun-2016</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Bug-fix release</p>
-</div></div></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">0</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">0</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">2</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&amp;version=12335949">Release notes for v1.12.2</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.12.1">1.12.1</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">12-apr-2016</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Bug-fix release</p>
-</div></div></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">0</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">0</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">4</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&amp;version=12335484">Release notes for v1.12.1</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.12.0">1.12.0</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">29-mar-2016</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Dynamic XML layouts</p>
-</div></div></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">7</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">21</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">21</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&amp;version=12327483">Release notes for v1.12.0</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.11.1">1.11.1</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">17-jan-2016</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Re-release under Java 1.7 (using toolchains plugin).</p>
-</div></div></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">0</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">0</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">1</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&amp;version=12334640">Release notes for v1.11.1</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.11.0">1.11.0</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">02-jan-2016</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>More flexible REST API, view models using JAXB.</p>
-</div></div></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">9</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">19</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">12</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&amp;version=12333974">Release notes for v1.11.0</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.10.0">1.10.0</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">10-nov-2015</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>New domain services, multi-tenancy support and mixins.</p>
-</div></div></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">7</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">18</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">12</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&amp;version=12333354">Release notes for 1.10.0</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.9.0">1.9.0</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">1-sep-2015</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>AppManifest, Restful Objects representations and other "under-the-cover" improvements.</p>
-</div></div></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">18</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">50</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">25</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&amp;version=12332806">Release notes for 1.9.0</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.8.0">1.8.0</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">24-feb-2015</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Wicket viewer moved into core; todoapp archetype moved to <a href="http://www.isisaddons.org">Isis Addons</a> (non-ASF).</p>
-</div></div></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">27</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">41</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">20</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="ulist">
-<ul>
-<li>
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&amp;version=12328845">core-1.8.0</a></p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&amp;version=12328847">archetype-1.8.0</a></p>
-</li>
-</ul>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.7.0">1.7.0</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">18-oct-2014</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Module functionality previously in 1.6.0 now retired; use <a href="http://isisaddons.org">Isis Addons</a> (non-ASF) instead.</p>
-</div></div></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">4</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">9</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">20</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="ulist">
-<ul>
-<li>
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&amp;version=12326453">core-1.7.0</a></p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&amp;version=12326460">viewer-wicket-1.7.0</a></p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&amp;version=12327441">archetype-simpleapp-1.7.0</a></p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&amp;version=12327440">archetype-todoapp-1.7.0</a></p>
-</li>
-</ul>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.6.0">1.6.0</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">28-jul-2014</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Restful Objects viewer, JDO/Datanucleus Objectstore and Shiro Security all moved into core.  Quickstart-wrj archetype renamed to todoapp; simple-wrj archetype renamed to simpleapp.  Some functionality copied/refactored as <a href="http://www.isisaddons.org">Isis Addons</a> (non-ASF).</p>
-</div></div></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">6</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">12</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">15</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="ulist">
-<ul>
-<li>
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&amp;version=12325314">core-1.6.0</a></p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&amp;version=12325318">viewer-wicket-1.6.0</a></p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&amp;version=12326462">archetype-simpleapp-1.6.0</a></p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&amp;version=12326461">archetype-todoapp-1.6.0</a></p>
-</li>
-</ul>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.5.0">1.5.0</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">08-jun-2014</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>No longer releasing security-file</p>
-</div></div></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">3</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">19</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">13</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="ulist">
-<ul>
-<li>
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&amp;version=12326524">core-1.5.0</a></p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&amp;version=12326525">objectstore-jdo-1.5.0</a></p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&amp;version=12326529">security-shiro-1.5.0</a></p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&amp;version=12326947">viewer-restfulobjects-2.3.0</a></p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&amp;version=12326526">viewer-wicket-1.5.0</a></p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&amp;version=12326528">archetype-simple-wrj-1.5.0</a></p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&amp;version=12326527">archetype-quickstart-wrj-1.5.0</a></p>
-</li>
-</ul>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.4.1">1.4.1</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">14-mar-2014</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Patch release</p>
-</div></div></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">0</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">2</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">2</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="ulist">
-<ul>
-<li>
-<p>objectstore-jdo-1.4.1</p>
-</li>
-<li>
-<p>viewer-wicket-1.4.1</p>
-</li>
-<li>
-<p>archetype-simple-wrj-1.4.1</p>
-</li>
-<li>
-<p>archetype-quickstart-wrj-1.4.1</p>
-</li>
-</ul>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.4.0">1.4.0</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">11-mar-2014</p></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">56</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">62</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">26</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="ulist">
-<ul>
-<li>
-<p>core-1.4.0</p>
-</li>
-<li>
-<p>objectstore-jdo-1.4.0</p>
-</li>
-<li>
-<p>security-file-1.4.0</p>
-</li>
-<li>
-<p>security-shiro-1.4.0</p>
-</li>
-<li>
-<p>viewer-restfulobjects-2.2.0</p>
-</li>
-<li>
-<p>viewer-wicket-1.4.0</p>
-</li>
-<li>
-<p>archetype-simple-wrj-1.4.0</p>
-</li>
-<li>
-<p>archetype-quickstart-wrj-1.4.0</p>
-</li>
-</ul>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.3.1">1.3.1</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">7-nov-2013</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Patch release</p>
-</div></div></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">1</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">0</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">3</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="ulist">
-<ul>
-<li>
-<p>viewer-wicket-1.3.1</p>
-</li>
-<li>
-<p>archetype-simple-wrj-1.3.1</p>
-</li>
-<li>
-<p>archetype-quickstart-wrj-1.3.1</p>
-</li>
-</ul>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.8.0">1.3.0</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">25-oct-2013</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>WRJ archetype renamed to Quickstart WRJ.  Simple WRJ archetype added.</p>
-</div></div></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">52</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">61</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">30</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="ulist">
-<ul>
-<li>
-<p>core-1.3.0</p>
-</li>
-<li>
-<p>objectstore-jdo-1.3.0</p>
-</li>
-<li>
-<p>security-file-1.0.2</p>
-</li>
-<li>
-<p>security-shiro-1.3.0</p>
-</li>
-<li>
-<p>viewer-restfulobjects-2.1.0</p>
-</li>
-<li>
-<p>viewer-wicket-1.3.0</p>
-</li>
-<li>
-<p>archetype-simple-wrj-1.3.0</p>
-</li>
-<li>
-<p>archetype-quickstart-wrj-1.3.0</p>
-</li>
-</ul>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.2.0">1.2.0</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">30-may-2013</p></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">22</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">41</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">15</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="ulist">
-<ul>
-<li>
-<p>core-1.2.0</p>
-</li>
-<li>
-<p>objectstore-jdo-1.2.0</p>
-</li>
-<li>
-<p>security-file-1.0.1</p>
-</li>
-<li>
-<p>security-shiro-1.1.1</p>
-</li>
-<li>
-<p>viewer-restfulobjects-2.0.0</p>
-</li>
-<li>
-<p>viewer-wicket-1.2.0</p>
-</li>
-<li>
-<p>archetype-wrj-1.0.3</p>
-</li>
-</ul>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.1.0">1.1.0</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">31-jan-2013</p></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">9</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">18</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">8</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="ulist">
-<ul>
-<li>
-<p>core-1.1.0</p>
-</li>
-<li>
-<p>security-shiro-1.1.0</p>
-</li>
-<li>
-<p>viewer-wicket-1.1.0</p>
-</li>
-<li>
-<p>archetype-wrj-1.0.2</p>
-</li>
-</ul>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.0.1">1.0.1</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">10-jan-2013</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Combining RestfulObjects and Wicket viewers into a single webapp, along with Shiro security</p>
-</div></div></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">1</p></td>
-<td class="tableblock halign-right valign-top"></td>
-<td class="tableblock halign-right valign-top"></td>
-<td class="tableblock halign-left valign-top"><div><div class="ulist">
-<ul>
-<li>
-<p>security-shiro-1.0.0</p>
-</li>
-<li>
-<p>archetype-wrj-1.0.1</p>
-</li>
-</ul>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#r1.0.0">1.0.0</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">24-dec-2012</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>First release having graduated</p>
-</div></div></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">8</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">33</p></td>
-<td class="tableblock halign-right valign-top"><p class="tableblock">6</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="ulist">
-<ul>
-<li>
-<p>core-1.0.0</p>
-</li>
-<li>
-<p>security-file-1.0.0</p>
-</li>
-<li>
-<p>viewer-wicket-1.0.0</p>
-</li>
-<li>
-<p>viewer-restfulobjects-1.0.0</p>
-</li>
-<li>
-<p>archetype-wrj-1.0.0</p>
-</li>
-</ul>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">0.2.0-incubating</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">20-feb-2012</p></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-<td class="tableblock halign-right valign-top"></td>
-<td class="tableblock halign-right valign-top"></td>
-<td class="tableblock halign-right valign-top"></td>
-<td class="tableblock halign-left valign-top"><div><div class="ulist">
-<ul>
-<li>
-<p>0.2.0-incubating</p>
-</li>
-</ul>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">0.1.2-incubating</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">13-jul-2011</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>First release in the ASF incubator</p>
-</div></div></td>
-<td class="tableblock halign-right valign-top"></td>
-<td class="tableblock halign-right valign-top"></td>
-<td class="tableblock halign-right valign-top"></td>
-<td class="tableblock halign-left valign-top"><div><div class="ulist">
-<ul>
-<li>
-<p>0.1.2-incubating</p>
-</li>
-</ul>
-</div></div></td>
-</tr>
-</tbody>
-</table>
-</div>
-</div>
-<div class="sect1">
-<h2 id="r1.14.0">1.14.0</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Apache Isis 1.14.0 introduces one significant new feature, namely the ability to invoke actions with collection parameters.
-This is rendered by the Wicket viewer as a multi-select drop-down.
-It is also captured in the DTO/XML for both commands and published interaction events.
-Note though that Restful Objects viewer currently does not provide any support.</p>
-</div>
-<div class="paragraph">
-<p>Also included in the release are a number of minor improvements.
-In particular, there are now a number of metamodel validations intended to make it apps already in production easier to refactor.
-These include a new <code>objectType</code> attribute for <code>@DomainService</code>, analogous to the same attribute on <code>@DomainObject</code>.
-The <code>EmailService</code> has been improved so it is easier to use in system test (non-prod) environments.
-Finally, a new <code>TableColumnOrderService</code> to allow column order to be fine-tuned.</p>
-</div>
-<div class="paragraph">
-<p>The release also has a number of bug fixes.</p>
-</div>
-<div class="paragraph">
-<p>Most applications written against v1.13.x should run against v1.14.0 with few if any changes.
-That said, do recommend that you read and keep in mind the <a href="migration-notes.html#_migration-notes_1.13.0-to-1.14.0.adoc">migration notes</a> when you upgrade your app.</p>
-</div>
-<div class="sect2">
-<h3 id="_new_feature">New Feature</h3>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1529">ISIS-1529</a> - TableColumnOrderService, to allow column order to be fine-tuned (or columns suppressed)</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-709">ISIS-709</a> - Support multi-select for the drop-down box</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-785">ISIS-785</a> - Invoke action parameter with a collection of entities.</p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_improvement">Improvement</h3>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1587">ISIS-1587</a> - Extend "explicitObjectType" checking to also take in view models.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1586">ISIS-1586</a> - Rationalize the way that service instances are referenced by RO vs rest of the framework</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1584">ISIS-1584</a> - Metamodel validation to flag for any contributed services (rather than mixins)</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1582">ISIS-1582</a> - Extend 'explicitObjectType' checking to domain services</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1581">ISIS-1581</a> - MetaModel validator should (if configured) check that an object type has been explicitly specified.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1580">ISIS-1580</a> - Should throw a metamodel validation exception if JDOQL FROM clause or VARIABLES clause invalid.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1567">ISIS-1567</a> - Replace jetty-uber with jetty-servlet and jetty-webapp</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1557">ISIS-1557</a> - Enhance EmailServiceDefault, to optionally throw exception if fail, and optionally allow overrides</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1555">ISIS-1555</a> - DomainChangeJdoAbstract (super of command, audit etc) shouldn&#8217;t throw exception if target class is unknown.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1512">ISIS-1512</a> - MetaModelValidator should detect domain services that have collections, and fail-fast.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1501">ISIS-1501</a> - MetaModel validator for mixin that doesn&#8217;t have a public constructor with a single parameter</p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_bug">Bug</h3>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1578">ISIS-1578</a> - Should throw a metamodel validation exception if a disable or hide method has any params.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1577">ISIS-1577</a> - The transactionId within a command XML does not correspond with the transactionId of the command&#8217;s metadata.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1574">ISIS-1574</a> - Throws exception if layout.xml references unknown property.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1573">ISIS-1573</a> - ISIS_OPTS incorrectly ignores values that have an '=' sign in them.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1571">ISIS-1571</a> - Should throw metamodel validation error if omit choices or autoComplete for parameter collection type.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1570">ISIS-1570</a> - CSS spacing incorrect for action buttons placed below when there are also action placed to right</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1566">ISIS-1566</a> - Allow datanucleus.ConnectionPasswordDecrypter to be used to decrypt password.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1565">ISIS-1565</a> - Fixes @MemberOrder so that the 4 default mixin actions are automatically associated with the 3 default mixin properties</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1564">ISIS-1564</a> - Attempt to invoke no-arg bookmarked action, throws stacktraceexception.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1526">ISIS-1526</a> - WebServer --port option not working</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1478">ISIS-1478</a> - Setting Editing.ENABLED does not seem to override configuration property set to disabled.</p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_documentation">Documentation</h3>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1532">ISIS-1532</a> - Move DN OS cfg props to DN OS guide</p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_task">Task</h3>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1561">ISIS-1561</a> - Release 1.14.0</p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="r1.13.2.1">1.13.2.1</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Update for the simpleapp archetype only, which improves docker support as well as reducing amount of boilerplate by backing out some of the mixins.
-It also fixes an issue with the fixture scripts (noted in previous release).</p>
-</div>
-<div class="sect2">
-<h3 id="_improvement_2">Improvement</h3>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1559">ISIS-1559</a> - Remove the mixins from the simpleapp archetype - adds too much boilerplate</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1558">ISIS-1558</a> - Extend simpleapp archetype to also build docker images</p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_task_2">Task</h3>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1560">ISIS-1560</a> - Release 1.13.2.1 archetype</p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="r1.13.2">1.13.2</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>This is a maintenance release with a number of minor improvements and bug fixes.
-If these the main improvement is that the simpleapp archetype has been substantially reworked to be more modular.</p>
-</div>
-<div class="paragraph">
-<p>This release also closes the ticket to provide a better DB migration story; this has been implemented by way of the (non-ASF) <a href="http://github.com/isisaddons/isis-module-flywaydb">Isis addons' flywaydb</a> module.</p>
-</div>
-<div class="sect2">
-<h3 id="_new_feature_2">New Feature</h3>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1542">ISIS-1542</a> - Update simpleapp application/archetype to provide access to HSQL DB Manager (via their Swing UI) when running in-memory</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1471">ISIS-1471</a> - Integrate Flyway or Liquibase or something similar (see (non-ASF) <a href="http://github.com/isisaddons/isis-module-flywaydb">Isis addons' flywaydb</a> module.</p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_improvement_3">Improvement</h3>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1554">ISIS-1554</a> - Prevent double click on buttons (which can cause applications to throw an error, eg concurrency exception)</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1553">ISIS-1553</a> - If in prototyping mode, shouldn&#8217;t have to keep logging in when restart (rememberMe should activate)</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1552">ISIS-1552</a> - Use 'readonly' rather than 'disabled' tag, in compliance with w3c spec (Firefox and Chrome 54+)</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1550">ISIS-1550</a> - Remove metamodel validation that insists on at least one @PersistenceCapable class.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1548">ISIS-1548</a> - Allow @Mixin annotation to specify the method name to use (instead of '$$') meaning to infer the mixin name from the mixin type. Also, allow '$' to be used as separator of the mixin type.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1546">ISIS-1546</a> - Reduce logging (don&#8217;t show stack traces) for invalid user/pass attempts</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1543">ISIS-1543</a> - IsisConfigurationBuilder should obfuscate password when logged.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1538">ISIS-1538</a> - Rework simpleapp archetype so that is more modular.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1503">ISIS-1503</a> - Allow security checking be disabled when running via SudoService.</p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_bug_2">Bug</h3>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1545">ISIS-1545</a> - QueryResultsCache can sometimes result in throwing an exception if not properly initialized when fixtures being installed.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1541">ISIS-1541</a> - When no explicit layout xml is available the order of the members is set to incorrect, ignoring other facets</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1533">ISIS-1533</a> - Fix edit icon offset for boolean, referencem blob, clob and multilinestring panels</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1524">ISIS-1524</a> - Dates not showing in view model</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1496">ISIS-1496</a> - A domainobject annotated with @DomainObject(auditing = Auditing.DISABLED) is audited nonetheless</p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_task_3">Task</h3>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1540">ISIS-1540</a> - Release tasks for 1.13.2</p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="r1.13.2">1.13.2</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>This is a maintenance release with a number of minor improvements and bug fixes.
-If these the main improvement is that the simpleapp archetype has been substantially reworked to be more modular.</p>
-</div>
-<div class="paragraph">
-<p>This release also closes the ticket to provide a better DB migration story; this has been implemented by way of the (non-ASF) <a href="http://github.com/isisaddons/isis-module-flywaydb">Isis addons' flywaydb</a> module.</p>
-</div>
-<div class="sect2">
-<h3 id="_new_feature_3">New Feature</h3>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1542">ISIS-1542</a> - Update simpleapp application/archetype to provide access to HSQL DB Manager (via their Swing UI) when running in-memory</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1471">ISIS-1471</a> - Integrate Flyway or Liquibase or something similar (see (non-ASF) <a href="http://github.com/isisaddons/isis-module-flywaydb">Isis addons' flywaydb</a> module.</p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_improvement_4">Improvement</h3>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1554">ISIS-1554</a> - Prevent double click on buttons (which can cause applications to throw an error, eg concurrency exception)</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1553">ISIS-1553</a> - If in prototyping mode, shouldn&#8217;t have to keep logging in when restart (rememberMe should activate)</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1552">ISIS-1552</a> - Use 'readonly' rather than 'disabled' tag, in compliance with w3c spec (Firefox and Chrome 54+)</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1550">ISIS-1550</a> - Remove metamodel validation that insists on at least one @PersistenceCapable class.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1548">ISIS-1548</a> - Allow @Mixin annotation to specify the method name to use (instead of '$$') meaning to infer the mixin name from the mixin type. Also, allow '$' to be used as separator of the mixin type.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1546">ISIS-1546</a> - Reduce logging (don&#8217;t show stack traces) for invalid user/pass attempts</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1543">ISIS-1543</a> - IsisConfigurationBuilder should obfuscate password when logged.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1538">ISIS-1538</a> - Rework simpleapp archetype so that is more modular.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1503">ISIS-1503</a> - Allow security checking be disabled when running via SudoService.</p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_bug_3">Bug</h3>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1545">ISIS-1545</a> - QueryResultsCache can sometimes result in throwing an exception if not properly initialized when fixtures being installed.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1541">ISIS-1541</a> - When no explicit layout xml is available the order of the members is set to incorrect, ignoring other facets</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1533">ISIS-1533</a> - Fix edit icon offset for boolean, referencem blob, clob and multilinestring panels</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1524">ISIS-1524</a> - Dates not showing in view model</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1496">ISIS-1496</a> - A domainobject annotated with @DomainObject(auditing = Auditing.DISABLED) is audited nonetheless</p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_task_4">Task</h3>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1540">ISIS-1540</a> - Release tasks for 1.13.2</p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="r1.13.1">1.13.1</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>This is a maintenance release with a number of minor improvements and bug fixes.
-It also provides better support for docker, by allowing configuration properties to be overridden using either system properties or an ISIS_OPT environment variable.</p>
-</div>
-<div class="sect2">
-<h3 id="_new_feature_4">New Feature</h3>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1510">ISIS-1510</a> - Improve support for docker containers by allowing isis configuration properties to be overridden using either system properties or an ISIS_OPT environment variable</p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_improvement_5">Improvement</h3>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1527">ISIS-1527</a> - Make overlays consistent for editable properties, with general fix for Firefox</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1522">ISIS-1522</a> - Remove unused field declarations</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1519">ISIS-1519</a> - Deprecate JdoColumnLength in applib, instead define types</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1518">ISIS-1518</a> - Hide and replace certain UI fragments</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1514">ISIS-1514</a> - Hide the calendar hint on the date time (users tend to click on it)</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1508">ISIS-1508</a> - The integration test framework should be more resilient to badly behaved tests that leave the transaction incomplete</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1507">ISIS-1507</a> - QueryResultsCache should be disabled while fixture scripts are running.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1505">ISIS-1505</a> - MetaModelService should return an unknown enum rather than throw exception, eg if passed an java.lang.Object.class.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1499">ISIS-1499</a> - Improve BookmarkService to be able to "lookup" domain services, so that can schedule background commands against a service.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1495">ISIS-1495</a> - Extend SessionLoggingService.CausedBy enum, so can mark as complete any log entries that are still shown as ongoing when app (re)starts</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1492">ISIS-1492</a> - Adding css-class to object forms</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1491">ISIS-1491</a> - Changed all occurrences of allowNulls and allowsNulls in the docs to</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1476">ISIS-1476</a> - Transaction interface: Expose "clearAbortCause" for don&#8217;t pick up handled persistence Exceptions</p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_bug_4">Bug</h3>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1525">ISIS-1525</a> - Problems with startup under certain circumstances</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1524">ISIS-1524</a> - Dates not showing in view model</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1520">ISIS-1520</a> - Amelia template is broken</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1517">ISIS-1517</a> - Typo on home page</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1516">ISIS-1516</a> - Typo on home page</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1515">ISIS-1515</a> - BackgroundCommandExecution can NPE if it attempts to invoke an action on an object that no longer exists.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1502">ISIS-1502</a> - Error handling of invalid domain object not strong enough, causing infinite loop in endTransaction.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1498">ISIS-1498</a> - BackgroundCommandExecution does not handle exceptions correctly.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1497">ISIS-1497</a> - AbstractIsisSessionTemplate does not lookup adapter for OidDtos correctly.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1494">ISIS-1494</a> - EmailNotificationServiceDefault does not use overriding implementations of EmailService</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1493">ISIS-1493</a> - Sorting of records with null values is not working correctly</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1490">ISIS-1490</a> - Fix 'svg' suffix in ImageResourceCacheClassPath</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1483">ISIS-1483</a> - Tiny bug in the SimpleObjectTest unit test as generated by the simpleapp.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1482">ISIS-1482</a> - Occasional(?) exception in i18n PoWriter, looks like a concurrent access problem</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1481">ISIS-1481</a> - Duplicate PK exception for SessoinLogEntry (isisaddons implementation of SessionLoggingService) due to race condition.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1480">ISIS-1480</a> - LocalDateTime property on different tabs, encoding exception</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1477">ISIS-1477</a> - Background command execution of commands with 0 parameters causes an NPE</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1475">ISIS-1475</a> - Application name not set</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1474">ISIS-1474</a> - Cannot use custom implementation of authenticationmanager (ShiroWithOAuth2AuthenticationManagerInstaller)</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1472">ISIS-1472</a> - Any attempts to schedule a background job via the RO viewer fail, due to incomplete state. (In fact: actions with commands cannot be invoked via RO viewer).</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1470">ISIS-1470</a> - Maintenance 1.13.1 umbrella ticket</p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="r1.13.0">1.13.0</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Apache Isis 1.13.0 improves and formalizes the support for commands and auditing, and introduces the new concept of an
-interaction.  A command now represents the <em>intention</em> to interact with the application, either to invoke an action or
-to edit a property.  This is captured as a JAXB DTO.  An interaction on the other hand captures the fact that a
-command has been performed.  Interactions are also captured as DTOs.  Interactions can include sub-interactions,
-representing the fact that an action can invoke another action by way of the
-<a href="guides/rgsvc.html#_rgsvc_api_WrapperFactory"><code>WrapperFactory</code></a>.</p>
-</div>
-<div class="paragraph">
-<p>The existing <a href="guides/rgsvc.html#_rgsvc_spi_AuditingService"><code>AuditingService</code></a> and
-<a href="guides/rgsvc.html#_rgsvc_spi_PublishingService"><code>PublishingService</code></a> SPI services have both been deprecated, instead
-replaced by <a href="guides/rgsvc.html#_rgsvc_spi_AuditerService"><code>AuditerService</code></a> and
-<a href="guides/rgsvc.html#_rgsvc_spi_PublisherService"><code>PublisherService</code></a>.  It is now possible to have multiple implementations
-of each.</p>
-</div>
-<div class="paragraph">
-<p>The (non-ASF) <a href="http://github.com/isisaddons/isis-module-auditing">Isis addons' auditing</a> module has been reworked to
-implement <a href="guides/rgsvc.html#_rgsvc_spi_AuditService"><code>AuditService</code></a>, while the new (non-ASF)
-<a href="http://github.com/isisaddons/isis-module-publishmq">Isis addons' publishmq</a> module implements
-<a href="guides/rgsvc.html#_rgsvc_spi_PublisherService"><code>PublisherService</code></a> to publish interaction events to an ActiveMQ bus (and
-to allow such events to be replayed if necessary).</p>
-</div>
-<div class="paragraph">
-<p>The release also includes a great deal of internal refactorings and simplifications.</p>
-</div>
-<div class="paragraph">
-<p>Most applications written against v1.12.x should run against v1.13.0 with few if any changes.  That said, this release
-has removed a small number of features that were dependent on internal APIs, and some configuration properties are
-now removed/unsupported.  We therefore do recommend that you read and keep in mind the <a href="migration-notes.html#_migration-notes_1.12.0-to-1.13.0.adoc">migration notes</a> when you upgrade your app.</p>
-</div>
-<div class="sect2">
-<h3 id="_new_feature_5">New Feature</h3>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1446">ISIS-1446</a> - Extend the Wicket viewer client-side file-open-dialog to allow file extension to be specified.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1433">ISIS-1433</a> - New configuration option to allow a minimum/maximum date to be specified for date pickers.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1421">ISIS-1421</a> - Possible object deadlock when under load.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1420">ISIS-1420</a> - To support dockerization, have any overrides.properties file take precedence over any other config properties</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1418">ISIS-1418</a> - Support @Nullable for parameters and properties</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1413">ISIS-1413</a> - Gradle script (and docs) in simpleapp archetype to auto-enhance and for dynamic layouts, also liveReload</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1399">ISIS-1399</a> - MetricsService to capture within InteractionContext, for profiling.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1390">ISIS-1390</a> - Provide a default CommandService, to return CommandDefault.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1389">ISIS-1389</a> - New InteractionContext service and Interaction to handle the execution of commands.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1385">ISIS-1385</a> - Improve DomainChangeJdoAbstract (superclass of commands, audits etc) so cannot "open" target object if a domain service.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1384">ISIS-1384</a> - Extend MetaModelService to indicate what "sort of" object a given domain type represents.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1381">ISIS-1381</a> - Extend ActionInvocationMementoDto (XSD) to apply to bulk actions (a list of targets and perhaps list of mixins).</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1380">ISIS-1380</a> - ActionInvocationMementoDTO to capture stacktrace, if any, when an action is invoked.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1379">ISIS-1379</a> - ActionInvocationMementoDto (XSD) should hold subactions.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1378">ISIS-1378</a> - ActionInvocationMementoDTO (XSD) returned object also indicates its type (same as parameters)</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1377">ISIS-1377</a> - ActionInvocationMementoDto (XSD) with majorVersion and minorVersion, so that each instance identifies the "logical" version of the schema with which it is compatible.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1376">ISIS-1376</a> - ActionInvocationMementoDto (XSD) to capture end time of each action invocation.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1375">ISIS-1375</a> - extend BackgroundCommandService to be able to invoke mixed-in actions.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1374">ISIS-1374</a> - extend BackgroundCommandService to be able to invoke mixed-in actions.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1373">ISIS-1373</a> - Have isis-core-applib depend upon isis-core-schema</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1372">ISIS-1372</a> - Change BackgroundCommandService to work with new Command DTO</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1370">ISIS-1370</a> - New PublisherService to simplify and replace PublishingService.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1368">ISIS-1368</a> - The (new) PublisherService API should provide the ability to republish (action) commands.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1291">ISIS-1291</a> - Define new DTO (XSD) as the memento for Command#setMemento</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-855">ISIS-855</a> - Allow contributed actions to be renamed in the contributee</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-542">ISIS-542</a> - Restrict which entities a service action is contributed to (as either a contributed action or contributed assocation).</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-292">ISIS-292</a> - Remove Authenticator#isValid method; should not be defined as part of API.</p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_improvement_6">Improvement</h3>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1464">ISIS-1464</a> - DomainChangeJdoAbstract#openTarget should support looking up view models</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1462">ISIS-1462</a> - A new user has some trouble navigating to a single item in a collection using wicket ui</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1460">ISIS-1460</a> - Position edit link on top of string field.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1459">ISIS-1459</a> - Add AppManifest.Util class to set up common configuration properties for running in-memory</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1457">ISIS-1457</a> - PoWriter shouldn&#8217;t log on shutdown if there are metamodel validation exceptions</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1455">ISIS-1455</a> - Improve metamodel invalid exception handling</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1449">ISIS-1449</a> - Rename 'isis.viewer.wicket.suppressRememberMe' to 'isis.viewer.wicket.rememberMe.suppress'</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1448">ISIS-1448</a> - Reinstate component factory for collections, so that they can be easily substituted.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1447">ISIS-1447</a> - Avoid possible race-condition resulting in 500 errors under the Restful Objects viewer</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1445">ISIS-1445</a> - Tab names (in XML layouts) should be translated via TranslationService</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1443">ISIS-1443</a> - Refactor specloader so that specs for domain services are marked as a service from the get-go</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1442">ISIS-1442</a> - Mark some applib classes as @Value in order to reduce size of the metamodel (don&#8217;t mixin to these).</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1441">ISIS-1441</a> - Remove subclass of AuthenticationManagerStandard in isis-core-runtime.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1438">ISIS-1438</a> - Set up JAXBContext for ChangesDtoUtils and the others in a background thread.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1437">ISIS-1437</a> - Configure slow-running Wicket bootstrapping in separate background threads.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1430">ISIS-1430</a> - Deprecate AuditingService3 and replace with AuditerService, with transactions identified by &#8230;&#8203;</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1429">ISIS-1429</a> - Remove unused code.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1428">ISIS-1428</a> - Remove unnecessary 'synchronized' modifiers</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1427">ISIS-1427</a> - Simplify bootstrapping code</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1426">ISIS-1426</a> - Remove unused log4j appender classes</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1425">ISIS-1425</a> - Fix support for publishing of wrapper calling programmatically instantiated mixin.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1419">ISIS-1419</a> - Simplify session management handling (IllegalStateException when integ tests complete).</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1417">ISIS-1417</a> - For faster start-ups, allow any deprecated facets to simply be ignored.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1416">ISIS-1416</a> - To reduce application bootstrap times, allow set&#8230;&#8203;() and inject&#8230;&#8203;() style of dependency injection to be diabled.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1415">ISIS-1415</a> - Reduce app startup times by lazily initializing the ApplicationFeatureRepository,</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1411">ISIS-1411</a> - Refactoring - simplify PersistenceSession.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1410">ISIS-1410</a> - Minor performance improvements/refactorings (no functional change)</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1409">ISIS-1409</a> - Simplify RuntimeContext (internal bootstrapping)</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1408">ISIS-1408</a> - Simplify InstallerLookup and IsisComponentProvider (internal bootstrapping)</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1407">ISIS-1407</a> - Refactor SpecificationLoader into an internal domain service.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1406">ISIS-1406</a> - Refactor IsisConfigurationDefault and the metamodel.ConfigurationService into an internal domain service</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1404">ISIS-1404</a> - Refactor AuthenticationSessionProvider as an internal domain service.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1398">ISIS-1398</a> - Refactor PropertySetterFacet to follow the pattern for ActionInvocationFacet.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1397">ISIS-1397</a> - Generalize ActionInvocationMemento to also capture property modifications. Rename to MemberInteractionMemento.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1392">ISIS-1392</a> - Extend RepositoryService with persistAndFlush(&#8230;&#8203;) and removeAndFlush(&#8230;&#8203;) methods</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1387">ISIS-1387</a> - Ensure that generated bs3 layout XML files include a suitable namespace prefix.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1386">ISIS-1386</a> - Ensure that generated aim, cmd or common memento XML include a suitable namespace prefix.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1371">ISIS-1371</a> - ActionInvocationMementoDto (XSD) to capture the mixed-in object (if any).</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1369">ISIS-1369</a> - Add missing tests for AppFeature</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1367">ISIS-1367</a> - Extend MetaModelService to expose the nature of a domain service. Have DomainObjectContainer#isViewModel(&#8230;&#8203;) delegate to it.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1366">ISIS-1366</a> - Add svg image suffix support (PR #38)</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1365">ISIS-1365</a> - DomainObjectContainerDefault should delegate to RepositoryService (and others) where possible.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1364">ISIS-1364</a> - Improve Asciidoc and Javadoc for migrating from DomainObjectContainer#persist() to RepositoryService#persist()</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1359">ISIS-1359</a> - Action annotated as autoCompleteAction cannot be annotated with @Programmatic. This should be possible.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1356">ISIS-1356</a> - Install a BulkFacet even if @Action( invokeOn=OBJECTS_ONLY)</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1352">ISIS-1352</a> - collapse IsisSystemFactoryThatUsesInstallers up to IsisSystemFactory</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1344">ISIS-1344</a> - Remove the *Transaction facets</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1343">ISIS-1343</a> - Properly handle domain events from mixins, exposing the underlying "mixedIn" domain object.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1338">ISIS-1338</a> - Extend ResourceServlet and simpleapp archetype for SVG image type.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1256">ISIS-1256</a> - Shiro has a vulnerabilty for default rememberMe cookie. We should work around this somehow</p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_bug_5">Bug</h3>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1461">ISIS-1461</a> - More reliable fix to concurrency exception</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1458">ISIS-1458</a> - Possible incomplete auditing for "non-trivial" updates</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1454">ISIS-1454</a> - Hints for drop-downs in Wicket viewer not honoured.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1453">ISIS-1453</a> - SessionManagementService#nextSession broken</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1452">ISIS-1452</a> - Throwing an exception (for -SNAPSHOT) does not abort the transaction.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1444">ISIS-1444</a> - Mark applib FixtureScript.Execution methods as @Programmatic to avoid being added to the metamodel</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1436">ISIS-1436</a> - When executing a bulk action on a paginated collection items, chosen items can be ignored unintentionally</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1435">ISIS-1435</a> - Infitinite recursion in updating() callback if it modifies the object</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1434">ISIS-1434</a> - Cookie not cleared after logout, Shiro session remains active</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1432">ISIS-1432</a> - When there is no default for a date parameter, the system is defaulting to the current date, whereas it should be null.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1423">ISIS-1423</a> - TranslationServicePo does not guard against null keys.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1422">ISIS-1422</a> - Autocomplete publishes events to the event bus.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1414">ISIS-1414</a> - nextTransaction can cause null pointers with the new MetricsService.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1412">ISIS-1412</a> - Actions annotated with SemanticsOf.IDEMPOTENT_ARE_YOU_SURE throw a NullPointerException when invoked through the REST API</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1405">ISIS-1405</a> - Refactor DeploymentCategoryProvider into an internal domain service.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1402">ISIS-1402</a> - Remove the Debuggable interface.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1401">ISIS-1401</a> - NPE when wrapping call to FixtureScripts#runFixtureScript for a newly instantiated FixtureScript</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1400">ISIS-1400</a> - bulk-only actions are shown on object forms</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1393">ISIS-1393</a> - Maven swagger goal failed: No Session opened for this thread</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1383">ISIS-1383</a> - Missing component factory class names in Wicket HTML</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1382">ISIS-1382</a> - Cancel buttons disappeared on modal dialogs</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1358">ISIS-1358</a> - Simpleapp created from archetype and packaged to war fails when deploying to Tomcat</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1336">ISIS-1336</a> - config param typo&#8230;&#8203; titleEvent should be titleUiEvent.</p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_task_5">Task</h3>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1335">ISIS-1335</a> - Release activities for v1.13.0</p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="r1.12.2">1.12.2</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Apache Isis 1.12.2 is a bug fix release for Apache Isis 1.12.0.  It addresses two UI issues which result in the viewer
-showing invalid data with respect to the data actually stored in the database.</p>
-</div>
-<div class="sect2">
-<h3 id="_bug_6">Bug</h3>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1396">ISIS-1396</a> - Some elements on an entity page can be rendered against stale data.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1132">ISIS-1132</a> - possible timezone issues when refresh page in Wicket viewer.</p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_task_6">Task</h3>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1424">ISIS-1424</a> - Release activities for v1.12.2</p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="r1.12.1">1.12.1</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Apache Isis 1.12.1 is a bug fix release for Apache Isis 1.12.0.  The primary issue it addresses are spurious concurrency exceptions that can be thrown when editing an object.  It also addresses a subtle issue where the new support in JAXB view models for auto-edit can cause some dirty objects not to be updated.</p>
-</div>
-<div class="sect2">
-<h3 id="_bug_7">Bug</h3>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1355">ISIS-1355</a> - concurrency exception after property edit when attempting to render&#8230;&#8203;</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1357">ISIS-1357</a> - Update dependency from guava-19.0.20150826 to guava-19.0</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1361">ISIS-1361</a> - View model that changes two domain objects only has one of them updated.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1363">ISIS-1363</a> - ConfigurationServiceMenu is defined under the prototyping menu, but is not restricted to prototyping.  Suggest place under the tertiary menu instead.</p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_task_7">Task</h3>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1362">ISIS-1362</a> - Release activities for v1.12.1</p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="r1.12.0">1.12.0</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>The main feature in 1.12.0 is much enhanced support for custom layouts, using an optional separate XML layout file <code>Xxx.layout.xml</code> (where <code>Xxx</code> is the class of the object being rendered).  This is similar in concept to the earlier support we have had for custom layouts through a <code>.layout.json</code> file, but introduces the ability to position object members anywhere using bootstrap columns and rows.  It also brings in
-support for tabgroups, and allows object members to be included in the page more than once (eg a table view and also a (non-ASF) <a href="http://github.com/isisaddons/isis-wicket-fullcalendar2">calendar</a> view).</p>
-</div>
-<div class="paragraph">
-<p>As a result of this change, the support for editing objects has been modified; rather than an 'edit' button which toggles the entire
-page into edit mode, instead each property is edited individually.  The current implementation of this is using a prompt dialog (very
-similar to the action prompt dialogs; in a future release we hope to support "in-place" edits instead.</p>
-</div>
-<div class="paragraph">
-<p>Another notable change in this release include various new domain services.  Some of these are in support of the dynamic layouts
-functionality, others including new access into Apache Isis' metamodel.  (Some of these new services were originally part of the (non-ASF)
-<a href="http://isisaddons.org">Isis Addons</a>). In addition, the <a href="guides/rgsvc.html#_rgsvc_api_DomainObjectContainer"><code>DomainObjectContainer</code></a>
-service has been deprecated, replaced by a number of fine-grained services
-(such as <a href="guides/rgsvc.html#_rgsvc_api_RepositoryService"><code>RepositoryService</code></a> and <a href="guides/rgsvc.html#_rgsvc_api_MessageService"><code>MessageService</code></a>).</p>
-</div>
-<div class="paragraph">
-<p>The release also includes a number of new mixins, to automatically surface in the UI an entity&#8217;s id, version (if any), and to download the
-layout XML and rebuild the metamodel for a given domain entity.  There is also a mixin to clear any UI hints (part of the dynamic layouts
-functionality).  In all cases these mixins can be hidden using either security or by writing a <a href="guides/rgcms.html#_rgcms_classes_super_AbstractSubscriber">subscriber</a> to veto the visibility of the
-corresponding domain event.</p>
-</div>
-<div class="sect2">
-<h3 id="_new_feature_6">New Feature</h3>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1351">ISIS-1351</a> - Extend <a href="guides/rgsvc.html#_rgsvc_api_ConfigurationService"><code>ConfigurationService</code></a> to list all configuration properties in the UI</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1325">ISIS-1325</a> - New <a href="guides/rgsvc.html#_rgsvc_api_SessionManagementService"><code>SessionManagementService</code></a></p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1317">ISIS-1317</a> - Allow single domain object class to be invalidated through a mixin.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1313">ISIS-1313</a> - Enhancement to <a href="guides/rgmvn.html#_rgmvn_xsd">xsd</a> goal of the isis-maven-plugin to ignore/include the Isis common schemas.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1292">ISIS-1292</a> - Extend <a href="guides/rgsvc.html#_rgsvc_api_MetaModelService"><code>MetaModelService</code></a> to surface packages, classes etc (as used by the security module).</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-993">ISIS-993</a> - Show different object members on multiple tabs (<a href="guides/ugfun.html#_ugfun_object-layout_dynamic_xml">dynamic XML layouts</a>)</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-784">ISIS-784</a> - Change Wicket viewer to get rid of edit mode, instead allow individual fields to be edited by clicking on them (similar to the way that JIRA works).</p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_improvement_7">Improvement</h3>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1333">ISIS-1333</a> - Remove self-host profile from the archetype</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1332">ISIS-1332</a> - Factor out a <a href="guides/rgsvc.html#_rgsvc_spi_HintStore"><code>HintStore</code></a> service, so that this is pluggable.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1330">ISIS-1330</a> - Add CSS classes for table cells and for collections to make it easier to fine tune pages using CSS.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1329">ISIS-1329</a> - Extend hint support for "show all"</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1327">ISIS-1327</a> - Change the view mode of the select2 (value drop down) to be a simple text field.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1324">ISIS-1324</a> - Allow multiple different views of same collection in a layout (<a href="guides/ugfun.html#_ugfun_object-layout_dynamic_xml">dynamic XML layouts</a>)</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1323">ISIS-1323</a> - Deprecate @CollectionLayout#renderType, since is duplicated by <a href="guides/rgant.html#_rgant-CollectionLayout_defaultView"><code>@CollectionLayout#defaultView()</code></a></p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1322">ISIS-1322</a> - Mixins not exposing the mixedin object in events (for subscribers to veto).</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1321">ISIS-1321</a> - Extend <a href="guides/rgsvc.html#_rgsvc_api_MetaModelService"><code>MetaModelService</code></a> to allow CSV of metamodel to be downloaded.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1320">ISIS-1320</a> - Move <a href="guides/rgsvc.html#_rgsvc_spi_ContentMappingService"><code>ContentMappingService</code></a> to applib (and simplify)</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1312">ISIS-1312</a> - Improve <a href="guides/rgsvc.html#_rgsvc_api_JaxbService"><code>JaxbServiceDefault#xsd(&#8230;&#8203;)</code></a> to correctly reference the Isis common schema imports.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1300">ISIS-1300</a> - Allow the enablement of the WicketSource plugin to be configurable, and disabled by default</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1299">ISIS-1299</a> - <a href="guides/rgant.html#_rgant-ViewModel"><code>@ViewModel</code></a> and <a href="guides/rgant.html#_rgant-XmlRootElement"><code>@XmlRootElement</code></a> view models should automatically support isCloneable.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1298">ISIS-1298</a> - Fix deprecated annotation use for ViewModel.Cloneable#clone</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1295">ISIS-1295</a> - Run integration tests using thread-local, to allow "complete" tests that also exercise, eg Quartz jobs.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1240">ISIS-1240</a> - Derive icon from service when not provided</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1239">ISIS-1239</a> - For wicket ui, use a cookie or similar to remember the hint from last time (<a href="guides/ugfun.html#_ugfun_object-layout_dynamic_xml">dynamic XML layouts</a>)</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1228">ISIS-1228</a> - Reorganizing/splitting out <a href="guides/rgant.html#_rgant-DomainObjectContainer"><code>@DomainObjectContainer</code></a> service.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1048">ISIS-1048</a> - Make view model URLs more secure, eg through a private key (<a href="guides/rgsvc.html#_rgsvc_spi_UrlEncodingService"><code>UrlEncodingService</code></a>).</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1037">ISIS-1037</a> - Support layout.xml as well as layout.json (<a href="guides/ugfun.html#_ugfun_object-layout_dynamic_xml">dynamic XML layouts</a>)</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-806">ISIS-806</a> - In Wicket viewer, shouldn&#8217;t be possible to invoke an action if editing a form.</p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_bug_8">Bug</h3>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1348">ISIS-1348</a> - Bug with <a href="guides/ugtst.html#_ugtst_unit-test-support_soap-fake-server-junit-rule">SoapEndpointPublishingRule</a> when multiple endpoints.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1347">ISIS-1347</a> - Missing annotation in SimpleObject</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1346">ISIS-1346</a> - ActionInvocationContext isn&#8217;t populated properly</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1342">ISIS-1342</a> - The metamodel validation error page doesn&#8217;t reliably render itself if there are errors.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1341">ISIS-1341</a> - Restful Objects viewer should perform a flush transaction before generating representations.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1340">ISIS-1340</a> - Rebuild metamodel mixin action isn&#8217;t working reliably</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1328">ISIS-1328</a> - Bookmark hints are not being honoured</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1319">ISIS-1319</a> - Input dialog for action label for mandatory parameter not shown when the parameter is an view model</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1318">ISIS-1318</a> - contributed actions/mixins breaks publishing; also flush any pending actions to be published as the result of doing a wrapped action via the <a href="guides/rgsvc.html#_rgsvc_api_WrapperFactory"><code>WrapperFactory</code></a></p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1315">ISIS-1315</a> - Can&#8217;t generate <a href="guides/rgmvn.html#_rgmvn_swagger">swagger</a> specs, where actions are contributed.</p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS-1314">ISIS-1314</a> - Filename parameter label missing for DTO mixins</p>
-</li>
-<li>
-<p>

<TRUNCATED>

[32/44] isis-site git commit: ISIS-1594: provide an 'edit' button

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/guides/rgcms.pdf
----------------------------------------------------------------------
diff --git a/content/guides/rgcms.pdf b/content/guides/rgcms.pdf
index d794cb1..1ea445e 100644
--- a/content/guides/rgcms.pdf
+++ b/content/guides/rgcms.pdf
@@ -4,16 +4,16 @@
 << /Title (Classes, Methods and Schema)
 /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:20170219155004+00'00')
-/ModDate (D:20170219155004+00'00')
+/CreationDate (D:20170307234001+00'00')
+/ModDate (D:20170307234001+00'00')
 >>
 endobj
 2 0 obj
 << /Type /Catalog
 /Pages 3 0 R
 /Names 14 0 R
-/Outlines 1027 0 R
-/PageLabels 1056 0 R
+/Outlines 1026 0 R
+/PageLabels 1055 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 93
-/Kids [7 0 R 10 0 R 12 0 R 39 0 R 62 0 R 127 0 R 151 0 R 156 0 R 164 0 R 169 0 R 173 0 R 178 0 R 188 0 R 192 0 R 195 0 R 205 0 R 210 0 R 217 0 R 227 0 R 241 0 R 244 0 R 248 0 R 261 0 R 292 0 R 300 0 R 309 0 R 312 0 R 328 0 R 338 0 R 348 0 R 357 0 R 375 0 R 404 0 R 422 0 R 425 0 R 436 0 R 443 0 R 451 0 R 456 0 R 459 0 R 465 0 R 493 0 R 507 0 R 531 0 R 549 0 R 561 0 R 567 0 R 573 0 R 580 0 R 586 0 R 595 0 R 602 0 R 612 0 R 622 0 R 638 0 R 655 0 R 669 0 R 685 0 R 702 0 R 711 0 R 714 0 R 718 0 R 726 0 R 730 0 R 737 0 R 740 0 R 748 0 R 755 0 R 765 0 R 779 0 R 792 0 R 804 0 R 823 0 R 832 0 R 845 0 R 864 0 R 868 0 R 881 0 R 886 0 R 891 0 R 899 0 R 905 0 R 914 0 R 919 0 R 925 0 R 929 0 R 936 0 R 941 0 R 944 0 R 951 0 R 957 0 R 963 0 R 966 0 R]
+/Kids [7 0 R 10 0 R 12 0 R 39 0 R 62 0 R 127 0 R 150 0 R 155 0 R 163 0 R 168 0 R 172 0 R 177 0 R 187 0 R 191 0 R 194 0 R 204 0 R 209 0 R 216 0 R 226 0 R 240 0 R 243 0 R 247 0 R 260 0 R 291 0 R 299 0 R 308 0 R 311 0 R 327 0 R 337 0 R 347 0 R 356 0 R 374 0 R 403 0 R 421 0 R 424 0 R 435 0 R 442 0 R 450 0 R 455 0 R 458 0 R 464 0 R 492 0 R 506 0 R 530 0 R 548 0 R 560 0 R 566 0 R 572 0 R 579 0 R 585 0 R 594 0 R 601 0 R 611 0 R 621 0 R 637 0 R 654 0 R 668 0 R 684 0 R 701 0 R 710 0 R 713 0 R 717 0 R 725 0 R 729 0 R 736 0 R 739 0 R 747 0 R 754 0 R 764 0 R 778 0 R 791 0 R 803 0 R 822 0 R 831 0 R 844 0 R 863 0 R 867 0 R 880 0 R 885 0 R 890 0 R 898 0 R 904 0 R 913 0 R 918 0 R 924 0 R 928 0 R 935 0 R 940 0 R 943 0 R 950 0 R 956 0 R 962 0 R 965 0 R]
 >>
 endobj
 4 0 obj
@@ -78,13 +78,13 @@ endobj
 endobj
 8 0 obj
 << /Type /Font
-/BaseFont /AAAABI+NotoSerif
+/BaseFont /AAAABE+NotoSerif
 /Subtype /TrueType
-/FontDescriptor 1058 0 R
+/FontDescriptor 1057 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 1060 0 R
-/ToUnicode 1059 0 R
+/Widths 1059 0 R
+/ToUnicode 1058 0 R
 >>
 endobj
 9 0 obj
@@ -1182,7 +1182,7 @@ endobj
 /F3.0 18 0 R
 >>
 >>
-/Annots [972 0 R 973 0 R 974 0 R 975 0 R 976 0 R 977 0 R 978 0 R 979 0 R 980 0 R 981 0 R 982 0 R 983 0 R 984 0 R 985 0 R 986 0 R 987 0 R 988 0 R 989 0 R 990 0 R 991 0 R 992 0 R 993 0 R 994 0 R 995 0 R 996 0 R 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]
+/Annots [971 0 R 972 0 R 973 0 R 974 0 R 975 0 R 976 0 R 977 0 R 978 0 R 979 0 R 980 0 R 981 0 R 982 0 R 983 0 R 984 0 R 985 0 R 986 0 R 987 0 R 988 0 R 989 0 R 990 0 R 991 0 R 992 0 R 993 0 R 994 0 R 995 0 R 996 0 R 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]
 >>
 endobj
 11 0 obj
@@ -1989,7 +1989,7 @@ endobj
 /F3.0 18 0 R
 /F4.0 19 0 R
 >>
-/XObject << /Stamp1 1026 0 R
+/XObject << /Stamp1 1025 0 R
 >>
 >>
 /Annots [17 0 R 20 0 R 21 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 33 0 R 34 0 R 35 0 R 36 0 R 37 0 R]
@@ -2004,18 +2004,18 @@ endobj
 >>
 endobj
 15 0 obj
-<< /Kids [221 0 R 695 0 R 787 0 R 526 0 R 721 0 R 222 0 R 396 0 R 897 0 R 288 0 R 808 0 R 449 0 R 816 0 R]
+<< /Kids [220 0 R 694 0 R 786 0 R 525 0 R 720 0 R 221 0 R 395 0 R 896 0 R 287 0 R 807 0 R 448 0 R 815 0 R]
 >>
 endobj
 16 0 obj
 << /Type /Font
-/BaseFont /AAAABJ+NotoSerif-Bold
+/BaseFont /AAAABF+NotoSerif-Bold
 /Subtype /TrueType
-/FontDescriptor 1062 0 R
+/FontDescriptor 1061 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 1064 0 R
-/ToUnicode 1063 0 R
+/Widths 1063 0 R
+/ToUnicode 1062 0 R
 >>
 endobj
 17 0 obj
@@ -2028,24 +2028,24 @@ endobj
 endobj
 18 0 obj
 << /Type /Font
-/BaseFont /AAAABK+mplus1mn-regular
+/BaseFont /AAAABG+mplus1mn-regular
 /Subtype /TrueType
-/FontDescriptor 1066 0 R
+/FontDescriptor 1065 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 1068 0 R
-/ToUnicode 1067 0 R
+/Widths 1067 0 R
+/ToUnicode 1066 0 R
 >>
 endobj
 19 0 obj
 << /Type /Font
-/BaseFont /AAAABL+mplus-1p-regular
+/BaseFont /AAAABH+mplus-1p-regular
 /Subtype /TrueType
-/FontDescriptor 1070 0 R
+/FontDescriptor 1069 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 1072 0 R
-/ToUnicode 1071 0 R
+/Widths 1071 0 R
+/ToUnicode 1070 0 R
 >>
 endobj
 20 0 obj
@@ -3778,7 +3778,7 @@ endobj
 /F6.0 44 0 R
 /F4.0 19 0 R
 >>
-/XObject << /Stamp1 1026 0 R
+/XObject << /Stamp1 1025 0 R
 >>
 >>
 /Annots [41 0 R 45 0 R 46 0 R 47 0 R 48 0 R 49 0 R 50 0 R 51 0 R 52 0 R 53 0 R 54 0 R 55 0 R 56 0 R 57 0 R 58 0 R 59 0 R 60 0 R]
@@ -3803,24 +3803,24 @@ endobj
 endobj
 43 0 obj
 << /Type /Font
-/BaseFont /AAAABM+FontAwesome
+/BaseFont /AAAABI+FontAwesome
 /Subtype /TrueType
-/FontDescriptor 1074 0 R
+/FontDescriptor 1073 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 1076 0 R
-/ToUnicode 1075 0 R
+/Widths 1075 0 R
+/ToUnicode 1074 0 R
 >>
 endobj
 44 0 obj
 << /Type /Font
-/BaseFont /AAAABN+NotoSerif-Italic
+/BaseFont /AAAABJ+NotoSerif-Italic
 /Subtype /TrueType
-/FontDescriptor 1078 0 R
+/FontDescriptor 1077 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 1080 0 R
-/ToUnicode 1079 0 R
+/Widths 1079 0 R
+/ToUnicode 1078 0 R
 >>
 endobj
 45 0 obj
@@ -7967,7 +7967,7 @@ endobj
 /F4.0 19 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 1026 0 R
+/XObject << /Stamp1 1025 0 R
 >>
 >>
 /Annots [63 0 R 64 0 R 65 0 R 66 0 R 67 0 R 68 0 R 69 0 R 70 0 R 71 0 R 72 0 R 73 0 R 74 0 R 75 0 R 76 0 R 77 0 R 78 0 R 79 0 R 80 0 R 81 0 R 82 0 R 83 0 R 84 0 R 85 0 R 86 0 R 87 0 R 88 0 R 89 0 R 90 0 R 91 0 R 92 0 R 93 0 R 94 0 R 95 0 R 96 0 R 97 0 R 98 0 R 99 0 R 100 0 R 101 0 R 102 0 R 103 0 R 104 0 R 105 0 R 106 0 R 107 0 R 108 0 R 109 0 R 110 0 R 111 0 R 112 0 R 113 0 R 114 0 R 115 0 R 116 0 R 117 0 R 118 0 R 119 0 R 120 0 R 121 0 R 122 0 R 123 0 R 124 0 R 125 0 R]
@@ -8484,7 +8484,7 @@ endobj
 >>
 endobj
 126 0 obj
-<< /Length 36448
+<< /Length 38745
 >>
 stream
 q
@@ -9459,12 +9459,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24000000000001 454.0850000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -9481,12 +9481,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 454.0850000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -9503,12 +9503,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 454.0850000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <4c6962726172794d656d626572> Tj
 ET
 
@@ -9547,12 +9547,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 439.3450000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -9569,8 +9569,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 439.3450000000002 Td
@@ -9591,8 +9591,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 174.74 439.3450000000002 Td
@@ -9641,7 +9641,18 @@ ET
 BT
 268.24 439.3450000000002 Td
 /F3.0 11 Tf
-<2829> Tj
+<28> 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
+273.74 439.3450000000002 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9685,7 +9696,29 @@ ET
 BT
 295.74 439.3450000000002 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+301.24 439.3450000000002 Td
+/F3.0 11 Tf
+<2e> 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
+306.74 439.3450000000002 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9723,12 +9756,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 424.6050000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -9745,12 +9778,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 424.6050000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <766f6964> Tj
 ET
 
@@ -9789,8 +9822,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 213.24 424.6050000000002 Td
@@ -9811,8 +9844,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 268.24 424.6050000000002 Td
@@ -9905,7 +9938,29 @@ ET
 BT
 367.24 424.6050000000002 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+372.74 424.6050000000002 Td
+/F3.0 11 Tf
+<2e> 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
+378.24 424.6050000000002 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9943,12 +9998,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 409.8650000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -9965,12 +10020,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 409.8650000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <766f6964> Tj
 ET
 
@@ -10009,8 +10064,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 224.24 409.8650000000002 Td
@@ -10103,13 +10158,35 @@ ET
 BT
 163.74 395.12500000000017 Td
 /F3.0 11 Tf
-<28292e> Tj
+<28> 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
+169.24 395.12500000000017 Td
+/F3.0 11 Tf
+<29> 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
+174.74 395.12500000000017 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 180.24 395.12500000000017 Td
@@ -10147,7 +10224,18 @@ ET
 BT
 224.24 395.12500000000017 Td
 /F3.0 11 Tf
-<293b> Tj
+<29> 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
+229.74 395.12500000000017 Td
+/F3.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -10207,8 +10295,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 191.24 380.3850000000002 Td
@@ -10229,12 +10317,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 257.24 380.3850000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <74686973> Tj
 ET
 
@@ -10317,8 +10405,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 356.24 380.3850000000002 Td
@@ -10334,13 +10422,35 @@ ET
 BT
 383.74 380.3850000000002 Td
 /F3.0 11 Tf
-<28292e> Tj
+<28> 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
+389.24 380.3850000000002 Td
+/F3.0 11 Tf
+<29> 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
+394.74 380.3850000000002 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 400.24 380.3850000000002 Td
@@ -10361,12 +10471,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.000 0.867 scn
-0.000 0.000 0.867 SCN
+1.000 0.400 0.000 scn
+1.000 0.400 0.000 SCN
 
 BT
 449.74 380.3850000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <3231> Tj
 ET
 
@@ -10378,7 +10488,29 @@ ET
 BT
 460.74 380.3850000000002 Td
 /F3.0 11 Tf
-<29293b> Tj
+<29> 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
+466.24 380.3850000000002 Td
+/F3.0 11 Tf
+<29> 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
+471.74 380.3850000000002 Td
+/F3.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -10438,12 +10570,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 350.9050000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -10460,12 +10592,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 350.9050000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <766f6964> Tj
 ET
 
@@ -10504,8 +10636,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 251.74 350.9050000000002 Td
@@ -10587,7 +10719,29 @@ ET
 BT
 323.24 350.9050000000002 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+328.74 350.9050000000002 Td
+/F3.0 11 Tf
+<2e> 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
+334.24 350.9050000000002 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -10631,7 +10785,29 @@ ET
 BT
 81.24000000000001 336.1650000000002 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+86.74000000000001 336.1650000000002 Td
+/F3.0 11 Tf
+<2e> 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
+92.24000000000001 336.1650000000002 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -11043,13 +11219,12 @@ endobj
 /F4.0 19 0 R
 /F1.0 8 0 R
 /F5.1 43 0 R
-/F7.0 141 0 R
-/F3.1 142 0 R
+/F3.1 141 0 R
 >>
-/XObject << /Stamp1 1026 0 R
+/XObject << /Stamp1 1025 0 R
 >>
 >>
-/Annots [128 0 R 129 0 R 130 0 R 131 0 R 132 0 R 133 0 R 134 0 R 135 0 R 136 0 R 137 0 R 138 0 R 140 0 R 143 0 R 144 0 R 145 0 R 147 0 R 148 0 R 149 0 R]
+/Annots [128 0 R 129 0 R 130 0 R 131 0 R 132 0 R 133 0 R 134 0 R 135 0 R 136 0 R 137 0 R 138 0 R 140 0 R 142 0 R 143 0 R 144 0 R 146 0 R 147 0 R 148 0 R]
 >>
 endobj
 128 0 obj
@@ -11159,27 +11334,16 @@ endobj
 endobj
 141 0 obj
 << /Type /Font
-/BaseFont /AAAABO+mplus1mn-bold
+/BaseFont /AAAABK+mplus1mn-regular
 /Subtype /TrueType
-/FontDescriptor 1082 0 R
+/FontDescriptor 1081 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 1084 0 R
-/ToUnicode 1083 0 R
+/Widths 1083 0 R
+/ToUnicode 1082 0 R
 >>
 endobj
 142 0 obj
-<< /Type /Font
-/BaseFont /AAAABP+mplus1mn-regular
-/Subtype /TrueType
-/FontDescriptor 1086 0 R
-/FirstChar 32
-/LastChar 255
-/Widths 1088 0 R
-/ToUnicode 1087 0 R
->>
-endobj
-143 0 obj
 << /Border [0 0 0]
 /Dest (_rgcms_methods_prefixes_removeFrom)
 /Subtype /Link
@@ -11187,7 +11351,7 @@ endobj
 /Type /Annot
 >>
 endobj
-144 0 obj
+143 0 obj
 << /Border [0 0 0]
 /Dest (_rgcms_methods_prefixes_removeFrom)
 /Subtype /Link
@@ -11195,7 +11359,7 @@ endobj
 /Type /Annot
 >>
 endobj
-145 0 obj
+144 0 obj
 << /Border [0 0 0]
 /Dest (_rgcms_methods_prefixes_removeFrom)
 /Subtype /Link
@@ -11203,10 +11367,10 @@ endobj
 /Type /Annot
 >>
 endobj
-146 0 obj
+145 0 obj
 [127 0 R /XYZ 0 224.17000000000027 null]
 endobj
-147 0 obj
+146 0 obj
 << /Border [0 0 0]
 /Dest (_rgcms_methods_prefixes_choices)
 /Subtype /Link
@@ -11214,7 +11378,7 @@ endobj
 /Type /Annot
 >>
 endobj
-148 0 obj
+147 0 obj
 << /Border [0 0 0]
 /Dest (_rgcms_methods_prefixes_choices)
 /Subtype /Link
@@ -11222,7 +11386,7 @@ endobj
 /Type /Annot
 >>
 endobj
-149 0 obj
+148 0 obj
 << /Border [0 0 0]
 /Dest (_rgcms_methods_prefixes_choices)
 /Subtype /Link
@@ -11230,8 +11394,8 @@ endobj
 /Type /Annot
 >>
 endobj
-150 0 obj
-<< /Length 39260
+149 0 obj
+<< /Length 42393
 >>
 stream
 q
@@ -11330,12 +11494,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24 730.205 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -11352,8 +11516,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 730.205 Td
@@ -11429,8 +11593,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 235.24 730.205 Td
@@ -11512,7 +11676,29 @@ ET
 BT
 328.74 730.205 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+334.24 730.205 Td
+/F3.0 11 Tf
+<2e> 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
+339.74 730.205 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -11654,12 +11840,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24 625.9050000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -11676,12 +11862,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 625.9050000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -11698,12 +11884,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 625.9050000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <53686f7070696e67436172744974656d> Tj
 ET
 
@@ -11742,8 +11928,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 611.1650000000001 Td
@@ -11808,8 +11994,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 224.24 611.1650000000001 Td
@@ -11841,12 +12027,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 596.4250000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -11902,7 +12088,18 @@ ET
 BT
 218.74 596.4250000000002 Td
 /F3.0 11 Tf
-<2829> Tj
+<28> 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
+224.24 596.4250000000002 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -11946,7 +12143,29 @@ ET
 BT
 246.24 596.4250000000002 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+251.74 596.4250000000002 Td
+/F3.0 11 Tf
+<2e> 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
+257.24 596.4250000000002 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -11984,12 +12203,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 581.6850000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -12006,12 +12225,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 581.6850000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <766f6964> Tj
 ET
 
@@ -12133,7 +12352,29 @@ ET
 BT
 312.24 581.6850000000002 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+317.74 581.6850000000002 Td
+/F3.0 11 Tf
+<2e> 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
+323.24 581.6850000000002 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -12171,8 +12412,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 552.2050000000002 Td
@@ -12237,8 +12478,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 224.24 552.2050000000002 Td
@@ -12270,12 +12511,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 537.4650000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -12292,12 +12533,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 537.4650000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <696e74> Tj
 ET
 
@@ -12331,7 +12572,18 @@ ET
 BT
 202.24 537.4650000000001 Td
 /F3.0 11 Tf
-<2829> Tj
+<28> 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.74 537.4650000000001 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -12375,7 +12627,29 @@ ET
 BT
 229.74 537.4650000000001 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+235.24 537.4650000000001 Td
+/F3.0 11 Tf
+<2e> 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
+240.74 537.4650000000001 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -12413,12 +12687,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 522.7250000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -12435,12 +12709,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 522.7250000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <766f6964> Tj
 ET
 
@@ -12479,12 +12753,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 213.24 522.7250000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <696e74> Tj
 ET
 
@@ -12562,7 +12836,29 @@ ET
 BT
 301.24 522.7250000000001 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+306.74 522.7250000000001 Td
+/F3.0 11 Tf
+<2e> 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
+312.24 522.7250000000001 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -12600,8 +12896,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 493.2450000000001 Td
@@ -12666,8 +12962,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 246.24 493.2450000000001 Td
@@ -12699,12 +12995,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 478.5050000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -12831,8 +13127,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 103.24000000000001 449.0250000000001 Td
@@ -12875,13 +13171,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 229.74 449.0250000000001 Td
 /F3.0 11 Tf
-<225175616e7469747922> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+235.24 449.0250000000001 Td
+/F3.0 11 Tf
+<5175616e74697479> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+279.24 449.0250000000001 Td
+/F3.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -12908,12 +13226,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 103.24000000000001 434.2850000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <66696e616c> Tj
 ET
 
@@ -12930,12 +13248,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 136.24 434.2850000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <696e74> Tj
 ET
 
@@ -13046,7 +13364,18 @@ ET
 BT
 202.24 419.5450000000001 Td
 /F3.0 11 Tf
-<293b> Tj
+<29> 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.74 419.5450000000001 Td
+/F3.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -13101,7 +13430,18 @@ ET
 BT
 213.24 404.80500000000006 Td
 /F3.0 11 Tf
-<293b> Tj
+<29> 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
+218.74 404.80500000000006 Td
+/F3.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -13139,12 +13479,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 375.3250000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -13161,8 +13501,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 375.3250000000001 Td
@@ -13271,8 +13611,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 103.24000000000001 360.5850000000001 Td
@@ -13293,12 +13633,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.000 0.867 scn
-0.000 0.000 0.867 SCN
+1.000 0.400 0.000 scn
+1.000 0.400 0.000 SCN
 
 BT
 163.74 360.5850000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <33> Tj
 ET
 
@@ -13326,8 +13666,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 180.24 360.5850000000001 Td
@@ -13442,7 +13782,29 @@ ET
 BT
 103.24000000000001 331.1050000000001 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+108.74000000000001 331.1050000000001 Td
+/F3.0 11 Tf
+<2e> 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
+114.24000000000001 331.1050000000001 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -13486,7 +13848,29 @@ ET
 BT
 81.24000000000001 301.62500000000006 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+86.74000000000001 301.62500000000006 Td
+/F3.0 11 Tf
+<2e> 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
+92.24000000000001 301.62500000000006 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -13673,12 +14057,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.239999999999995 121.145 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -13695,8 +14079,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74 121.145 Td
@@ -13772,8 +14156,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 229.74 121.145 Td
@@ -13855,7 +14239,29 @@ ET
 BT
 323.24 121.145 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+328.74 121.145 Td
+/F3.0 11 Tf
+<2e> 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
+334.24 121.145 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -13994,29 +14400,28 @@ Q
 
 endstream
 endobj
-151 0 obj
+150 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 150 0 R
+/Contents 149 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 16 0 R
 /F1.0 8 0 R
 /F6.0 44 0 R
 /F3.0 18 0 R
-/F7.0 141 0 R
-/F3.1 142 0 R
+/F3.1 141 0 R
 >>
-/XObject << /Stamp1 1026 0 R
+/XObject << /Stamp1 1025 0 R
 >>
 >>
-/Annots [153 0 R]
+/Annots [152 0 R]
 >>
 endobj
-152 0 obj
-[151 0 R /XYZ 0 841.89 null]
+151 0 obj
+[150 0 R /XYZ 0 841.89 null]
 endobj
-153 0 obj
+152 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -14027,11 +14432,11 @@ endobj
 /Type /Annot
 >>
 endobj
-154 0 obj
-[151 0 R /XYZ 0 201.63000000000002 null]
+153 0 obj
+[150 0 R /XYZ 0 201.63000000000002 null]
 endobj
-155 0 obj
-<< /Length 20134
+154 0 obj
+<< /Length 21824
 >>
 stream
 q
@@ -14065,13 +14470,13 @@ h
 S
 Q
 /DeviceRGB cs
-0.000 0.533 0.000 scn
+0.000 0.400 0.600 scn
 /DeviceRGB CS
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 SCN
 
 BT
 59.24 783.0649999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -14088,12 +14493,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 783.0649999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -14110,12 +14515,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 783.0649999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <53686f7070696e67436172744974656d> Tj
 ET
 
@@ -14154,12 +14559,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 768.3249999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -14215,7 +14620,18 @@ ET
 BT
 218.74 768.3249999999999 Td
 /F3.0 11 Tf
-<2829> Tj
+<28> 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
+224.24 768.3249999999999 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -14259,7 +14675,29 @@ ET
 BT
 246.24 768.3249999999999 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+251.74 768.3249999999999 Td
+/F3.0 11 Tf
+<2e> 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
+257.24 768.3249999999999 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -14297,12 +14735,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 753.585 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -14319,12 +14757,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 753.585 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <766f6964> Tj
 ET
 
@@ -14446,7 +14884,29 @@ ET
 BT
 312.24 753.585 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+317.74 753.585 Td
+/F3.0 11 Tf
+<2e> 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
+323.24 753.585 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -14484,12 +14944,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 724.105 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -14506,8 +14966,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 724.105 Td
@@ -14594,8 +15054,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 103.24000000000001 709.365 Td
@@ -14616,12 +15076,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.000 0.867 scn
-0.000 0.000 0.867 SCN
+1.000 0.400 0.000 scn
+1.000 0.400 0.000 SCN
 
 BT
 163.74 709.365 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <33> Tj
 ET
 
@@ -14649,8 +15109,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 180.24 709.365 Td
@@ -14765,7 +15225,29 @@ ET
 BT
 103.24000000000001 679.885 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+108.74000000000001 679.885 Td
+/F3.0 11 Tf
+<2e> 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
+114.24000000000001 679.885 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -14809,7 +15291,29 @@ ET
 BT
 81.24000000000001 650.405 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+86.74000000000001 650.405 Td
+/F3.0 11 Tf
+<2e> 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
+92.24000000000001 650.405 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -15231,12 +15735,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.239999999999995 339.7450000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -15253,8 +15757,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74 339.7450000000002 Td
@@ -15325,7 +15829,18 @@ ET
 BT
 235.24 339.7450000000002 Td
 /F3.0 11 Tf
-<2829> Tj
+<28> 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
+240.74 339.7450000000002 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -15369,7 +15884,29 @@ ET
 BT
 262.74 339.7450000000002 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+268.24 339.7450000000002 Td
+/F3.0 11 Tf
+<2e> 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
+273.74 339.7450000000002 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -15431,27 +15968,26 @@ Q
 
 endstream
 endobj
-156 0 obj
+155 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 155 0 R
+/Contents 154 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F7.0 141 0 R
-/F3.0 18 0 R
-/F3.1 142 0 R
+/Font << /F3.0 18 0 R
+/F3.1 141 0 R
 /F1.0 8 0 R
 /F2.0 16 0 R
 /F4.0 19 0 R
 /F6.0 44 0 R
 >>
-/XObject << /Stamp1 1026 0 R
+/XObject << /Stamp1 1025 0 R
 >>
 >>
-/Annots [157 0 R 159 0 R 160 0 R 161 0 R]
+/Annots [156 0 R 158 0 R 159 0 R 160 0 R]
 >>
 endobj
-157 0 obj
+156 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -15462,10 +15998,10 @@ endobj
 /Type /Annot
 >>
 endobj
-158 0 obj
-[156 0 R /XYZ 0 572.19 null]
+157 0 obj
+[155 0 R /XYZ 0 572.19 null]
 endobj
-159 0 obj
+158 0 obj
 << /Border [0 0 0]
 /Dest (_rgcms_methods_prefixes_autoComplete)
 /Subtype /Link
@@ -15473,7 +16009,7 @@ endobj
 /Type /Annot
 >>
 endobj
-160 0 obj
+159 0 obj
 << /Border [0 0 0]
 /Dest (_rgcms_methods_prefixes_autoComplete)
 /Subtype /Link
@@ -15481,7 +16017,7 @@ endobj
 /Type /Annot
 >>
 endobj
-161 0 obj
+160 0 obj
 << /Border [0 0 0]
 /Dest (_rgcms_methods_prefixes_autoComplete)
 /Subtype /Link
@@ -15489,11 +16025,11 @@ endobj
 /Type /Annot
 >>
 endobj
-162 0 obj
-[156 0 R /XYZ 0 420.2300000000002 null]
+161 0 obj
+[155 0 R /XYZ 0 420.2300000000002 null]
 endobj
-163 0 obj
-<< /Length 28115
+162 0 obj
+<< /Length 30575
 >>
 stream
 q
@@ -15527,13 +16063,13 @@ h
 S
 Q
 /DeviceRGB cs
-0.000 0.533 0.000 scn
+0.000 0.400 0.600 scn
 /DeviceRGB CS
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 SCN
 
 BT
 59.24 783.0649999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -15550,12 +16086,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 783.0649999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -15572,12 +16108,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 783.0649999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <53686f7070696e67436172744974656d> Tj
 ET
 
@@ -15616,8 +16152,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 768.3249999999999 Td
@@ -15682,8 +16218,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 224.24 768.3249999999999 Td
@@ -15715,12 +16251,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 753.585 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -15776,7 +16312,18 @@ ET
 BT
 218.74 753.585 Td
 /F3.0 11 Tf
-<2829> Tj
+<28> 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
+224.24 753.585 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -15820,7 +16367,29 @@ ET
 BT
 246.24 753.585 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+251.74 753.585 Td
+/F3.0 11 Tf
+<2e> 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
+257.24 753.585 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -15858,12 +16427,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 738.845 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -15880,12 +16449,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 738.845 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <766f6964> Tj
 ET
 
@@ -16007,7 +16576,29 @@ ET
 BT
 312.24 738.845 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+317.74 738.845 Td
+/F3.0 11 Tf
+<2e> 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
+323.24 738.845 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16045,8 +16636,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 709.365 Td
@@ -16111,8 +16702,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 224.24 709.365 Td
@@ -16144,12 +16735,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 694.625 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -16166,12 +16757,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 694.625 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <696e74> Tj
 ET
 
@@ -16205,7 +16796,18 @@ ET
 BT
 202.24 694.625 Td
 /F3.0 11 Tf
-<2829> Tj
+<28> 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.74 694.625 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16249,7 +16851,29 @@ ET
 BT
 229.74 694.625 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+235.24 694.625 Td
+/F3.0 11 Tf
+<2e> 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
+240.74 694.625 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16287,12 +16911,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 679.885 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -16309,12 +16933,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 679.885 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <766f6964> Tj
 ET
 
@@ -16353,12 +16977,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 213.24 679.885 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <696e74> Tj
 ET
 
@@ -16436,7 +17060,29 @@ ET
 BT
 301.24 679.885 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+306.74 679.885 Td
+/F3.0 11 Tf
+<2e> 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
+312.24 679.885 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16474,8 +17120,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 650.405 Td
@@ -16540,8 +17186,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 246.24 650.405 Td
@@ -16573,12 +17219,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 635.665 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -16705,8 +17351,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 103.24000000000001 606.185 Td
@@ -16749,13 +17395,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 229.74 606.185 Td
 /F3.0 11 Tf
-<225175616e7469747922> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+235.24 606.185 Td
+/F3.0 11 Tf
+<5175616e74697479> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+279.24 606.185 Td
+/F3.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16782,12 +17450,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 103.24000000000001 591.4449999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <66696e616c> Tj
 ET
 
@@ -16804,8 +17472,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 136.24 591.4449999999999 Td
@@ -16920,7 +17588,18 @@ ET
 BT
 202.24 576.7049999999999 Td
 /F3.0 11 Tf
-<293b> Tj
+<29> 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.74 576.7049999999999 Td
+/F3.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16975,7 +17654,18 @@ ET
 BT
 213.24 561.9649999999999 Td
 /F3.0 11 Tf
-<293b> Tj
+<29> 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
+218.74 561.9649999999999 Td
+/F3.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17013,12 +17703,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 532.4849999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -17035,8 +17725,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 532.4849999999999 Td
@@ -17057,8 +17747,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 180.24 532.4849999999999 Td
@@ -17107,7 +17797,18 @@ ET
 BT
 345.24 532.4849999999999 Td
 /F3.0 11 Tf
-<2829> Tj
+<28> 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
+350.74 532.4849999999999 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17145,12 +17846,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 103.24000000000001 517.7449999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <72657475726e> Tj
 ET
 
@@ -17167,8 +17868,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 141.74 517.7449999999999 Td
@@ -17189,8 +17890,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 180.24 517.7449999999999 Td
@@ -17211,12 +17912,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.000 0.867 scn
-0.000 0.000 0.867 SCN
+1.000 0.400 0.000 scn
+1.000 0.400 0.000 SCN
 
 BT
 218.74 517.7449999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <31> Tj
 ET
 
@@ -17233,12 +17934,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.000 0.867 scn
-0.000 0.000 0.867 SCN
+1.000 0.400 0.000 scn
+1.000 0.400 0.000 SCN
 
 BT
 229.74 517.7449999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <32> Tj
 ET
 
@@ -17255,12 +17956,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.000 0.867 scn
-0.000 0.000 0.867 SCN
+1.000 0.400 0.000 scn
+1.000 0.400 0.000 SCN
 
 BT
 240.74 517.7449999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <33> Tj
 ET
 
@@ -17277,12 +17978,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.000 0.867 scn
-0.000 0.000 0.867 SCN
+1.000 0.400 0.000 scn
+1.000 0.400 0.000 SCN
 
 BT
 251.74 517.7449999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <35> Tj
 ET
 
@@ -17299,12 +18000,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.000 0.867 scn
-0.000 0.000 0.867 SCN
+1.000 0.400 0.000 scn
+1.000 0.400 0.000 SCN
 
 BT
 262.74 517.7449999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <3130> Tj
 ET
 
@@ -17321,12 +18022,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.000 0.867 scn
-0.000 0.000 0.867 SCN
+1.000 0.400 0.000 scn
+1.000 0.400 0.000 SCN
 
 BT
 279.24 517.7449999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <3235> Tj
 ET
 
@@ -17343,12 +18044,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.000 0.867 scn
-0.000 0.000 0.867 SCN
+1.000 0.400 0.000 scn
+1.000 0.400 0.000 SCN
 
 BT
 295.74 517.7449999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <3530> Tj
 ET
 
@@ -17365,12 +18066,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.000 0.867 scn
-0.000 0.000 0.867 SCN
+1.000 0.400 0.000 scn
+1.000 0.400 0.000 SCN
 
 BT
 312.24 517.7449999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <313030> Tj
 ET
 
@@ -17382,7 +18083,18 @@ ET
 BT
 328.74 517.7449999999999 Td
 /F3.0 11 Tf
-<293b> Tj
+<29> 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
+334.24 517.7449999999999 Td
+/F3.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17426,7 +18138,29 @@ ET
 BT
 81.24000000000001 488.26499999999993 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+86.74000000000001 488.26499999999993 Td
+/F3.0 11 Tf
+<2e> 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
+92.24000000000001 488.26499999999993 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17559,27 +18293,26 @@ Q
 
 endstream
 endobj
-164 0 obj
+163 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 163 0 R
+/Contents 162 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F7.0 141 0 R
-/F3.0 18 0 R
+/Font << /F3.0 18 0 R
 /F2.0 16 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 1026 0 R
+/XObject << /Stamp1 1025 0 R
 >>
 >>
-/Annots [166 0 R]
+/Annots [165 0 R]
 >>
 endobj
-165 0 obj
-[164 0 R /XYZ 0 447.6099999999999 null]
+164 0 obj
+[163 0 R /XYZ 0 447.6099999999999 null]
 endobj
-166 0 obj
+165 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -17590,7 +18323,7 @@ endobj
 /Type /Annot
 >>
 endobj
-167 0 obj
+166 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 803
@@ -17823,8 +18556,8 @@ U
 \ufffd\ufffd\ufffd\ufffd\ufffd\ufffdm\ufffd\ufffd\ufffd?""""\ufffd\ufffd]\ufffd@DDDDDD\u052dt """""bI""""""\ufffd\ufffdt """""bI""""""\ufffd\ufffdt """""bI""""""\ufffd\ufffdt """""bI""""""\ufffd\ufffdt """""bI""""""\ufffd\ufffdt """""bI""""""\ufffd\ufffdt """""bI""""""\ufffd\ufffdt """""bI""""""\ufffd\ufffdr\ufffd\ufffd'\ufffd?\ufffd?|
 endstream
 endobj
-168 0 obj
-<< /Length 25706
+167 0 obj
+<< /Length 27012
 >>
 stream
 q
@@ -17895,8 +18628,8 @@ f
 h
 S
 Q
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 59.24 408.66812447786134 Td
@@ -17983,8 +18716,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 279.24 408.66812447786134 Td
@@ -18005,12 +18738,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24 393.92812447786133 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -18027,12 +18760,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 393.92812447786133 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -18049,12 +18782,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 393.92812447786133 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <55706461746543617465676f7279436f6e747269627574696f6e73> Tj
 ET
 
@@ -18077,7 +18810,29 @@ ET
 BT
 284.74 393.92812447786133 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+290.24 393.92812447786133 Td
+/F3.0 11 Tf
+<2e> 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
+295.74 393.92812447786133 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -18115,8 +18870,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 379.1881244778613 Td
@@ -18192,13 +18947,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 202.24 364.4481244778613 Td
 /F3.0 11 Tf
-<225570646174652063617465676f727920616e642073756263617465676f727922> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+207.74 364.4481244778613 Td
+/F3.0 11 Tf
+<5570646174652063617465676f727920616e642073756263617465676f7279> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+378.24 364.4481244778613 Td
+/F3.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -18236,8 +19013,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 334.96812447786135 Td
@@ -18324,8 +19101,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 257.24 334.96812447786135 Td
@@ -18357,12 +19134,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 320.22812447786134 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -18434,12 +19211,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 125.24000000000001 305.48812447786133 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <66696e616c> Tj
 ET
 
@@ -18533,12 +19310,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 125.24000000000001 290.7481244778613 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <66696e616c> Tj
 ET
 
@@ -18610,8 +19387,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 125.24000000000001 276.0081244778613 Td
@@ -18698,8 +19475,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 328.74 276.0081244778613 Td
@@ -18731,12 +19508,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 125.24000000000001 261.2681244778613 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <66696e616c> Tj
 ET
 
@@ -18852,8 +19629,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 130.74 246.52812447786133 Td
@@ -18891,7 +19668,18 @@ ET
 BT
 240.74 246.52812447786133 Td
 /F3.0 11 Tf
-<293b> Tj
+<29> 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
+246.24 246.52812447786133 Td
+/F3.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -18929,8 +19717,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 130.74 231.78812447786132 Td
@@ -18968,7 +19756,18 @@ ET
 BT
 273.74 231.78812447786132 Td
 /F3.0 11 Tf
-<293b> Tj
+<29> 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
+279.24 231.78812447786132 Td
+/F3.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -18984,12 +19783,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 103.24000000000001 217.0481244778613 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <72657475726e> Tj
 ET
 
@@ -19061,12 +19860,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 187.5681244778613 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -19083,8 +19882,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 187.5681244778613 Td
@@ -19193,12 +19992,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 125.24000000000001 172.82812447786128 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <66696e616c> Tj
 ET
 
@@ -19292,12 +20091,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 125.24000000000001 158.0881244778613 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <66696e616c> Tj
 ET
 
@@ -19413,12 +20212,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 103.24000000000001 143.3481244778613 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <72657475726e> Tj
 ET
 
@@ -19457,8 +20256,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 207.74 143.3481244778613 Td
@@ -19496,7 +20295,18 @@ ET
 BT
 295.74 143.3481244778613 Td
 /F3.0 11 Tf
-<293b> Tj
+<29> 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
+301.24 143.3481244778613 Td
+/F3.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -19540,7 +20350,29 @@ ET
 BT
 81.24000000000001 113.86812447786127 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+86.74000000000001 113.86812447786127 Td
+/F3.0 11 Tf
+<2e> 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
+92.24000000000001 113.86812447786127 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -19624,25 +20456,24 @@ Q
 
 endstream
 endobj
-169 0 obj
+168 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 168 0 R
+/Contents 167 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/XObject << /I1 167 0 R
-/Stamp1 1026 0 R
+/XObject << /I1 166 0 R
+/Stamp1 1025 0 R
 >>
 /Font << /F1.0 8 0 R
 /F3.0 18 0 R
-/F7.0 141 0 R
-/F3.1 142 0 R
+/F3.1 141 0 R
 >>
 >>
-/Annots [170 0 R 171 0 R]
+/Annots [169 0 R 170 0 R]
 >>
 endobj
-170 0 obj
+169 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -19653,7 +20484,7 @@ endobj
 /Type /Annot
 >>
 endobj
-171 0 obj
+170 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -19664,8 +20495,8 @@ endobj
 /Type /Annot
 >>
 endobj
-172 0 obj
-<< /Length 32776
+171 0 obj
+<< /Length 35617
 >>
 stream
 q
@@ -19834,12 +20665,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.239999999999995 668.1650000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -19856,12 +20687,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74 668.1650000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -19878,12 +20709,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 668.1650000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <53686f7070696e67436172744974656d> Tj
 ET
 
@@ -19928,7 +20759,29 @@ ET
 BT
 81.24 653.4250000000001 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+86.74 653.4250000000001 Td
+/F3.0 11 Tf
+<2e> 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
+92.24 653.4250000000001 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -19944,8 +20797,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24 638.6850000000002 Td
@@ -20010,8 +20863,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 246.24 638.6850000000002 Td
@@ -20043,12 +20896,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24 623.9450000000002 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -20175,8 +21028,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 103.24 594.4650000000001 Td
@@ -20219,13 +21072,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 229.74 594.4650000000001 Td
 /F3.0 11 Tf
-<225175616e7469747922> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+235.24 594.4650000000001 Td
+/F3.0 11 Tf
+<5175616e74697479> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+279.24 594.4650000000001 Td
+/F3.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -20252,12 +21127,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 103.24 579.7250000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <66696e616c> Tj
 ET
 
@@ -20274,8 +21149,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 136.24 579.7250000000001 Td
@@ -20390,7 +21265,18 @@ ET
 BT
 202.24 564.9850000000001 Td
 /F3.0 11 Tf
-<293b> Tj
+<29> 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.74 564.9850000000001 Td
+/F3.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -20445,7 +21331,18 @@ ET
 BT
 213.24 550.2450000000001 Td
 /F3.0 11 Tf
-<293b> Tj
+<29> 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
+218.74 550.2450000000001 Td
+/F3.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -20483,12 +21380,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24 520.7650000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -20505,8 +21402,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74 520.7650000000001 Td
@@ -20527,8 +21424,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 180.24 520.7650000000001 Td
@@ -20659,12 +21556,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 103.24 506.0250000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <72657475726e> Tj
 ET
 
@@ -20703,8 +21600,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 224.24 506.0250000000001 Td
@@ -20742,7 +21639,18 @@ ET
 BT
 367.24 506.0250000000001 Td
 /F3.0 11 Tf
-<293b> Tj
+<29> 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
+372.74 506.0250000000001 Td
+/F3.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -20808,7 +21716,29 @@ ET
 BT
 81.24 476.5450000000001 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+86.74 476.5450000000001 Td
+/F3.0 11 Tf
+<2e> 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
+92.24 476.5450000000001 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -20947,12 +21877,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.239999999999995 317.8450000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -20969,8 +21899,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74 317.8450000000001 Td
@@ -21041,7 +21971,18 @@ ET
 BT
 229.74 317.8450000000001 Td
 /F3.0 11 Tf
-<2829> Tj
+<28> 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
+235.24 317.8450000000001 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -21085,7 +22026,29 @@ ET
 BT
 257.24 317.8450000000001 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+262.74 317.8450000000001 Td
+/F3.0 11 Tf
+<2e> 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
+268.24 317.8450000000001 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -21150,12 +22113,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.239999999999995 241.32500000000007 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -21172,12 +22135,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74 241.32500000000007 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -21194,12 +22157,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 241.32500000000007 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <53686f7070696e67436172744974656d> Tj
 ET
 
@@ -21238,12 +22201,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24 226.5850000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -21299,7 +22262,18 @@ ET
 BT
 218.74 226.5850000000001 Td
 /F3.0 11 Tf
-<2829> Tj
+<28> 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
+224.24 226.5850000000001 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -21343,7 +22317,29 @@ ET
 BT
 246.24 226.5850000000001 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+251.74 226.5850000000001 Td
+/F3.0 11 Tf
+<2e> 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
+257.24 226.5850000000001 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -21381,12 +22377,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24 211.84500000000008 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -21403,12 +22399,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74 211.84500000000008 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <766f6964> Tj
 ET
 
@@ -21530,7 +22526,29 @@ ET
 BT
 312.24 211.84500000000008 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+317.74 211.84500000000008 Td
+/F3.0 11 Tf
+<2e> 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
+323.24 211.84500000000008 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -21568,12 +22586,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24 182.36500000000007 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -21590,8 +22608,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74 182.36500000000007 Td
@@ -21662,7 +22680,18 @@ ET
 BT
 306.74 182.36500000000007 Td
 /F3.0 11 Tf
-<2829> Tj
+<28> 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
+312.24 182.36500000000007 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -21706,7 +22735,29 @@ ET
 BT
 103.24 167.62500000000009 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+108.74 167.62500000000009 Td
+/F3.0 11 Tf
+<2e> 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
+114.24 167.62500000000009 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -21925,44 +22976,43 @@ Q
 
 endstream
 endobj
-173 0 obj
+172 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 172 0 R
+/Contents 171 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F3.1 142 0 R
+/Font << /F3.1 141 0 R
 /F1.0 8 0 R
 /F3.0 18 0 R
-/F7.0 141 0 R
 /F2.0 16 0 R
 /F4.0 19 0 R
-/F1.1 176 0 R
+/F1.1 175 0 R
 >>
-/XObject << /Stamp1 1026 0 R
+/XObject << /Stamp1 1025 0 R
 >>
 >>
 >>
 endobj
+173 0 obj
+[172 0 R /XYZ 0 398.3300000000001 null]
+endobj
 174 0 obj
-[173 0 R /XYZ 0 398.3300000000001 null]
+[172 0 R /XYZ 0 126.97000000000008 null]
 endobj
 175 0 obj
-[173 0 R /XYZ 0 126.97000000000008 null]
-endobj
-176 0 obj
 << /Type /Font
-/BaseFont /AAAABQ+NotoSerif
+/BaseFont /AAAABL+NotoSerif
 /Subtype /TrueType
-/FontDescriptor 1090 0 R
+/FontDescriptor 1085 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 1092 0 R
-/ToUnicode 1091 0 R
+/Widths 1087 0 R
+/ToUnicode 1086 0 R
 >>
 endobj
-177 0 obj
-<< /Length 26069
+176 0 obj
+<< /Length 28113
 >>
 stream
 q
@@ -22006,12 +23056,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24 756.035 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -22028,12 +23078,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 756.035 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -22050,12 +23100,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 756.035 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <4c6962726172794d656d626572> Tj
 ET
 
@@ -22094,12 +23144,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 741.295 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -22155,7 +23205,18 @@ ET
 BT
 240.74 741.295 Td
 /F3.0 11 Tf
-<2829> Tj
+<28> 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
+246.24 741.295 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -22199,7 +23260,29 @@ ET
 BT
 268.24 741.295 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+273.74 741.295 Td
+/F3.0 11 Tf
+<2e> 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
+279.24 741.295 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -22237,12 +23320,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 726.5550000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -22259,12 +23342,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 726.5550000000001 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <766f6964> Tj
 ET
 
@@ -22386,7 +23469,29 @@ ET
 BT
 323.24 726.5550000000001 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+328.74 726.5550000000001 Td
+/F3.0 11 Tf
+<2e> 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
+334.24 726.5550000000001 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -22424,12 +23529,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 711.815 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -22446,12 +23551,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 711.815 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <766f6964> Tj
 ET
 
@@ -22573,7 +23678,29 @@ ET
 BT
 339.74 711.815 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+345.24 711.815 Td
+/F3.0 11 Tf
+<2e> 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
+350.74 711.815 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -22611,12 +23738,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 697.075 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -22633,12 +23760,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 697.075 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <766f6964> Tj
 ET
 
@@ -22672,7 +23799,18 @@ ET
 BT
 246.24 697.075 Td
 /F3.0 11 Tf
-<2829> Tj
+<28> 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
+251.74 697.075 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -22710,12 +23848,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 103.24000000000001 682.335 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <6966> Tj
 ET
 
@@ -22749,7 +23887,18 @@ ET
 BT
 163.74 682.335 Td
 /F3.0 11 Tf
-<2829> Tj
+<28> 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
+169.24 682.335 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -22787,12 +23936,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 196.74 682.335 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <6e756c6c> Tj
 ET
 
@@ -22842,12 +23991,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 240.74 682.335 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <72657475726e> Tj
 ET
 
@@ -22919,12 +24068,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 196.74 667.595 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <6e756c6c> Tj
 ET
 
@@ -22936,7 +24085,18 @@ ET
 BT
 218.74 667.595 Td
 /F3.0 11 Tf
-<293b> Tj
+<29> 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
+224.24 667.595 Td
+/F3.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -22996,8 +24156,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 224.24 652.855 Td
@@ -23035,7 +24195,18 @@ ET
 BT
 306.74 652.855 Td
 /F3.0 11 Tf
-<293b> Tj
+<29> 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
+312.24 652.855 Td
+/F3.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -23101,7 +24272,29 @@ ET
 BT
 81.24000000000001 623.375 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+86.74000000000001 623.375 Td
+/F3.0 11 Tf
+<2e> 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
+92.24000000000001 623.375 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -23612,12 +24805,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.239999999999995 235.37500000000003 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -23656,12 +24849,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.400 0.733 scn
-0.000 0.400 0.733 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 108.74 235.37500000000003 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <64656661756c744e587878> Tj
 ET
 
@@ -23728,7 +24921,29 @@ ET
 BT
 196.74 235.37500000000003 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+202.24 235.37500000000003 Td
+/F3.0 11 Tf
+<2e> 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.74 235.37500000000003 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -23790,28 +25005,27 @@ Q
 
 endstream
 endobj
-178 0 obj
+177 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 177 0 R
+/Contents 176 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
-/F7.0 141 0 R
 /F3.0 18 0 R
-/F3.1 142 0 R
+/F3.1 141 0 R
 /F4.0 19 0 R
 /F2.0 16 0 R
-/F1.1 176 0 R
+/F1.1 175 0 R
 /F6.0 44 0 R
 >>
-/XObject << /Stamp1 1026 0 R
+/XObject << /Stamp1 1025 0 R
 >>
 >>
-/Annots [179 0 R 180 0 R 181 0 R 183 0 R 184 0 R 185 0 R]
+/Annots [178 0 R 179 0 R 180 0 R 182 0 R 183 0 R 184 0 R]
 >>
 endobj
-179 0 obj
+178 0 obj
 << /Border [0 0 0]
 /Dest (_rgcms_methods_prefixes_modify)
 /Subtype /Link
@@ -23819,7 +25033,7 @@ endobj
 /Type /Annot
 >>
 endobj
-180 0 obj
+179 0 obj
 << /Border [0 0 0]
 /Dest (_rgcms_methods_prefixes_modify)
 /Subtype /Link
@@ -23827,7 +25041,7 @@ endobj
 /Type /Annot
 >>
 endobj
-181 0 obj
+180 0 obj
 << /Border [0 0 0]
 /Dest (_rgcms_methods_prefixes_modify)
 /Subtype /Link
@@ -23835,10 +25049,10 @@ endobj
 /Type /Annot
 >>
 endobj
-182 0 obj
-[178 0 R /XYZ 0 511.3800000000001 null]
+181 0 obj
+[177 0 R /XYZ 0 511.3800000000001 null]
 endobj
-183 0 obj
+182 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -23849,7 +25063,7 @@ endobj
 /Type /Annot
 >>
 endobj
-184 0 obj
+183 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -23860,7 +25074,7 @@ endobj
 /Type /Annot
 >>
 endobj
-185 0 obj
+184 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -23871,11 +25085,11 @@ endobj
 /Type /Annot
 >>
 endobj
-186 0 obj
-[178 0 R /XYZ 0 315.86000000000007 null]
+185 0 obj
+[177 0 R /XYZ 0 315.86000000000007 null]
 endobj
-187 0 obj
-<< /Length 29283
+186 0 obj
+<< /Length 32310
 >>
 stream
 q
@@ -23909,13 +25123,13 @@ h
 S
 Q
 /DeviceRGB cs
-0.000 0.533 0.000 scn
+0.000 0.400 0.600 scn
 /DeviceRGB CS
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 SCN
 
 BT
 59.24 783.0649999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -23932,12 +25146,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 783.0649999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -23954,12 +25168,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 783.0649999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <53686f7070696e67436172744974656d> Tj
 ET
 
@@ -23998,8 +25212,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 768.3249999999999 Td
@@ -24064,8 +25278,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 224.24 768.3249999999999 Td
@@ -24097,12 +25311,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 753.585 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -24158,7 +25372,18 @@ ET
 BT
 218.74 753.585 Td
 /F3.0 11 Tf
-<2829> Tj
+<28> 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
+224.24 753.585 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -24202,7 +25427,29 @@ ET
 BT
 246.24 753.585 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+251.74 753.585 Td
+/F3.0 11 Tf
+<2e> 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
+257.24 753.585 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -24240,12 +25487,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 738.845 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -24262,12 +25509,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 738.845 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <766f6964> Tj
 ET
 
@@ -24389,7 +25636,29 @@ ET
 BT
 312.24 738.845 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+317.74 738.845 Td
+/F3.0 11 Tf
+<2e> 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
+323.24 738.845 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -24427,8 +25696,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 709.365 Td
@@ -24493,8 +25762,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 224.24 709.365 Td
@@ -24526,12 +25795,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 694.625 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -24548,12 +25817,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 694.625 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <696e74> Tj
 ET
 
@@ -24587,7 +25856,18 @@ ET
 BT
 202.24 694.625 Td
 /F3.0 11 Tf
-<2829> Tj
+<28> 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.74 694.625 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -24631,7 +25911,29 @@ ET
 BT
 229.74 694.625 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+235.24 694.625 Td
+/F3.0 11 Tf
+<2e> 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
+240.74 694.625 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -24669,12 +25971,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 679.885 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -24691,12 +25993,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 679.885 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <766f6964> Tj
 ET
 
@@ -24735,12 +26037,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 213.24 679.885 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <696e74> Tj
 ET
 
@@ -24818,7 +26120,29 @@ ET
 BT
 301.24 679.885 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+306.74 679.885 Td
+/F3.0 11 Tf
+<2e> 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
+312.24 679.885 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -24856,8 +26180,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 650.405 Td
@@ -24922,8 +26246,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 246.24 650.405 Td
@@ -24955,12 +26279,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 635.665 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -25087,8 +26411,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 103.24000000000001 606.185 Td
@@ -25131,13 +26455,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 229.74 606.185 Td
 /F3.0 11 Tf
-<225175616e7469747922> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+235.24 606.185 Td
+/F3.0 11 Tf
+<5175616e74697479> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+279.24 606.185 Td
+/F3.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -25164,12 +26510,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 103.24000000000001 591.4449999999999 Td
-/F7.0 11 Tf
+/F3.0 11 Tf
 <66696e616c> Tj
 ET
 
@@ -25186,8 +26532,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 136.24 591.4449999999999 Td
@@ -25302,7 +26648,18 @@ ET
 BT
 202.24 576.7049999999999 Td
 /F3.0 11 Tf
-<293b> Tj
+<29> 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.74 576.7049999999999 Td
+/F3.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2

<TRUNCATED>

[10/44] isis-site git commit: ISIS-1594: provide an 'edit' button

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/guides/ugvw.pdf
----------------------------------------------------------------------
diff --git a/content/guides/ugvw.pdf b/content/guides/ugvw.pdf
index 9363c66..451a0cc 100644
--- a/content/guides/ugvw.pdf
+++ b/content/guides/ugvw.pdf
@@ -4,16 +4,16 @@
 << /Title (Wicket Viewer)
 /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:20170219155414+00'00')
-/ModDate (D:20170219155414+00'00')
+/CreationDate (D:20170307234603+00'00')
+/ModDate (D:20170307234603+00'00')
 >>
 endobj
 2 0 obj
 << /Type /Catalog
 /Pages 3 0 R
 /Names 16 0 R
-/Outlines 529 0 R
-/PageLabels 574 0 R
+/Outlines 528 0 R
+/PageLabels 573 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 59
-/Kids [7 0 R 10 0 R 12 0 R 14 0 R 38 0 R 50 0 R 63 0 R 72 0 R 80 0 R 89 0 R 95 0 R 101 0 R 111 0 R 113 0 R 128 0 R 135 0 R 143 0 R 150 0 R 153 0 R 164 0 R 170 0 R 176 0 R 186 0 R 196 0 R 205 0 R 213 0 R 220 0 R 226 0 R 234 0 R 244 0 R 250 0 R 261 0 R 266 0 R 270 0 R 278 0 R 282 0 R 297 0 R 300 0 R 309 0 R 313 0 R 321 0 R 329 0 R 336 0 R 338 0 R 345 0 R 349 0 R 355 0 R 358 0 R 362 0 R 366 0 R 373 0 R 376 0 R 393 0 R 406 0 R 409 0 R 417 0 R 425 0 R 429 0 R 434 0 R]
+/Kids [7 0 R 10 0 R 12 0 R 14 0 R 38 0 R 50 0 R 63 0 R 71 0 R 79 0 R 88 0 R 94 0 R 100 0 R 110 0 R 112 0 R 127 0 R 134 0 R 142 0 R 149 0 R 152 0 R 163 0 R 169 0 R 175 0 R 185 0 R 195 0 R 204 0 R 212 0 R 219 0 R 225 0 R 233 0 R 243 0 R 249 0 R 260 0 R 265 0 R 269 0 R 277 0 R 281 0 R 296 0 R 299 0 R 308 0 R 312 0 R 320 0 R 328 0 R 335 0 R 337 0 R 344 0 R 348 0 R 354 0 R 357 0 R 361 0 R 365 0 R 372 0 R 375 0 R 392 0 R 405 0 R 408 0 R 416 0 R 424 0 R 428 0 R 433 0 R]
 >>
 endobj
 4 0 obj
@@ -78,13 +78,13 @@ endobj
 endobj
 8 0 obj
 << /Type /Font
-/BaseFont /AAAAEZ+NotoSerif
+/BaseFont /AAAAEK+NotoSerif
 /Subtype /TrueType
-/FontDescriptor 576 0 R
+/FontDescriptor 575 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 578 0 R
-/ToUnicode 577 0 R
+/Widths 577 0 R
+/ToUnicode 576 0 R
 >>
 endobj
 9 0 obj
@@ -1651,7 +1651,7 @@ endobj
 /F4.0 53 0 R
 >>
 >>
-/Annots [443 0 R 444 0 R 445 0 R 446 0 R 447 0 R 448 0 R 449 0 R 450 0 R 451 0 R 452 0 R 453 0 R 454 0 R 455 0 R 456 0 R 457 0 R 458 0 R 459 0 R 460 0 R 461 0 R 462 0 R 463 0 R 464 0 R 465 0 R 466 0 R 467 0 R 468 0 R 469 0 R 470 0 R 471 0 R 472 0 R 473 0 R 474 0 R 475 0 R 476 0 R 477 0 R 478 0 R 479 0 R 480 0 R 481 0 R 482 0 R 483 0 R 484 0 R 485 0 R 486 0 R 487 0 R 488 0 R 489 0 R 490 0 R 491 0 R 492 0 R 493 0 R 494 0 R 495 0 R 496 0 R 497 0 R 498 0 R 499 0 R 500 0 R 501 0 R 502 0 R 503 0 R 504 0 R 505 0 R 506 0 R 507 0 R 508 0 R 509 0 R 510 0 R 511 0 R 512 0 R 513 0 R 514 0 R 515 0 R 516 0 R 517 0 R 518 0 R 519 0 R]
+/Annots [442 0 R 443 0 R 444 0 R 445 0 R 446 0 R 447 0 R 448 0 R 449 0 R 450 0 R 451 0 R 452 0 R 453 0 R 454 0 R 455 0 R 456 0 R 457 0 R 458 0 R 459 0 R 460 0 R 461 0 R 462 0 R 463 0 R 464 0 R 465 0 R 466 0 R 467 0 R 468 0 R 469 0 R 470 0 R 471 0 R 472 0 R 473 0 R 474 0 R 475 0 R 476 0 R 477 0 R 478 0 R 479 0 R 480 0 R 481 0 R 482 0 R 483 0 R 484 0 R 485 0 R 486 0 R 487 0 R 488 0 R 489 0 R 490 0 R 491 0 R 492 0 R 493 0 R 494 0 R 495 0 R 496 0 R 497 0 R 498 0 R 499 0 R 500 0 R 501 0 R 502 0 R 503 0 R 504 0 R 505 0 R 506 0 R 507 0 R 508 0 R 509 0 R 510 0 R 511 0 R 512 0 R 513 0 R 514 0 R 515 0 R 516 0 R 517 0 R 518 0 R]
 >>
 endobj
 11 0 obj
@@ -1834,7 +1834,7 @@ endobj
 /Font << /F1.0 8 0 R
 >>
 >>
-/Annots [520 0 R 521 0 R 522 0 R 523 0 R 524 0 R 525 0 R 526 0 R 527 0 R]
+/Annots [519 0 R 520 0 R 521 0 R 522 0 R 523 0 R 524 0 R 525 0 R 526 0 R]
 >>
 endobj
 13 0 obj
@@ -2477,7 +2477,7 @@ endobj
 /Font << /F2.0 18 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 528 0 R
+/XObject << /Stamp1 527 0 R
 >>
 >>
 /Annots [19 0 R 20 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 33 0 R 34 0 R 35 0 R 36 0 R]
@@ -2492,18 +2492,18 @@ endobj
 >>
 endobj
 17 0 obj
-<< /Kids [104 0 R 353 0 R 427 0 R 228 0 R 419 0 R 105 0 R 441 0 R 238 0 R]
+<< /Kids [103 0 R 352 0 R 426 0 R 227 0 R 418 0 R 104 0 R 440 0 R 237 0 R]
 >>
 endobj
 18 0 obj
 << /Type /Font
-/BaseFont /AAAAFA+NotoSerif-Bold
+/BaseFont /AAAAEL+NotoSerif-Bold
 /Subtype /TrueType
-/FontDescriptor 580 0 R
+/FontDescriptor 579 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 582 0 R
-/ToUnicode 581 0 R
+/Widths 581 0 R
+/ToUnicode 580 0 R
 >>
 endobj
 19 0 obj
@@ -3033,7 +3033,7 @@ endobj
 /F3.1 45 0 R
 >>
 /XObject << /I1 43 0 R
-/Stamp1 528 0 R
+/Stamp1 527 0 R
 >>
 >>
 /Annots [42 0 R 44 0 R 46 0 R]
@@ -3557,13 +3557,13 @@ endobj
 endobj
 45 0 obj
 << /Type /Font
-/BaseFont /AAAAFB+FontAwesome
+/BaseFont /AAAAEM+FontAwesome
 /Subtype /TrueType
-/FontDescriptor 584 0 R
+/FontDescriptor 583 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 586 0 R
-/ToUnicode 585 0 R
+/Widths 585 0 R
+/ToUnicode 584 0 R
 >>
 endobj
 46 0 obj
@@ -3985,7 +3985,7 @@ endobj
 /F5.0 54 0 R
 >>
 /XObject << /I2 60 0 R
-/Stamp1 528 0 R
+/Stamp1 527 0 R
 >>
 >>
 /Annots [52 0 R 57 0 R 59 0 R 61 0 R]
@@ -4004,24 +4004,24 @@ endobj
 endobj
 53 0 obj
 << /Type /Font
-/BaseFont /AAAAFC+mplus1mn-regular
+/BaseFont /AAAAEN+mplus1mn-regular
 /Subtype /TrueType
-/FontDescriptor 588 0 R
+/FontDescriptor 587 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 590 0 R
-/ToUnicode 589 0 R
+/Widths 589 0 R
+/ToUnicode 588 0 R
 >>
 endobj
 54 0 obj
 << /Type /Font
-/BaseFont /AAAAFD+mplus-1p-regular
+/BaseFont /AAAAEO+mplus-1p-regular
 /Subtype /TrueType
-/FontDescriptor 592 0 R
+/FontDescriptor 591 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 594 0 R
-/ToUnicode 593 0 R
+/Widths 593 0 R
+/ToUnicode 592 0 R
 >>
 endobj
 55 0 obj
@@ -4508,7 +4508,7 @@ endobj
 >>
 endobj
 62 0 obj
-<< /Length 11466
+<< /Length 11752
 >>
 stream
 q
@@ -4985,8 +4985,8 @@ f
 h
 S
 Q
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 59.24000000000001 236.73096434359812 Td
@@ -5062,8 +5062,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 229.74 221.99096434359814 Td
@@ -5084,12 +5084,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24000000000001 192.51096434359812 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -5106,12 +5106,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 192.51096434359812 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -5128,12 +5128,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 192.51096434359812 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <4c65617365> Tj
 ET
 
@@ -5178,7 +5178,29 @@ ET
 BT
 174.74 192.51096434359812 Td
 /F4.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+180.24 192.51096434359812 Td
+/F4.0 11 Tf
+<2e> 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
+185.74 192.51096434359812 Td
+/F4.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5265,10 +5287,9 @@ endobj
 /F1.0 8 0 R
 /F4.0 53 0 R
 /F2.0 18 0 R
-/F6.0 70 0 R
 >>
 /XObject << /I3 66 0 R
-/Stamp1 528 0 R
+/Stamp1 527 0 R
 >>
 >>
 /Annots [64 0 R 65 0 R 67 0 R 69 0 R]
@@ -5707,18 +5728,7 @@ endobj
 >>
 endobj
 70 0 obj
-<< /Type /Font
-/BaseFont /AAAAFE+mplus1mn-bold
-/Subtype /TrueType
-/FontDescriptor 596 0 R
-/FirstChar 32
-/LastChar 255
-/Widths 598 0 R
-/ToUnicode 597 0 R
->>
-endobj
-71 0 obj
-<< /Length 20176
+<< /Length 21122
 >>
 stream
 q
@@ -5752,9 +5762,9 @@ h
 S
 Q
 /DeviceRGB cs
-0.333 0.333 0.333 scn
+0.600 0.600 1.000 scn
 /DeviceRGB CS
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 SCN
 
 BT
 59.24 783.0649999999999 Td
@@ -5830,8 +5840,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 229.74 768.3249999999999 Td
@@ -5852,12 +5862,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24 738.845 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -5874,12 +5884,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 738.845 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -5896,12 +5906,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 738.845 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <4c656173654974656d> Tj
 ET
 
@@ -5946,7 +5956,29 @@ ET
 BT
 196.74 738.845 Td
 /F4.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+202.24 738.845 Td
+/F4.0 11 Tf
+<2e> 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.74 738.845 Td
+/F4.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6033,12 +6065,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24 662.3249999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -6055,12 +6087,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 662.3249999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -6077,12 +6109,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 662.3249999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <546f446f4974656d> Tj
 ET
 
@@ -6105,7 +6137,29 @@ ET
 BT
 180.24 662.3249999999999 Td
 /F4.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+185.74 662.3249999999999 Td
+/F4.0 11 Tf
+<2e> 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
+191.24 662.3249999999999 Td
+/F4.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6143,8 +6197,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 647.5849999999999 Td
@@ -6220,8 +6274,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 224.24 632.845 Td
@@ -6264,8 +6318,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 603.365 Td
@@ -6341,8 +6395,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 257.24 588.625 Td
@@ -6385,12 +6439,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 559.145 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -6407,8 +6461,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 559.145 Td
@@ -6479,7 +6533,18 @@ ET
 BT
 279.24 559.145 Td
 /F4.0 11 Tf
-<2829> Tj
+<28> 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
+284.74 559.145 Td
+/F4.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6523,7 +6588,29 @@ ET
 BT
 306.74 559.145 Td
 /F4.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+312.24 559.145 Td
+/F4.0 11 Tf
+<2e> 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
+317.74 559.145 Td
+/F4.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6567,7 +6654,29 @@ ET
 BT
 81.24000000000001 544.405 Td
 /F4.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+86.74000000000001 544.405 Td
+/F4.0 11 Tf
+<2e> 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
+92.24000000000001 544.405 Td
+/F4.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6864,35 +6973,13 @@ f
 h
 S
 Q
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-59.24000000000001 190.2449999999998 Td
-/F6.0 11 Tf
-<697369732e7669657765722e7769636b65742e626f6f6b6d61726b656450616765732e6d617853697a65> 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
-290.24 190.2449999999998 Td
-/F4.0 11 Tf
-<3d> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-295.74 190.2449999999998 Td
+59.24000000000001 190.2449999999998 Td
 /F4.0 11 Tf
-<3230> Tj
+<697369732e7669657765722e7769636b65742e626f6f6b6d61726b656450616765732e6d617853697a653d3230> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6988,25 +7075,24 @@ Q
 
 endstream
 endobj
-72 0 obj
+71 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 71 0 R
+/Contents 70 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F4.0 53 0 R
-/F6.0 70 0 R
 /F1.0 8 0 R
 /F3.1 45 0 R
 /F2.0 18 0 R
 >>
-/XObject << /Stamp1 528 0 R
+/XObject << /Stamp1 527 0 R
 >>
 >>
-/Annots [73 0 R 76 0 R]
+/Annots [72 0 R 75 0 R]
 >>
 endobj
-73 0 obj
+72 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -7017,13 +7103,13 @@ endobj
 /Type /Annot
 >>
 endobj
+73 0 obj
+[71 0 R /XYZ 0 452.19 null]
+endobj
 74 0 obj
-[72 0 R /XYZ 0 452.19 null]
+[71 0 R /XYZ 0 347.56999999999994 null]
 endobj
 75 0 obj
-[72 0 R /XYZ 0 347.56999999999994 null]
-endobj
-76 0 obj
 << /Border [0 0 0]
 /Dest (_ugvw_features_recent-pages)
 /Subtype /Link
@@ -7031,13 +7117,13 @@ endobj
 /Type /Annot
 >>
 endobj
+76 0 obj
+[71 0 R /XYZ 0 289.90999999999985 null]
+endobj
 77 0 obj
-[72 0 R /XYZ 0 289.90999999999985 null]
+[71 0 R /XYZ 0 164.3299999999998 null]
 endobj
 78 0 obj
-[72 0 R /XYZ 0 164.3299999999998 null]
-endobj
-79 0 obj
 << /Length 3755
 >>
 stream
@@ -7273,27 +7359,27 @@ Q
 
 endstream
 endobj
-80 0 obj
+79 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 79 0 R
+/Contents 78 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F2.0 18 0 R
 /F3.1 45 0 R
 >>
-/XObject << /I4 84 0 R
-/Stamp1 528 0 R
+/XObject << /I4 83 0 R
+/Stamp1 527 0 R
 >>
 >>
-/Annots [82 0 R 85 0 R 86 0 R]
+/Annots [81 0 R 84 0 R 85 0 R]
 >>
 endobj
-81 0 obj
-[80 0 R /XYZ 0 751.08 null]
+80 0 obj
+[79 0 R /XYZ 0 751.08 null]
 endobj
-82 0 obj
+81 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -7304,10 +7390,10 @@ endobj
 /Type /Annot
 >>
 endobj
-83 0 obj
-[80 0 R /XYZ 0 674.2400000000002 null]
+82 0 obj
+[79 0 R /XYZ 0 674.2400000000002 null]
 endobj
-84 0 obj
+83 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 1080
@@ -7796,7 +7882,7 @@ k
 \ufffd-@=U\ufffd
\ufffdycv
 endstream
 endobj
-85 0 obj
+84 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -7807,7 +7893,7 @@ endobj
 /Type /Annot
 >>
 endobj
-86 0 obj
+85 0 obj
 << /Border [0 0 0]
 /Dest ()
 /Subtype /Link
@@ -7815,7 +7901,7 @@ endobj
 /Type /Annot
 >>
 endobj
-87 0 obj
+86 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 1080
@@ -8197,7 +8283,7 @@ m
 \u04df\ufffdd\ufffdX|\ufffd\ufffd\ufffd21\ufffd7_x\ufffd\ufffd\ufffdj\ufffd\ufffd\ufffd\ufffd~T\ufffd\ufffd&\ufffd\ufffd_\ufffd\ufffd^J\ufffd*[\ufffd\ufffd\ufffdo*\ufffd3;V\ufffdu\ufffdil[\ufffd\ufffd\ufffd\ufffdL\ufffd\ufffd\ufffd\ufffd\ufffdki\ufffdo[}\ufffd\ufffdmu\ufffd\ufffd\ufffd\u06fak\ufffd\ufffd\ufffdm~]5\ufffd\ufffdRcc;\ufffd\ufffd\ufffd\ufffd\ufffd*\ufffd\ufffd7^\ufffd|y\ufffd\ufffdwW3\ufffdC\ufffdMc\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd?\ufffd\ufffd\ufffdk29\ufffd\ufffd\u0326\u06fa\ufffd\ufffdUk\u0674\ufffd\ufffdJc^\u0323\ufffd~\ufffdg\ufffddJl\ufffd\u01b6\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdM?cx\ufffd\ufffd<]6\ufffd\ufffdC\ufffd4\ufffduUx\ufffd:6\ufffd{f\ufffd'\ufffd\ufffd|)Z	a)T\ufffdX,\ufffd_C_\ufffd\ufffd\ufffd\ufffd\ufffd4$\ufffd\ufffd\ufffd\ufffd?\ufffd\uff33\ufffd\ufffd\ufffd)m\ufffd~k\ufffd\u0626\ufffd\u01df\ufffd,\ufffd\ufffd\ufffdo\ufffd1iZ\ufffd:\u01e4XL\ufffd\ufffdd\ufffdj\ufffd\u05b2\ufffd\ufffd\ufffdbc\ufffd\ufffdP\ufffd\ufffd\ufffd8+\ufffd\ufffd\ufffdm\ufffd\ufffd\ufffd\ufffd\ufffdA\ufffd\ufffd.\ufffd\ufffd\ufffd\u06e6w\ufffd\ufffdm5\ufffdw\ufffd\ufffdT\ufffd\ufffd\ufffd\ufffd\ufffdW_\ufffdG\ufffd\ufffd\ufffdo\ufffd=Fc+""\ufffd2\ufffd?\ufffd\uff33z\ufffd\ufffdJ\ufffd7`\ufffd\ufffdil\ufffdU\ufffd\u014b\ufffdV1y\ufffd\ufffdQ\ufffdL/\ufffd\u0434\ufffd<}\ufffd\ufffd\ufffdl\ufffd\ufffdZ\ufffdVk\ufffd\ufffd\ufffd&\ufffd_\ufffd\ufffdn\ufffdtc\ufffd~\ufffd\ufffdK\ufffdjl\ufffd\ufffd\ufffd \ufffd[\u01f6\ufffd/sK\ufffd\ufffd\ufffd\u0265\ufffd\ufffdR\ufffd/\ufffd\ufffd\ufffd\ufffd7\ufffd\ufffd\ufffd\ufffdg\ufffd9}&|\ufffd\ufffd_}\ufffd\ufffdi\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdk\ufffd\ufffd\ufffd\ufffd\ufffd\u05a6\ufffd\ufffd\ufffd\ufffdwQ\ufffd\ufffdL\ufffd\[[\ufffdX\ufffd3n\ufffd
 M\ufffd\ufffd\u07ae\ufffd\ufffdi\ufffdM\ufffdn\ufffd\u0636\u07ff\u06ba\ufffdZ\ufffdcc\ufffdq\ufffdm\ufffd\ufffd\ufffd)\u0471\ufffd\ufffd\ufffdn{7\ufffd\ufffd~\ufffdxnr1X|\ufffd\ufffd\ufffd\ufffd\u06ff\ufffd\ufffdO?\ufffd\(N.V?\ufffd\ufffd\ufffd~\ufffd;\ufffd\ufffd\ufffd\ufffdH\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd
n\ufffd\u06e4\ufffd\ufffd\ufffd\ufffd\ufffdZ\ufffd\ufffd\ufffd}4jw\ufffdy(Y\ufffd\ufffd"$]d\ufffd\ufffdd[ll\ufffd?\ufffd\ufffd\ufffd\ufffdm\ufffd\ufffd\ufffd\ufffd\ufffd o\ufffd\ufffd\ufffd~U\ufffd\ufffd\ufffdntU\ufffd\ufffdb[ll\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdo\ufffd^>7\ufffd\u0165\ufffd\ufffdWc+""\ufffd![\ufffd\ufffd\ufffd7\ufffdIy\ufffd\ufffd\ufffd\u01d2G\ufffd\u077cY\ufffd\ufffd\ufffd\ufffd\u0413\u01fe\ufffd<\ufffd,\ufffdv+\ufffdm\ufffdB\ufffdZ\ufffd\ufffd\ufffdz\ufffd\ufffd\ufffdA[\ud7dc<]\ufffd^\ufffd\u063c}\ufffd\u0253\ufffd\ufffd\ufffd\ufffdt|\ufffd\ufffd\ufffd\ufffd=\ufffdF\ufffd\ufffd\ufffd\ufffd\ufffdhI\ufffd\ufffdg\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd[\ufffd\ufffd\ufffd\ufffd\u05be\ufffd\ufffd.ePW)\ufffd
\ufffd+\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd=}\ufffd}\ufffd\ufffdMc\ufffd\ufffd]\ufffd$\ufffd\ufffd\ufffd+I\ufffdu\ufffd\ufffd\u04f3\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdV\ufffdk\ufffd\ufffdol\ufffd\ufffdk\ufffd\ufffd;CR\ufffd\ufffd\ufffd\u073dil\ufffd[\ufffd\ufffd>{\ufffd\ufffd\ufffds\ufffd\ufffd\ufffd[\ufffdn\ufffd\ufffd\ufffd\ufffd}c[\ufffd\ufffd\ufffd\ufffd\ufffd\u01a9\ufffdI\u03d8\ufffd+@\ufffd\ufffdN\ufffdm:\ufffd:\ufffd\ufffdMc[\ufffd\ufffdBc\ufffd\ufffd\j\ufffdqn\ufffd\ufffdsz\ufffd\ufffdz\ufffd\ufffd\u016e\ufffdko?H\ufffd!u\ufffdw\ufffd\ufffd\ufffd\ufffd\u0133\ufffdc\ufffd?\ufffd\ufffdcc;z<7\ufffd\ufffd\ufffdO\ufffd<nl_\ufffd^\ufffd7\ufffd\ufffd\ufffd:w\ufffd\u072d\u03f2
 \ufffd!\ufffd\ufffd.CDD$\ufffd\ufffd\u8dce\ufffd-w\ufffd.\ufffd\ufffd\ufffd\ufffd\u049f\ufffd\ufffd\ufffd\ufffdo\ufffd\ufffd\ufffdB\ufffd\ufffd\ufffd\ufffd\ufffdul?\ufffdun\ufffd\u04ff\ufffd\ufffd*DDd\u88f1\ufffdMc;d\ufffdil\ufffd\ufffdJ\ufffdW.\ufffd\ufffdo\ufffd\uf54f~8\ufffdP\ufffd^(^\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd[\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd2\u06e7\ufffd\ufffd\ufffd,-O/\ufffd~\ufffd\ufffd\ufffd-\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd_a\ufffd\ufffd\ufffdOW\ufffdUR\ufffd\ufffdW\ufffdZ\ufffd \ufffd%\ufffdQ\ufffd\ufffd+\ufffdoM\ufffd\ufffd,\ufffdp\ufffdd\ufffdhC\ufffd2\ufffd\ufffd\ub1e4\ufffd$}\ufffd\ua96c_\ufffd\ufffd\ufffdHo\ufffd\ufffd\ufffdMc;d\ufffdol\ufffd\ufffd\ufffd?\ufffd\ufffd\ufffdW_L.[6\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdM67\ufffd9]\ufffd~\ufffdi\ufffd"\ufffd\ufffd\ufffdO+\ufffd\ufffd\ufffdj\ufffd\ufffd\ufffdm\ufffd\ufffd\ufffd9\ufffd\ufffdr5\ufffd""\u04a7hl\ufffd~\ufffd\ufffd\ufffd
5\ufffd\u04cb\ufffd\ufffd\ufffdsl\ufffd\ufffd \ufffd\ufffdza\ufffdb\ufffd&;\ufffdM\ufffd\ufffdu\ufffdDusk\ufffd\ufffd5-\ufffdUDDd\ufffd\ufffd\ufffd\ufffd\ufffd2\ufffdjl\ufffd\ufffd4\u05a4u}l\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdjZ\ufffd64\ufffd\ufffd\ufffd"4\ufffdF\ufffd\ufffd\ufffd\ufffd$[\ufffd\ufffd4\ufffdC\ufffdsc{b~:_il\ufffdJS\ufffd\ufffdS\ufffd-\ufffdx5\ufffd\ufffd\ufffdi\ufffdu\ufffdfm\ufffd\ufffdkk[\ufffd\ufffd\ufffd\ufffd\u0705\ufffd\ufffd\ufffd\ufffd\ufffd;2\ufffd\ufffd\u234d\ufffd\ufffdb\ufffdh\ufffd\ufffd\u0596\ufffd\ufffd\ufffd\ufffd{}\ufffd\u06a1\ufffd\u03b5\u06da/2\u06e1\ufffd\ufffd\ufffdY\ufffd(\ufffd\u060a\ufffdH\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u0245\ufffd\ufffdB0\ufffdrU\ufffdt\ufffd\ufffdL\ufffdMu
 \ufffdnaj\ufffd@\ufffdl\ufffd\ufffdn5v\ufffd\ufffdt\ufffd&Ok\ufffd\ufffd\ufffdt\ufffd\ufffd\ufffdqMk\yW=\ufffd\ufffd\ufffd\ufffd4[z\ufffdEc[l\ufffd\u0626\u05e5
7\u0575\ufffd\ufffd\ufffdi\u02ddSK\ufffd\ufffd]\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdfM\ufffd\ufffd\ufffd\ufffd\ufffdm\ufffd\u7849\ufffd\ufffdl6[zk\ufffd\ufffd|\ufffd\ufffdB)\ufffdWy\ufffd\ufffdh\ufffd\ufffd;!\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd4[z\ufffd\ufffd\u01b6\ufffd"\ufffdg\ufffd\ufffdm\ufffd!\ufffd""\ufffd\ufffdhl\ufffd\ufffd\ufffd\U000d32e5\ufffdB0QVL\ufffd7\ufffd\ufffdK\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u023d\ufffd-\ufffdUnl\ufffd\u0675Ic;\ufffd\1\ufffd\ufffd\ufffd\ufffd"""\ufffdv4\ufffd\ufffd\ufffd\u8253SK5l5\ufffd"""\ufffdFc@o\ufffd6\ufffdE\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd4\ufffd"""\ufffd\ufffd\ufffd\ufffd\u07aakl\ufffdum\ufffd\ufffd\ufffd\ufffd\ufffd
 endstream
 endobj
-88 0 obj
+87 0 obj
 << /Length 3278
 >>
 stream
@@ -8386,25 +8472,25 @@ Q
 
 endstream
 endobj
-89 0 obj
+88 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 88 0 R
+/Contents 87 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/XObject << /I5 87 0 R
-/I6 92 0 R
-/Stamp1 528 0 R
+/XObject << /I5 86 0 R
+/I6 91 0 R
+/Stamp1 527 0 R
 >>
 /Font << /F1.0 8 0 R
 /F4.0 53 0 R
 /F2.0 18 0 R
 >>
 >>
-/Annots [90 0 R 93 0 R]
+/Annots [89 0 R 92 0 R]
 >>
 endobj
-90 0 obj
+89 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -8415,10 +8501,10 @@ endobj
 /Type /Annot
 >>
 endobj
-91 0 obj
-[89 0 R /XYZ 0 398.55596434359813 null]
+90 0 obj
+[88 0 R /XYZ 0 398.55596434359813 null]
 endobj
-92 0 obj
+91 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 1080
@@ -8899,7 +8985,7 @@ l35
 o\u0652\ufffdPX\u019a5\u0170\ufffd\ufffd\ufffd\u05efO\ufffd/9I\ufffd'LHf\ufffd\ufffdG\ufffd\ufffdr\ufffdvz#l\ufffd\ufffd7\ufffdxb\ufffdv_\ufffd\ufffd\ufffd\ufffd&\ufffd'\ufffd\ufffdl2\ufffd\ufffd\ufffdf\ufffdr\ufffd\ufffd\ufffd6hw\ufffdQ\ufffd\ufffd\ufffdvC\ufffd]\ufffd\ufffdQ\ufffd\ufffd8\u4483D\ufffd\ufffd47\ufffd#\ufffd<\ufffd\ufffdhiY\ufffd5\ufffd\ufffd\ufffd\uf2a9b{g\ufffd\ufffd\ufffdu\ufffd\ufffdv5\ufffdm~\ufffd\ufffd\ufffd\ufffd\ufffd3_tQ\ufffdE&/\ufffdtc\ufffd�\ufffd\ufffd\ubdff\ufffdW\ufffd\ufffd \ufffd>3Y\ufffdnay\ufffdCR`\ufffd~}\ufffd\ufffdd|\ufffd\ufffdp\ufffd\ufffd9\ufffdp\ufffd\ufffd\ufffd5	s\ufffd\ufffdU^\ufffdE\ufffdTmT\ufffd\ufffd\ufffdS\ufffdUWu\ufffdV\ufffdA\ufffd\ufffd\u078e\u01f3\ufffd\ufffdcK\ufffd\ufffdu\ufffd\ufffd\ufffd\ufffdc\ufffd\ufffd\ufffdLI\u0281\u02ee\ufffdv\ufffd\ufffd\ufffd6\ufffd(\ufffdg\ufffd(*\ufffdJ\ufffd\ufffd[\ufffd=\ufffd\ufffd\ufffd\ufffd\ufffde\ufffd^z\ufffd=\ufffd\ufffdS\ufffdU\ufffd\u06dc}\ufffd\u0673g\ufffd\ufffd>2\ufffd_\ufffd?\ufffd\ufffd\ufffd\ufffd\ufffdI>}\ufffd\ufffd7n!n0\ufffdk3\ufffdEW\ufffdj\ufffd\ufffd\ufffd\u0232\ufffdo\u067au\ufffdAYG\ufffd\ufffd\ufffdm\u067aEbPUQ\u06be\ufffd\ufffd\ufffd7\ufffd\ufffd\ufffd\ufffd?t\ufffdA\ufffd:\u880f]p\ufffd\ufffd]\ufffd\ufffd\ufffd6\ufffd\ufffd\ufffd\u036f\ufffd\ufffd\ufffd\ufffdo\ufffd^x\ufffd\ufffd\ufffdk_\ufffd\u059dv\ufffd\ufffd\ufffdf\ufffd\>\ufffdB\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdTW\ufffd\ufffd\ufffdYW\ufffd\ufffd\ufffd\ufffd>\ufffd\ufffdK\ufffd\ufffd\ufffd8\ufffd$\ufffdPc\ufffdg\ufffd\ufffdK\ufffd\ufffd\ufffd\ufffd6)\ufffd\ufffd\ufffd7H\ufffdl\ufffd\ufffdTU\ufffd8_\ufffd\ufffd\ufffd*\ufffd\ufffd\ufffd\ufffd-
 \ufffd\ufffdT[RS\ufffd\ufffd"\u06e88.\ufffd\ufffd\ufffd8n\ufffd+@uE\ufffd\ufffd6]l\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd[\ufffd\ufffdBbPK\ufffdl\ufffd\ufffdA\ufffd\ufffd
 endstream
 endobj
-93 0 obj
+92 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -8910,7 +8996,7 @@ endobj
 /Type /Annot
 >>
 endobj
-94 0 obj
+93 0 obj
 << /Length 6104
 >>
 stream
@@ -9175,24 +9261,24 @@ Q
 
 endstream
 endobj
-95 0 obj
+94 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 94 0 R
+/Contents 93 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F4.0 53 0 R
 /F2.0 18 0 R
 >>
-/XObject << /I7 96 0 R
-/Stamp1 528 0 R
+/XObject << /I7 95 0 R
+/Stamp1 527 0 R
 >>
 >>
-/Annots [97 0 R]
+/Annots [96 0 R]
 >>
 endobj
-96 0 obj
+95 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 1080
@@ -9609,7 +9695,7 @@ p%
 \ufffd{\ufffd,S\ufffd6mZ\ufffd\u0407\ufffd\ufffd\ufffdw\ufffdG\ufffd-\ufffd\ubbcfq\ufffd\ufffd\ufffd\ufffde\ufffd]]1\ufffd\ufffd\ufffd\ufffd\ufffdW_\ufffd\ufffdr\ufffd\ufffd'\ufffd\ufffd\u22e5\ufffdx\ufffd\ufffdm\ufffd	\ufffdw\u0184\ufffd=\ufffd3\ufffdzk\\ufffd\ufffd\ufffd1z#\ufffd\ufffdJ\ufffd\ufffd\ufffd\ufffdxGy'.y\ufffd.\ufffd\ufffd\ufffdzW\ufffdd,\ufffd\ufffd\ufffd\ufffd|\ufffd\ufffdm\ufffd\ufffd\ufffd\ufffdKW}\ufffd\ufffd\ufffd \ufffd.\ufffdr\ufffd$$I\ufffdA4\ufffd\ufffd
L\ufffd<O\ufffd\u06fflY\ufffd7\ufffd}\ufffd\ufffdR\ufffd8\u04bf\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u0550\ufffdA\ufffd\ufffd?\ufffdg=:|\ufffd}(f\ufffd\ufffd\u024b!\u06d8\ufffd\ufffd\ufffd\ufffd\ufffdg\ufffd\ufffd\ufffdW\ufffd\ufffd \ufffd>sy\ufffdnqy\ufffd\ufffd\ufffd\ufffdv\u06f6\ufffd_\ufffdK\ufffd\ufffd\ufffd\ufffd{\ufffdw\ufffd\ufffdw\ufffd\ufffdan\ufffd\ufffd*+|\ufffd8\ufffd0\u056b}\ufffd\ufffd�U\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd}<y?\ufffd\ufffd\ufffd\ufffd\ufffds\ufffdlo~s\ufffd\ufffd\ufffd	\ufffd\ufffd;\ufffd\ufffd\ufffd;\ufffd/&Ib>\ufffd$I\ufffdU<HKo\ufffd^\ufffd\ufffd\ufffd8i\ufffdg\ufffd=\ufffd\ufffd\ufffd^\ufffd\ufffd{\ufffd\ufffd\ufffd\ufffdC\u3730n\ufffd\ufffd3g\ufffd\ufffd\ufffd7\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd}\ufffdg\u05ee\u04b6\ufffds\ufffd\ufffd\ufffdGW\ufffdZK\ufffd\ufffd\ufffd7>r\ufffd
\ufffd_\ufffdwDx\ufffd\ufffd>rXbPSI\u05be\ufffdg\ufffd\ufffd]\ufffd?\ufffd\ufffd\ufffdkn\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdg7Il\ufffdc\ufffd\ufffd\ufffd\ufffd\ufffd_\ufffd\ufffd+\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdv\ufffd\ufffdU_\ufffd\ufffd\ufffdq5\ufffdS\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd&U\ufffdU\u03fa"@
 \ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd4M\ufffd\ufffd-\ufffd\u0647?\ufffd\ufffdz/\ufffd:\ufffd\ufffdXv\ufffd+\ufffdT\ufffdl\ufffd\ufffd\ufffdT\ufffd\ufffd\ufffdP\ufffd\ufffd\ufffdU*}Qc0U\ufffd\ufffd\ufffd\ufffdXS\ufffd\ufffd\ufffd"\u06e44.\ufffd\ufffd\ufffd4y\ufffd+@m%E\ufffd\ufffd.\ufffdAbPWi\ufffd\ufffd-\ufffdT!\ufffd\ufffd\ufffd\ufffd~\ufffd\ufffd\ufffd\ufffdV\ufffd\ufffd
 endstream
 endobj
-97 0 obj
+96 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -9620,10 +9706,10 @@ endobj
 /Type /Annot
 >>
 endobj
-98 0 obj
-[95 0 R /XYZ 0 223.37596434359818 null]
+97 0 obj
+[94 0 R /XYZ 0 223.37596434359818 null]
 endobj
-99 0 obj
+98 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 968
@@ -9926,7 +10012,7 @@ M
 \ufffd}\ufffdxd7\ufffd;\ufffd\ufffdC\ufffd\ufffd\ufffd\ufffdCBv7\ufffd\ufffdY\ufffd\ufffd8\ufffd\ufffdO\ufffd\u03d3\ufffd\ufffd\u077dx<\ufffd\ufffd\u06c7\ufffd\ufffd\ufffd\ufffd8 \ufffd\ufffd\ufffd'\ufffd~\ufffd\ufffd%\ufffd\ufffd\ufffd\ufffdO\ufffd\ufffd\ufffd\u07fe\ufffd\ufffd\ufffd\ufffd\ufffdhv{\ufffd\ufffd\ufffdCqz~~zv\ufffd\ufffd2\ufffd\ufffd\ufffd\ufffd\ufffd\u077b\ufffd\ufffdx\ufffd\ufffdw\ufffd\ufffd\ufffd\ufffd\ufffd7\ufffd\ufffd\ufffdV\ufffd\u049bD\ufffdo\ufffd\ufffdph\ufffdU7\ufffd\u0e11\ufffd\u01cd\ufffd8n\ufffd\ufffd\ufffdWNG\ufffd_M\u0203
 endstream
 endobj
-100 0 obj
+99 0 obj
 << /Length 5095
 >>
 stream
@@ -10218,25 +10304,25 @@ Q
 
 endstream
 endobj
-101 0 obj
+100 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 100 0 R
+/Contents 99 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/XObject << /I8 99 0 R
-/I9 107 0 R
-/Stamp1 528 0 R
+/XObject << /I8 98 0 R
+/I9 106 0 R
+/Stamp1 527 0 R
 >>
 /Font << /F2.0 18 0 R
 /F1.0 8 0 R
 /F4.0 53 0 R
 >>
 >>
-/Annots [102 0 R 109 0 R]
+/Annots [101 0 R 108 0 R]
 >>
 endobj
-102 0 obj
+101 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -10247,30 +10333,30 @@ endobj
 /Type /Annot
 >>
 endobj
-103 0 obj
-[101 0 R /XYZ 0 458.35254343293957 null]
+102 0 obj
+[100 0 R /XYZ 0 458.35254343293957 null]
 endobj
-104 0 obj
+103 0 obj
 << /Limits [(_ugvw) (_ugvw_customisation_about-page)]
-/Names [(_ugvw) 15 0 R (_ugvw_configuration-properties) 187 0 R (_ugvw_configuration-properties_abbreviating-titles) 214 0 R (_ugvw_configuration-properties_showing-theme-chooser) 254 0 R (_ugvw_configuration-properties_stripped-wicket-tags) 253 0 R (_ugvw_configuration-properties_suppressing-password-reset) 240 0 R (_ugvw_configuration-properties_suppressing-remember-me) 217 0 R (_ugvw_configuration-properties_suppressing-sign-up) 227 0 R (_ugvw_customisation) 301 0 R (_ugvw_customisation_about-page) 325 0 R]
+/Names [(_ugvw) 15 0 R (_ugvw_configuration-properties) 186 0 R (_ugvw_configuration-properties_abbreviating-titles) 213 0 R (_ugvw_configuration-properties_showing-theme-chooser) 253 0 R (_ugvw_configuration-properties_stripped-wicket-tags) 252 0 R (_ugvw_configuration-properties_suppressing-password-reset) 239 0 R (_ugvw_configuration-properties_suppressing-remember-me) 216 0 R (_ugvw_configuration-properties_suppressing-sign-up) 226 0 R (_ugvw_customisation) 300 0 R (_ugvw_customisation_about-page) 324 0 R]
 >>
 endobj
-105 0 obj
+104 0 obj
 << /Limits [(domain-code-2) (how-the-viewer-selects-components)]
-/Names [(domain-code-2) 68 0 R (domain-code-3) 148 0 R (download) 140 0 R (edit-mode) 125 0 R (excel-download) 438 0 R (exporting-the-attributes-into-the-app) 339 0 R (fullcalendar2) 439 0 R (gmap3) 440 0 R (hints) 91 0 R (how-the-viewer-selects-components) 400 0 R]
+/Names [(domain-code-2) 68 0 R (domain-code-3) 147 0 R (download) 139 0 R (edit-mode) 124 0 R (excel-download) 437 0 R (exporting-the-attributes-into-the-app) 338 0 R (fullcalendar2) 438 0 R (gmap3) 439 0 R (hints) 90 0 R (how-the-viewer-selects-components) 399 0 R]
 >>
 endobj
-106 0 obj
-[101 0 R /XYZ 0 369.51254343293954 null]
+105 0 obj
+[100 0 R /XYZ 0 369.51254343293954 null]
 endobj
-107 0 obj
+106 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 72
 /Width 579
 /BitsPerComponent 8
 /ColorSpace /DeviceRGB
-/SMask 108 0 R
+/SMask 107 0 R
 /Length 7718
 /Filter [/FlateDecode]
 /DecodeParms [<< /Predictor 15
@@ -10295,7 +10381,7 @@ Ha2
 &@\ufffd&\u01f1\ufffd7\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd5(�\ufffd\ufffd\ufffd\ufffdyc\ufffdd\ufffd\ufffdZ\ufffd\ufffdo\ufffd\ufffd{\ufffd\ufffd\ufffdL\ufffd\ufffd!Ak[[\ufffd<v\ufffd\ufffd\ufffd/9\ufffd\ufffdB6\ufffdA\ufffd\ufffd\ufffd\ufffdJ0\ufffd(\ufffd2}Dx\ufffd+\ufffdH_\ufffd\ufffdJs8SG\ufffdD\ufffd\ufffd \ufffd\ufffd`9,v\ufffdP\ufffd1b\ufffd*\ufffd\ufffd\u0211#\ufffd^\u018e\ufffd\ufffd3F\u07e5.U\ufffd`{o\ufffd\ufffd\ufffd\ufffd\ufffd84\ufffd\ufffd\ufffddQu1\ufffd\ufffdn\ufffd\ufffd\ufffdy\ufffd\ufffdA\ufffd\ufffd$5.\ufffd\ufffdVUU\ufffdDS\ufffd\ufffd\ufffdI\ufffd\ufffd\ufffd\ufffd\ufffd\u0479\ufffd\ufffdt*\ufffds	\ufffd\ufffdJ\ufffdPQ|`xh\ube04$\ufffd\ufffd\ufffd\ufffd&R\ufffdH\ufffdc\ufffd\ufffd\ufffda\ufffd={\ufffddt\ufffd\ufffd0\ufffd5,TD\u05f0gVd37\ufffdaB\ufffdv\ufffd\u0421\ufffd&\u02199\ufffd\ufffd\ufffde\ufffdJyxEEM	
\ufffd3^\ufffd$a\ufffd\ufffd\ufffd\ufffd,	\ufffd\ufffd\ufffd\ufffd)\ufffdU!\ufffd\ufffd\ufffd"oJ\ufffds\ufffdM\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdO\ufffd\ufffd\ufffd\ufffd~\ufffdC\ufffdY#\ufffd\ufffd\ufffde\ufffd=c!$\ufffd\ufffd\ufffd.4\ufffd\ufffd:\ufffdJ\ufffd\ufffda\ufffd\ufffd'\ufffd\ufffdw-,,,,J\ufffd\ufffd,,,,,J\ufffd\ufffd,,,,,J\ufffd\ufffd\ufffd\ufffd\ufffd
 endstream
 endobj
-108 0 obj
+107 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 72
@@ -10329,7 +10415,7 @@ Bo
 \ufffd\ufffdW\ufffd\ufffdT<\ufffdeT\ufffdt\ufffd.\ufffd\ufffd\ufffd\M\ufffd\ufffdTe\u0313v|\ufffd\ufffdCLG+#\ufffd\u074cv\ufffd!@\ufffdJv\ufffdrT.\ufffd\ufffd\ufffd\ufffd\ufffdaSds\u0231\ufffd-L\ufffd{)R\ufffd\ufffdWP\ufffdCi\ufffdg\ufffd\ufffd\ufffdQ\ufffd\ufffd\ufffd\ufffd\ufffdER\ufffd\ufffdT\ufffd\ufffd\ufffd\ufffdd\ufffd\ufffd\ufffdHj\ufffdT\ufffd\ufffd\ufffd\ufffdC\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd 
 endstream
 endobj
-109 0 obj
+108 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -10340,8 +10426,8 @@ endobj
 /Type /Annot
 >>
 endobj
-110 0 obj
-<< /Length 34085
+109 0 obj
+<< /Length 38881
 >>
 stream
 q
@@ -10375,13 +10461,13 @@ h
 S
 Q
 /DeviceRGB cs
-0.000 0.533 0.000 scn
+0.000 0.400 0.600 scn
 /DeviceRGB CS
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 SCN
 
 BT
 59.24 783.0649999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -10398,12 +10484,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 783.0649999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -10420,12 +10506,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 783.0649999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <437573746f6d6572> Tj
 ET
 
@@ -10464,12 +10550,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 768.3249999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -10486,8 +10572,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 768.3249999999999 Td
@@ -10558,7 +10644,18 @@ ET
 BT
 229.74 768.3249999999999 Td
 /F4.0 11 Tf
-<2829> Tj
+<28> 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
+235.24 768.3249999999999 Td
+/F4.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -10602,7 +10699,29 @@ ET
 BT
 257.24 768.3249999999999 Td
 /F4.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+262.74 768.3249999999999 Td
+/F4.0 11 Tf
+<2e> 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
+268.24 768.3249999999999 Td
+/F4.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -10646,7 +10765,29 @@ ET
 BT
 81.24000000000001 753.585 Td
 /F4.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+86.74000000000001 753.585 Td
+/F4.0 11 Tf
+<2e> 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
+92.24000000000001 753.585 Td
+/F4.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -10745,12 +10886,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24 646.545 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -10767,12 +10908,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 646.545 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -10789,12 +10930,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 646.545 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <50726f64756374> Tj
 ET
 
@@ -10833,12 +10974,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 631.805 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -10855,8 +10996,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 631.805 Td
@@ -10927,7 +11068,18 @@ ET
 BT
 229.74 631.805 Td
 /F4.0 11 Tf
-<2829> Tj
+<28> 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
+235.24 631.805 Td
+/F4.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -10971,7 +11123,29 @@ ET
 BT
 257.24 631.805 Td
 /F4.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+262.74 631.805 Td
+/F4.0 11 Tf
+<2e> 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
+268.24 631.805 Td
+/F4.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -11015,7 +11189,29 @@ ET
 BT
 81.24000000000001 617.065 Td
 /F4.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+86.74000000000001 617.065 Td
+/F4.0 11 Tf
+<2e> 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
+92.24000000000001 617.065 Td
+/F4.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -11146,12 +11342,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24 498.02500000000003 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -11168,12 +11364,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 498.02500000000003 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -11190,12 +11386,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 498.02500000000003 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <4f72646572> Tj
 ET
 
@@ -11234,8 +11430,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 483.285 Td
@@ -11278,13 +11474,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 169.24 483.285 Td
 /F4.0 11 Tf
-<223122> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+174.74 483.285 Td
+/F4.0 11 Tf
+<31> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+180.24 483.285 Td
+/F4.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -11311,12 +11529,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 468.545 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -11372,7 +11590,18 @@ ET
 BT
 229.74 468.545 Td
 /F4.0 11 Tf
-<2829> Tj
+<28> 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
+235.24 468.545 Td
+/F4.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -11416,7 +11645,29 @@ ET
 BT
 257.24 468.545 Td
 /F4.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+262.74 468.545 Td
+/F4.0 11 Tf
+<2e> 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
+268.24 468.545 Td
+/F4.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -11454,8 +11705,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 453.805 Td
@@ -11498,13 +11749,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 169.24 453.805 Td
 /F4.0 11 Tf
-<223222> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+174.74 453.805 Td
+/F4.0 11 Tf
+<32> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+180.24 453.805 Td
+/F4.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -11531,12 +11804,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 439.065 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -11592,7 +11865,18 @@ ET
 BT
 218.74 439.065 Td
 /F4.0 11 Tf
-<2829> Tj
+<28> 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
+224.24 439.065 Td
+/F4.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -11636,7 +11920,29 @@ ET
 BT
 246.24 439.065 Td
 /F4.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+251.74 439.065 Td
+/F4.0 11 Tf
+<2e> 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
+257.24 439.065 Td
+/F4.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -11674,8 +11980,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 424.32500000000005 Td
@@ -11718,13 +12024,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 169.24 424.32500000000005 Td
 /F4.0 11 Tf
-<223322> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+174.74 424.32500000000005 Td
+/F4.0 11 Tf
+<33> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+180.24 424.32500000000005 Td
+/F4.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -11751,12 +12079,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 409.58500000000004 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -11773,8 +12101,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 409.58500000000004 Td
@@ -11812,7 +12140,18 @@ ET
 BT
 224.24 409.58500000000004 Td
 /F4.0 11 Tf
-<2829> Tj
+<28> 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
+229.74 409.58500000000004 Td
+/F4.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -11856,7 +12195,29 @@ ET
 BT
 251.74 409.58500000000004 Td
 /F4.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+257.24 409.58500000000004 Td
+/F4.0 11 Tf
+<2e> 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
+262.74 409.58500000000004 Td
+/F4.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -11900,7 +12261,29 @@ ET
 BT
 81.24000000000001 394.845 Td
 /F4.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+86.74000000000001 394.845 Td
+/F4.0 11 Tf
+<2e> 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
+92.24000000000001 394.845 Td
+/F4.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -12242,12 +12625,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 136.80666666666667 177.12500000000003 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -12264,12 +12647,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 175.30666666666667 177.12500000000003 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -12286,12 +12669,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 208.30666666666667 177.12500000000003 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <4f72646572> Tj
 ET
 
@@ -12330,8 +12713,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 158.80666666666667 162.38500000000005 Td
@@ -12374,13 +12757,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 246.80666666666667 162.38500000000005 Td
 /F4.0 11 Tf
-<223122> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+252.30666666666667 162.38500000000005 Td
+/F4.0 11 Tf
+<31> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+257.8066666666667 162.38500000000005 Td
+/F4.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -12407,8 +12812,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 158.80666666666667 147.64500000000004 Td
@@ -12473,8 +12878,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 318.3066666666667 147.64500000000004 Td
@@ -12506,12 +12911,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 158.80666666666667 132.90500000000003 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -12567,7 +12972,18 @@ ET
 BT
 307.3066666666667 132.90500000000003 Td
 /F4.0 11 Tf
-<2829> Tj
+<28> 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
+312.8066666666667 132.90500000000003 Td
+/F4.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -12611,7 +13027,29 @@ ET
 BT
 334.8066666666667 132.90500000000003 Td
 /F4.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+340.3066666666667 132.90500000000003 Td
+/F4.0 11 Tf
+<2e> 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
+345.8066666666667 132.90500000000003 Td
+/F4.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -12655,7 +13093,29 @@ ET
 BT
 158.80666666666667 118.16500000000003 Td
 /F4.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+164.30666666666667 118.16500000000003 Td
+/F4.0 11 Tf
+<2e> 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
+169.80666666666667 118.16500000000003 Td
+/F4.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -12710,24 +13170,23 @@ Q
 
 endstream
 endobj
-111 0 obj
+110 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 110 0 R
+/Contents 109 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F6.0 70 0 R
-/F4.0 53 0 R
+/Font << /F4.0 53 0 R
 /F1.0 8 0 R
 /F5.0 54 0 R
 /F3.1 45 0 R
 >>
-/XObject << /Stamp1 528 0 R
+/XObject << /Stamp1 527 0 R
 >>
 >>
 >>
 endobj
-112 0 obj
+111 0 obj
 << /Length 6857
 >>
 stream
@@ -13146,25 +13605,25 @@ Q
 
 endstream
 endobj
-113 0 obj
+112 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 112 0 R
+/Contents 111 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F3.1 45 0 R
 /F2.0 18 0 R
 /F4.0 53 0 R
 >>
-/XObject << /I10 122 0 R
-/Stamp1 528 0 R
+/XObject << /I10 121 0 R
+/Stamp1 527 0 R
 >>
 >>
-/Annots [114 0 R 115 0 R 117 0 R 118 0 R 120 0 R 123 0 R 124 0 R]
+/Annots [113 0 R 114 0 R 116 0 R 117 0 R 119 0 R 122 0 R 123 0 R]
 >>
 endobj
-114 0 obj
+113 0 obj
 << /Border [0 0 0]
 /Dest (_ugvw_configuration-properties_abbreviating-titles)
 /Subtype /Link
@@ -13172,7 +13631,7 @@ endobj
 /Type /Annot
 >>
 endobj
-115 0 obj
+114 0 obj
 << /Border [0 0 0]
 /Dest (_ugvw_configuration-properties_abbreviating-titles)
 /Subtype /Link
@@ -13180,10 +13639,10 @@ endobj
 /Type /Annot
 >>
 endobj
-116 0 obj
-[113 0 R /XYZ 0 727.3000000000001 null]
+115 0 obj
+[112 0 R /XYZ 0 727.3000000000001 null]
 endobj
-117 0 obj
+116 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -13194,7 +13653,7 @@ endobj
 /Type /Annot
 >>
 endobj
-118 0 obj
+117 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -13205,10 +13664,10 @@ endobj
 /Type /Annot
 >>
 endobj
-119 0 obj
-[113 0 R /XYZ 0 600.1000000000001 null]
+118 0 obj
+[112 0 R /XYZ 0 600.1000000000001 null]
 endobj
-120 0 obj
+119 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -13219,10 +13678,10 @@ endobj
 /Type /Annot
 >>
 endobj
-121 0 obj
-[113 0 R /XYZ 0 539.0400000000003 null]
+120 0 obj
+[112 0 R /XYZ 0 539.0400000000003 null]
 endobj
-122 0 obj
+121 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 531
@@ -13513,7 +13972,7 @@ q
 **\ufffd\ufffd\ufffd\ufffd:\ufffd\ufffdZZ\ufffdf\ufffdk\ufffd\ufffd\ufffd\ufffd\ufffd#\ufffda@:\ufffd`HG\ufffd\ufffd\ufffd	\ufffd\ufffd
 endstream
 endobj
-123 0 obj
+122 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -13524,7 +13983,7 @@ endobj
 /Type /Annot
 >>
 endobj
-124 0 obj
+123 0 obj
 << /Border [0 0 0]
 /Dest ()
 /Subtype /Link
@@ -13532,10 +13991,10 @@ endobj
 /Type /Annot
 >>
 endobj
-125 0 obj
-[113 0 R /XYZ 0 136.0510638297876 null]
+124 0 obj
+[112 0 R /XYZ 0 136.0510638297876 null]
 endobj
-126 0 obj
+125 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 531
@@ -13845,7 +14304,7 @@ O
 \ufffd\ufffd\u048b\ufffd\u0463\ufffd\ufffd\ufffd\ufffdNJ\ufffd\ufffdTY)\ufffd\ufffd1\ufffd\ufffdi\ufffd#Xl\ufffdc\u01e4\ufffdyM\ufffd\ufffd!\ufffd\ufffd*F\ufffd\ufffd\ufffd\ufffd\ufffdRO\ufffd\ufffd\ufffdrs\ufffd\ufffd\ufffdw\ufffd\ufffd2\ufffd\u02d7\u04ae]\ufffdH\ufffd\ufffd\ufffd\ufffd#\ufffd\ufffdk\ufffdub1\ufffd\u0146\ufffd_\ufffd\ufffdb\ucebaJ\ufffd\ufffdRt\ufffd|ao\ufffddn.\ufffd[\ufffd{\u034f`q\ufffd\ufffd~\ufffd-?.\ufffdr\ufffdJ~`g\ufffd\u022f\ufffd\ufffd.\ufffd\ufffd\ufffd.\\ufffd\ufffd\u06a4\ufffdNy\ufffdd\ufffd>8&X\ufffdN1X\u017a3\ufffd\ufffdSjm\ufffdGpN\ufffdt\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdW\ufffd\u0314<<\u4e79\ufffd+\ufffd--\ufffdN\ufffd\u0396N\ufffd\ufffd\ufffd\ufffd\ufffdW\ufffd\ufffd\ufffd\ufffdY\ufffd\ufffd/\ufffd;'\ufffd\ufffd\u0257\ufffd+''K\u05ee\u026f\ufffd\ufffdl8\ufffd\ufffd\ufffd\ufffd\ufffdP\ufffd\ufffd`qB\\ufffdVK\ufffd\ufffdW#X\ufffdu\ufffd\ufffd\ufffd\ufffdx\ufffd\ufffd\ufffd\ufffd\ufffd\u05e2\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd4cT\ufffd\ufffd\ufffdb\ufffdT\ufffd\ufffd\ufffd\ufffd+ee\ufffd\ufffd\ufffd\ufffdX~I\ufffd\ufffd@\ufffd\ufffd\ufffd\ufffd'",\ufffd\ufffd\u014b\ufffd\ufffd\ufffd\ufffd\ufffdb\u014a\ufffd.\ufffd\ufffdH\ufffd\ufffd\ufffd"\ufffd\ufffd/\ufffd]\ufffd\ufffd\ufffd+v\ufffd\ufffd\ufffd11\u0493'\ufffdA\ufffd\ufffd\ufffd\ufffd\ufffd_S#\ufffd\ufffd#\ufffd\ufffd\ufffd]\ufffdY\ufffd\ufffd\ufffd#,+\ufffd\ufffdxS^\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd`\ufffd\ufffdF0\ufffd\ufffd}0\ufffd$\ufffdv\ufffd\ufffd\ufffd&\ufffdD[\ufffd|X\ufffd\u0635\ufffd\ufffd\ufffd\ufffdb\ufffd\ufffd\ufffdK\u03df\u03fdI\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdM\ufffd\ufffd\ufffd+\ufffdj\ufffd\ufffd\ufffdZG\ufffd\ufffdA\ufffdj\ufffd\ufffd\ufffd\ufffd\ufffdbX
 76\u028bY\ufffdR\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd]\ufffd\ufffd\u03bd\ufffd8\ufffd\ufffd<q\ufffdb\ufffdg\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd"\ufffd\ufffdr\ufffd{\ufffdt\ufffd\ufffd\ufffdZ\ufffd{\ufffd\ufffd\ufffd$\ufffd\ufffd4F0\ufffd\ufffd1\ufffd\ufffd\ufffds\ufffd\u0485\ufffd\ufffd\ufffd\ufffd\ufffd\ufffduF0\ufffdSUU\^^\ufffdckk\ufffd3\ufffd\ufffd\ufffdPF0\ufffd\ufffda@q\ufffd\ufffd\ufffd\ufffd W\ufffd
 endstream
 endobj
-127 0 obj
+126 0 obj
 << /Length 939
 >>
 stream
@@ -13919,24 +14378,24 @@ Q
 
 endstream
 endobj
-128 0 obj
+127 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 127 0 R
+/Contents 126 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/XObject << /I11 126 0 R
-/I12 131 0 R
-/Stamp1 528 0 R
+/XObject << /I11 125 0 R
+/I12 130 0 R
+/Stamp1 527 0 R
 >>
 /Font << /F2.0 18 0 R
 /F1.0 8 0 R
 >>
 >>
-/Annots [129 0 R 132 0 R]
+/Annots [128 0 R 131 0 R]
 >>
 endobj
-129 0 obj
+128 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -13947,10 +14406,10 @@ endobj
 /Type /Annot
 >>
 endobj
-130 0 obj
-[128 0 R /XYZ 0 512.1210638297873 null]
+129 0 obj
+[127 0 R /XYZ 0 512.1210638297873 null]
 endobj
-131 0 obj
+130 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 361
@@ -14306,7 +14765,7 @@ CYY
 \ufffd6\ufffd\ufffd\ufffd
 endstream
 endobj
-132 0 obj
+131 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -14317,7 +14776,7 @@ endobj
 /Type /Annot
 >>
 endobj
-133 0 obj
+132 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 531
@@ -14634,7 +15093,7 @@ s
 \ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdM~\ufffd\ufffd\ufffd\ufffd\ufffd7r\ufffd\ufffd{g\ufffd\ufffd1\ufffdv\ufffd\ufffd\ufffd\ufffd\ufffdO\ufffd|)eeI\ufffd\ufffdsW\ufffd\ufffd\ufffd\ufffdK\u071a\ufffd\ufffd\ufffdr\ufffd\ufffdS\ufffd\ufffd\ufffd4I\ufffd\ufffdoM\ufffd\ufffdD\u2138rA\ufffdlpPz\ufffdX\ufffd$,Lb\ufffd\ufffdGpc\ufffd\ufffd\ufffd \ufffd\u074b\ufffd5)\ufffd\ufffd[\ufffd\ufffd\ufffd<1}|\ufffdY,\ufffd\ufffd\ufffdb\ufffdK\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd={V\ufffd{\ufffd\ufffd\ufffd{\ufffd\ufffd\ufffd\ufffd>w\ufffd\ufffdV^\ufffdb{y\ufffd\ufffdli\ufffd/\ufffd[\u0714\ufffd\ufffd|k\ufffdx\ufffd\ufffd\ufffd\ufffd\ufffdb\ufffd\ufffd\u02b7\ufffd\ufffd?\ufffd\ufffdII\ufffd\u04e7\ufffd\ufffd\ufffd\ufffd\u03e5#G\ufffd=\ufffd\ufffd\u5758(\ufffd\ufffd\ufffdB\ufffd\ufffdc\ufffd\ufffdG\ufffd\u0632G\ufffdJ\ufffd\ufffd\ufffd\ufffd7<\~\ufffdU\ufffd`1a\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdu\ufffd^\ufffde\ufffd/\ufffd]\ufffd\ufffd)\ufffdF\ufffdW\ufffd\ufffd\ufffdbL\ufffd
\ufffd\ufffdP?\ufffd\ufffd\ufffduq\ufffdRR\ufffd\ufffd(\ufffd\ufffd\ufffd^\ufffd\ufffd\^\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd[>vL\ufffd*\ufffd\ufffd\ufffd\u039c\ufffd_!c],\ufffd\ufffd*]\ufffd \ufffd\ufffdJ\ufffd7\ufffd\ufffd'}pL\ufffd\ufffdb\ufffd\ufffdu+f\ufffd\ufffd\ufffd\ufffd\ufffd,\ufffd\ufffd\ufffdl\ufffd\ufffde\ufffd\ufffd\ufffd\ufffd,\ufffd\ufffd\ufffd!\u0778!\ufffd\ufffd^	nj\ufffdwjV\ufffdt\ufffd\ufffd\ufffd \ufffd\ufffd\U%\ufffd\ufffd<\ufffd\ufffd9)5U\ufffd\\9)I\ufffdvM~%X\ufffdf\ufffd\ufffd\ufffd'_(\ufffd\ufffd\ufffd\ufffd\ufffdr\ufffdZ\ufffd\ufffdO\ufffd\ufffdb\ufffd\ufffd.\ufffdX\ufffd\ufffd\ufffd^\ufffd\ufffd\ufffd#
 Zd$#@\ufffd>\ufffd\ufffd\ufffd\ufffdb\ufffd\ufffdYy\ufffd|B\ufffd`\ufffdJ^\ufffd\ufffd\ufffd\ufffdcb\ufffd\ufffdL\ufffd\ufffd\ufffd\ufffday\ufffd\ufffd/	\ufffd\ufffd\ufffd\ufffd\ufffd|0\ufffdcc\ufffdC\ufffd\ufffdZ\ufffdxQ>\ufffd\ufffd\ufffdE~AW\ufffdX\ufffd\ufffd\ufffd�\ufffdbi\ufffd>\ufffd@\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd77p\u016e\ufffd;:Zz\ufffdD>\ufffd!%E\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdC#\ufffd\ufffd\ufffd\ufffdbC\ufffd\ufffd\ufffd7+\ufffd\ufffdx\ufffdee\ufffd#o\ufffd\u0355_6#{\ufffd\ufffd\ufffdP\ufffdF\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd \ufffdhm\ufffdK\ufffdV\ufffd\ufffd3\ufffd\ufffd_\ufffd\ufffd{\ufffd8QU%\ufffd\ufffdx\ufffd\u02d7\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd(\ufffd\ufffdq}1y\u0170\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdbq\ufffd\ufffd\ufffdnn\ufffd{GqB\ufffdx\ufffd6\ufffd>7.\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdO\ufffd\ufffdE<\ufffd\ufffd\ufffd\ufffdji\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd3\ufffd\ufffd')\ufffdG\ufffd1\ufffd\ufffd\ufffd\ufffdP\ufffdK\ufffd.$&\ufffd\ufffd\ufffd<<\ufffd3\ufffd\ufffd\ufffd\ufffd"\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdZk\ufffd!3\ufffd\ufffd8\ufffd`(#\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdQ\ufffd\ufffdl
 endstream
 endobj
-134 0 obj
+133 0 obj
 << /Length 1626
 >>
 stream
@@ -14752,25 +15211,25 @@ Q
 
 endstream
 endobj
-135 0 obj
+134 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 134 0 R
+/Contents 133 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/XObject << /I13 133 0 R
-/I14 138 0 R
-/Stamp1 528 0 R
+/XObject << /I13 132 0 R
+/I14 137 0 R
+/Stamp1 527 0 R
 >>
 /Font << /F2.0 18 0 R
 /F1.0 8 0 R
 /F4.0 53 0 R
 >>
 >>
-/Annots [136 0 R 139 0 R]
+/Annots [135 0 R 138 0 R]
 >>
 endobj
-136 0 obj
+135 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -14781,10 +15240,10 @@ endobj
 /Type /Annot
 >>
 endobj
-137 0 obj
-[135 0 R /XYZ 0 512.1210638297873 null]
+136 0 obj
+[134 0 R /XYZ 0 512.1210638297873 null]
 endobj
-138 0 obj
+137 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 531
@@ -15189,7 +15648,7 @@ _
 \ufffd&\ufffd\ufffd5\ufffd\ufffd\ufffd\u028ax[H\ufffd\ufffd\ufffd\ufffd\ubdfd\ufffd\ufffdW+\ufffdv\ufffd\ufffd\ufffdbb\ufffd\ufffd\ufffd\u8e79\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdd\ufffdz\ufffd\ufffdH{\ufffd}\ufffd\ufffdH\ufffd^#Xx\ufffd\ufffd\ufffd\ufffd\ufffdz9Fp4
\ufffd\ufffd\ufffd^Y1\ufffd\ufffdT0\ufffdC!\ufffdB/~\ufffddnnNkk\ufffdA\ufffdY\ufffdlR(\ufffd\ufffdTR\ufffd\ufffdg>\ufffdB!\ufffd\ufffdj~^\ufffd\ufffd\ufffd\ufffd\u070d\ufffdk6\ufffd\ufffd1\ufffdB!\ufffdP\u0705\ufffdB!\ufffd\ufffd.\ufffd`\ufffdB!wa#\ufffdB\ufffd\ufffd\ufffdj5:\ufffdN\ufffd6\ufffd\ufffdS=G
 endstream
 endobj
-139 0 obj
+138 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -15200,10 +15659,10 @@ endobj
 /Type /Annot
 >>
 endobj
-140 0 obj
-[135 0 R /XYZ 0 160.6921276595745 null]
+139 0 obj
+[134 0 R /XYZ 0 160.6921276595745 null]
 endobj
-141 0 obj
+140 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 531
@@ -15633,7 +16092,7 @@ X
 \ufffd\ufffdQ\ufffd\ufffd\ufffd\ufffdE\ufffd$q'7\ufffdu\ufffd\u062f\ufffd\ufffd"\ufffd\ufffd\ufffdA\ufffd,M\ufffdsfI\ufffd\ufffd\ufffd_\ufffd\ufffd\ufffd\ufffd\u0654_ y\ufffd\ufffd@\ufffd\u026f%`\ufffd,\ufffd2E\ufffd\ufffd\u057f\ufffd\ufffdAW\ufffd/\ufffd\ufffd\ufffd\ufffd\ufffdx\ufffd\ufffdb]\ufffd\ufffd\u0742\ufffd\u0751\ufffd\ufffd
\ufffdo\ufffd{\ufffd\ufffd\ufffd&7\ufffd\ufffdMnr\ufffd\u07f4\ufffd \ufffd\u05beG\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd>\ufffd\ufffd\ufffdd\ufffdjo
 endstream
 endobj
-142 0 obj
+141 0 obj
 << /Length 1519
 >>
 stream
@@ -15740,25 +16199,25 @@ Q
 
 endstream
 endobj
-143 0 obj
+142 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 142 0 R
+/Contents 141 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/XObject << /I15 141 0 R
-/I16 146 0 R
-/Stamp1 528 0 R
+/XObject << /I15 140 0 R
+/I16 145 0 R
+/Stamp1 527 0 R
 >>
 /Font << /F2.0 18 0 R
 /F1.0 8 0 R
 /F4.0 53 0 R
 >>
 >>
-/Annots [144 0 R 147 0 R]
+/Annots [143 0 R 146 0 R]
 >>
 endobj
-144 0 obj
+143 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -15769,10 +16228,10 @@ endobj
 /Type /Annot
 >>
 endobj
-145 0 obj
-[143 0 R /XYZ 0 512.1210638297873 null]
+144 0 obj
+[142 0 R /XYZ 0 512.1210638297873 null]
 endobj
-146 0 obj
+145 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 531
@@ -16087,7 +16546,7 @@ J
 q1A\^L^1\ufffd\ufffd\u06e5\ufffdl|\ufffdX\\ufffdxC\u29bb\ufffdf?P\ufffd0~\ufffd\ufffdN\ufffd\ufffd\u0155\ufffd7\ufffd\u06a4\u300d\ufffd\ufffd\ufffd"\ufffd\ufffd|\ufffdGuwKo\ufffd\ufffdH\ufffd3\ufffd\ufffd'\ufffd\ufffdG\ufffd1\ufffd\ufffd\ufffd\ufffd\ufffd3g|\ufffd\ufffd\ufffdbAA\ufffd`\ufffd\ufffd\ufffd\ufffdF\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdhM?eF0d\ufffd\ufffda@v\ufffd\ufffd1\ufffd\ufffd?\ufffd\ufffdu
 endstream
 endobj
-147 0 obj
+146 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -16098,11 +16557,11 @@ endobj
 /Type /Annot
 >>
 endobj
-148 0 obj
-[143 0 R /XYZ 0 160.6921276595745 null]
+147 0 obj
+[142 0 R /XYZ 0 160.6921276595745 null]
 endobj
-149 0 obj
-<< /Length 48843
+148 0 obj
+<< /Length 53186
 >>
 stream
 q
@@ -16136,13 +16595,13 @@ h
 S
 Q
 /DeviceRGB cs
-0.000 0.533 0.000 scn
+0.000 0.400 0.600 scn
 /DeviceRGB CS
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 SCN
 
 BT
 59.24 783.0649999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <70726976617465> Tj
 ET
 
@@ -16159,8 +16618,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 103.24000000000001 783.0649999999999 Td
@@ -16203,8 +16662,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 59.24 768.3249999999999 Td
@@ -16225,8 +16684,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 97.74000000000001 768.3249999999999 Td
@@ -16247,8 +16706,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 119.74000000000001 768.3249999999999 Td
@@ -16269,8 +16728,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 185.74 768.3249999999999 Td
@@ -16313,13 +16772,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 345.24 768.3249999999999 Td
 /F4.0 11 Tf
-<2266616c736522> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+350.74 768.3249999999999 Td
+/F4.0 11 Tf
+<66616c7365> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+378.24 768.3249999999999 Td
+/F4.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16346,8 +16827,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 753.585 Td
@@ -16368,8 +16849,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 119.74000000000001 753.585 Td
@@ -16390,8 +16871,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 141.74 753.585 Td
@@ -16412,8 +16893,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 207.74 753.585 Td
@@ -16456,13 +16937,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 367.24 753.585 Td
 /F4.0 11 Tf
-<2266616c736522> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+372.74 753.585 Td
+/F4.0 11 Tf
+<66616c7365> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+400.24 753.585 Td
+/F4.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16555,8 +17058,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 125.24000000000001 738.845 Td
@@ -16577,8 +17080,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 163.74 738.845 Td
@@ -16599,8 +17102,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 185.74 738.845 Td
@@ -16621,8 +17124,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 251.74 738.845 Td
@@ -16687,13 +17190,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 328.74 738.845 Td
 /F4.0 11 Tf
-<226174746163686d656e745f6e616d6522> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+334.24 738.845 Td
+/F4.0 11 Tf
+<6174746163686d656e745f6e616d65> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+416.74 738.845 Td
+/F4.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16704,7 +17229,18 @@ ET
 BT
 422.24 738.845 Td
 /F4.0 11 Tf
-<292c> Tj
+<29> 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
+427.74 738.845 Td
+/F4.0 11 Tf
+<2c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16720,8 +17256,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 125.24000000000001 724.105 Td
@@ -16742,8 +17278,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 163.74 724.105 Td
@@ -16764,8 +17300,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 185.74 724.105 Td
@@ -16786,8 +17322,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 251.74 724.105 Td
@@ -16852,13 +17388,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 328.74 724.105 Td
 /F4.0 11 Tf
-<226174746163686d656e745f6d696d657479706522> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+334.24 724.105 Td
+/F4.0 11 Tf
+<6174746163686d656e745f6d696d6574797065> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+438.74 724.105 Td
+/F4.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16869,7 +17427,18 @@ ET
 BT
 444.24 724.105 Td
 /F4.0 11 Tf
-<292c> Tj
+<29> 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
+449.74 724.105 Td
+/F4.0 11 Tf
+<2c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16885,8 +17454,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 125.24000000000001 709.365 Td
@@ -16907,8 +17476,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 163.74 709.365 Td
@@ -16929,8 +17498,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 185.74 709.365 Td
@@ -16951,8 +17520,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 251.74 709.365 Td
@@ -17017,13 +17586,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 328.74 709.365 Td
 /F4.0 11 Tf
-<226174746163686d656e745f627974657322> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+334.24 709.365 Td
+/F4.0 11 Tf
+<6174746163686d656e745f6279746573> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+422.24 709.365 Td
+/F4.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17088,17 +17679,41 @@ ET
 
 BT
 493.74 709.365 Td
+/F4.0 11 Tf
+<20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+499.24 709.365 Td
+/F4.0 11 Tf
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+504.74 709.365 Td
+/F4.0 11 Tf
+<424c4f42> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 59.24 694.625 Td
 /F4.0 11 Tf
-<22424c4f4222> Tj
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17107,7 +17722,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-92.24000000000001 694.625 Td
+64.74000000000001 694.625 Td
 /F4.0 11 Tf
 <2c> Tj
 ET
@@ -17118,7 +17733,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-97.74000000000001 694.625 Td
+70.24000000000001 694.625 Td
 /F4.0 11 Tf
 <20> Tj
 ET
@@ -17129,7 +17744,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-103.24000000000001 694.625 Td
+75.74000000000001 694.625 Td
 /F4.0 11 Tf
 <73716c54797065> Tj
 ET
@@ -17140,7 +17755,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-141.74 694.625 Td
+114.24000000000001 694.625 Td
 /F4.0 11 Tf
 <20> Tj
 ET
@@ -17151,7 +17766,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-147.24 694.625 Td
+119.74000000000001 694.625 Td
 /F4.0 11 Tf
 <3d> Tj
 ET
@@ -17162,20 +17777,42 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-152.74 694.625 Td
+125.24000000000001 694.625 Td
 /F4.0 11 Tf
 <20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+130.74 694.625 Td
+/F4.0 11 Tf
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+136.24 694.625 Td
+/F4.0 11 Tf
+<424c4f42> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 158.24 694.625 Td
 /F4.0 11 Tf
-<22424c4f4222> Tj
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17184,7 +17821,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-191.24 694.625 Td
+163.74 694.625 Td
 /F4.0 11 Tf
 <29> Tj
 ET
@@ -17208,13 +17845,24 @@ ET
 BT
 81.24000000000001 679.885 Td
 /F4.0 11 Tf
-<7d29> Tj
+<7d> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+86.74000000000001 679.885 Td
+/F4.0 11 Tf
+<29> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 59.24 665.145 Td
@@ -17312,8 +17960,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 301.24 650.405 Td
@@ -17411,8 +18059,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 246.24 635.665 Td
@@ -17433,12 +18081,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24 606.185 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -17455,8 +18103,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 606.185 Td
@@ -17477,12 +18125,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.400 0.733 scn
-0.000 0.400 0.733 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 125.24000000000001 606.185 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <6765744174746163686d656e74> Tj
 ET
 
@@ -17543,12 +18191,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 224.24 606.185 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <72657475726e> Tj
 ET
 
@@ -17609,12 +18257,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24 591.4449999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -17631,12 +18279,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 591.4449999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <766f6964> Tj
 ET
 
@@ -17653,12 +18301,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.400 0.733 scn
-0.000 0.400 0.733 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 125.24000000000001 591.4449999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <7365744174746163686d656e74> Tj
 ET
 
@@ -17675,12 +18323,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 202.24 591.4449999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <66696e616c> Tj
 ET
 
@@ -17697,8 +18345,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 235.24 591.4449999999999 Td
@@ -17774,12 +18422,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 339.74 591.4449999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <74686973> Tj
 ET
 
@@ -17796,8 +18444,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 367.24 591.4449999999999 Td
@@ -17944,12 +18592,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24 514.925 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <70726976617465> Tj
 ET
 
@@ -17966,8 +18614,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 103.24000000000001 514.925 Td
@@ -18010,8 +18658,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 59.24 500.185 Td
@@ -18032,8 +18680,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 97.74000000000001 500.185 Td
@@ -18054,8 +18702,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 119.74000000000001 500.185 Td
@@ -18076,8 +18724,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 185.74 500.185 Td
@@ -18120,13 +18768,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 345.24 500.185 Td
 /F4.0 11 Tf
-<2266616c736522> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+350.74 500.185 Td
+/F4.0 11 Tf
+<66616c7365> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+378.24 500.185 Td
+/F4.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -18219,8 +18889,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 103.24000000000001 485.445 Td
@@ -18241,8 +18911,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 141.74 485.445 Td
@@ -18263,8 +18933,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 163.74 485.445 Td
@@ -18285,8 +18955,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 229.74 485.445 Td
@@ -18351,13 +19021,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 306.74 485.445 Td
 /F4.0 11 Tf
-<22646f635f6e616d6522> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+312.24 485.445 Td
+/F4.0 11 Tf
+<646f635f6e616d65> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+356.24 485.445 Td
+/F4.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -18368,7 +19060,18 @@ ET
 BT
 361.74 485.445 Td
 /F4.0 11 Tf
-<292c> Tj
+<29> 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
+367.24 485.445 Td
+/F4.0 11 Tf
+<2c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -18384,8 +19087,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 103.24000000000001 470.705 Td
@@ -18406,8 +19109,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 141.74 470.705 Td
@@ -18428,8 +19131,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 163.74 470.705 Td
@@ -18450,8 +19153,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 229.74 470.705 Td
@@ -18516,13 +19219,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 306.74 470.705 Td
 /F4.0 11 Tf
-<22646f635f6d696d657479706522> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+312.24 470.705 Td
+/F4.0 11 Tf
+<646f635f6d696d6574797065> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+378.24 470.705 Td
+/F4.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -18533,7 +19258,18 @@ ET
 BT
 383.74 470.705 Td
 /F4.0 11 Tf
-<292c> Tj
+<29> 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
+389.24 470.705 Td
+/F4.0 11 Tf
+<2c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -18549,8 +19285,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 103.24000000000001 455.965 Td
@@ -18571,8 +19307,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 141.74 455.965 Td
@@ -18593,8 +19329,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 163.74 455.965 Td
@@ -18615,8 +19351,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 229.74 455.965 Td
@@ -18681,13 +19417,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 306.74 455.965 Td
 /F4.0 11 Tf
-<22646f635f636861727322> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+312.24 455.965 Td
+/F4.0 11 Tf
+<646f635f6368617273> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+361.74 455.965 Td
+/F4.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -18758,13 +19516,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 438.74 455.965 Td
 /F4.0 11 Tf
-<22434c4f4222> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+444.24 455.965 Td
+/F4.0 11 Tf
+<434c4f42> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+466.24 455.965 Td
+/F4.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -18833,13 +19613,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 59.24 441.225 Td
 /F4.0 11 Tf
-<22434c4f4222> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+64.74000000000001 441.225 Td
+/F4.0 11 Tf
+<434c4f42> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+86.74000000000001 441.225 Td
+/F4.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -18861,13 +19663,24 @@ ET
 BT
 59.24 426.485 Td
 /F4.0 11 Tf
-<7d29> Tj
+<7d> 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
+64.74000000000001 426.485 Td
+/F4.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 59.24 411.745 Td
@@ -18965,8 +19778,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 246.24 397.005 Td
@@ -18987,12 +19800,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24 367.525 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -19009,8 +19822,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 367.525 Td
@@ -19031,12 +19844,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.400 0.733 scn
-0.000 0.400 0.733 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 125.24000000000001 367.525 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <676574446f63> Tj
 ET
 
@@ -19097,12 +19910,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 185.74 367.525 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <72657475726e> Tj
 ET
 
@@ -19163,12 +19976,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24 352.78499999999997 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -19185,12 +19998,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 352.78499999999997 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <766f6964> Tj
 ET
 
@@ -19207,12 +20020,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.400 0.733 scn
-0.000 0.400 0.733 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 125.24000000000001 352.78499999999997 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <736574446f63> Tj
 ET
 
@@ -19229,12 +20042,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 163.74 352.78499999999997 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <66696e616c> Tj
 ET
 
@@ -19251,8 +20064,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 196.74 352.78499999999997 Td
@@ -19328,12 +20141,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 262.74 352.78499999999997 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <74686973> Tj
 ET
 
@@ -19350,8 +20163,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 290.24 352.78499999999997 Td
@@ -19699,26 +20512,25 @@ Q
 
 endstream
 endobj
-150 0 obj
+149 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 149 0 R
+/Contents 148 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F6.0 70 0 R
-/F4.0 53 0 R
+/Font << /F4.0 53 0 R
 /F1.0 8 0 R
 /F2.0 18 0 R
 >>
-/XObject << /Stamp1 528 0 R
+/XObject << /Stamp1 527 0 R
 >>
 >>
 >>
 endobj
-151 0 obj
-[150 0 R /XYZ 0 299.09000000000003 null]
+150 0 obj
+[149 0 R /XYZ 0 299.09000000000003 null]
 endobj
-152 0 obj
+151 0 obj
 << /Length 6554
 >>
 stream
@@ -20010,7 +20822,7 @@ ET
 
 BT
 172.16000640190973 616.436 Td
-/F7.0 10.5 Tf
+/F6.0 10.5 Tf
 <6e6f> Tj
 ET
 
@@ -20106,25 +20918,25 @@ Q
 
 endstream
 endobj
-153 0 obj
+152 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 152 0 R
+/Contents 151 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F3.1 45 0 R
-/F7.0 158 0 R
+/F6.0 157 0 R
 /F2.0 18 0 R
 >>
-/XObject << /I17 160 0 R
-/Stamp1 528 0 R
+/XObject << /I17 159 0 R
+/Stamp1 527 0 R
 >>
 >>
-/Annots [154 0 R 155 0 R 156 0 R 157 0 R 161 0 R]
+/Annots [153 0 R 154 0 R 155 0 R 156 0 R 160 0 R]
 >>
 endobj
-154 0 obj
+153 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -20135,7 +20947,7 @@ endobj
 /Type /Annot
 >>
 endobj
-155 0 obj
+154 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -20146,7 +20958,7 @@ endobj
 /Type /Annot
 >>
 endobj
-156 0 obj
+155 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -20157,7 +20969,7 @@ endobj
 /Type /Annot
 >>
 endobj
-157 0 obj
+156 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -20168,21 +20980,21 @@ endobj
 /Type /Annot
 >>
 endobj
-158 0 obj
+157 0 obj
 << /Type /Font
-/BaseFont /AAAAFF+NotoSerif-Italic
+/BaseFont /AAAAEP+NotoSerif-Italic
 /Subtype /TrueType
-/FontDescriptor 600 0 R
+/FontDescriptor 595 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 602 0 R
-/ToUnicode 601 0 R
+/Widths 597 0 R
+/ToUnicode 596 0 R
 >>
 endobj
-159 0 obj
-[153 0 R /XYZ 0 580.8400000000001 null]
+158 0 obj
+[152 0 R /XYZ 0 580.8400000000001 null]
 endobj
-160 0 obj
+159 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 428
@@ -20234,7 +21046,7 @@ $
 \ufffda\ufffdz#A`l\ufffdx\ufffd 06lo6\ufffd7\ufffd
\ufffdh\ufffd\ufffdV\ufffd\ufffd\ufffd\ufffd\ufffd+\ufffd_y\ufffdI\ufffd\ufffd\ufffd_]h|\ufffd\ufffd\ufffd	j}u\ufffd\ufffd#rS\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdN3\ufffd\ufffd\ufffd\ufffd'\ufffd[_{\ufffd\ufffd\ufffd\ufffd\ufffdhS/\ufffd\ufffd?X}\ufffd^{\ufffd\ufffd\ufffd+\ufb76\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdG\ufffdw\ufffd\ufffdO\ufffd}\ufffd\ufffdj\ufffd9\ufffd\u06ed\ufffd\ufffd\u0691\ufffdD\ufffd{g6\ufffd,.\ufffd\ufffd\ufffdq\ufffd \ufffd@c\ufffd\ufffdb\ufffd\ufffd	\ufffd\ufffd\ufffdj/\ufffdi?z\ufffd\ufffd\ufffdKw\ufffd\ufffdol\ufffd\ufffd\ufffd\ufffdE+_Kk\ufffdY1\ufffdf{U\ufffd\ufffd\ufffd\ufffd]\ufffd\ufffdV\ufffd\ufffd\ufffd\u04d9_\ufffdsa\ufffd\ufffd\ufffd\ufffdd\ufffd\ufffdW,JQ\ufffd77\ufffd(\ufffd\ufffd\ufffd\ufffd2\ufffd\ufffdh\ufffd~\ufffd\ufffd\ufffd\ufffd\ufffdL_*\ufffd#r\ufffd(\ufffdD\ufffd?\ufffd\ufffd?x\ufffd\ufffd\ufffd\ufffd\ufffd0\ufffd\ufffd\\ufffdl\ufffd\ufffd~g\ufffd\ufffd^i\ufffd\ufffd$u\ufffd\ufffd`
N\ufffd\ufffdz\ufffd\ufffd\u0758\ufffd3\ufffd\ufffd\ufffd\ufffd\ufffdD\ufffd\ufffdv\ufffd6s7?Y\ufffd\ufffdk\ufffd\ufffd\ufffd\ufffd\ufffdmx\ufffd\ufffd\ufffd\\ufffd\ufffd/\ufffdkK\ufffd|\u0235+~J.1\u03f9\ufffd\ufffd\u0696ze\ufffd\ufffd\ufffd\ufffd}/\ufffd$Z\ufffd\ufffd\ufffd\ufffd6\ufffd\ufffd\ufffdgoJV,\uf6bbu\ufffd\ufffdx\ufffd\ufffd\ufffd.a\ufffdo\ufffd\ufffd\ufffd\ufffd\ufffd=9\ufffdg\ufffd/\ufffd,\ufffd;\ufffdK\ufffd\ufffdh\ufffd\ufffd`\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdU\ufffd]:\ufffd[G\ufffd\ufffd7\ufffd\ufffd\ufffd\ufffd\ufffd7\ufffd\ufffd\ufffd\ufffd\ufffd#j,\ufffd:\ufffd|f\ufffdk\ufffdr\ufffd\ufffd\ufffd\ufffdn\ufffd<\ufffd\ufffd\ufffd\ufffddjA6\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd_\ufffd\ufffd\ufffd\ufffd
 ki\ufffd
\ufffd1\ufffd\ub0ffw\ufffd;\ufffdO\ufffd^\ufffd\ufffdY|\ufffd\ufffd\ufffd\ufffd^s_d\ufffd\ufffd\ufffdv\ufffd\ufffd\ufffdFg}K\u0315\u0117$\ufffd\u03a3\ufffdo\ufffd\ufffd\ufffd:-FA\ufffd>\ufffd\ufffd\ufffd[\ufffdQ\ufffdvS,m\ufffd/
\ufffd\u49745\ufffd$\u0366gO\ufffdI\ufffd\ufffdH_Qb1\ufffd\ufffd,)\ufffd\ufffdi3\ufffdMs\ufffd\ufffdw\ufffd\ufffd\ufffd76?Y~|\ufffd\ufffd~\ufffd+\ufffd\ufffd8\ufffd \ufffd@\ufffdr\ufffd\ufffd\ufffd>\ufffd$\ufffd:\ufffdM\ufffd%\ufffdvk\ufffdR\ufffdO\u059e\u0517W\ufffd\\ufffd?/\ufffdH\ufffd|\ufffd\u0579\ufffd\ufffd%\ufffd\ufffdX\ufffd\ufffdL4\ufffd\ufffd$X|\ufffd\ufffd-\ufffd\ufffd\ufffd\u1207Ie\ufffdL\ufffd\ufffdb7\ufffdn\ufffd:-\ufffd\ufffd\ufffd~GX\ufffd\ufffd	\ufffd\ufffd]\ufffdiILiv2\ufffd\ufffdpmc\ufffd\ufffdd\ufffd\ufffd|m\ufffd\ufffdyBB\ufffdm\ufffd\ufffd\ufffd\u0698V\ufffd.HoR5\ufffd\ufffde\ufffdk\ufffd\ufffd:\ufffd\ufffd\ufffd[\ufffdEE\ufffd6M\ufffdT\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd$\ufffd\ufffd\ufffd$W\ufffd\ufffd\ufffd\ufffdo\ufffd\ufffd%\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u0754J\ufffd\ufffd\ufffd\ufffdT\ufffd5/{\ufffd\ufffd\ufffd\ufffd2Q0\ufffde\ufffd\ufffd]\ufffd\ufffd|\ufffd\ufffd1\ufffdR\ufffd;"\ufffd`\ufffd\ufffd\ufffdbow:b\ufffd4m\u075a\ufffdkA\ufffdv\ufffd[\ufffd\ufffd.\ufffdm\ufffd\ufffd\ufffd\ufffd\u0708i\ufffd\ufffdxKj\ufffds\ufffd\ufffdG\u04fd\ufffd\ufffd\ufffd\ufffd\ufffdZ\ufffd\u067e\ufffd
\ufffd7\ufffd
\ufffd\u0186\ufffd\ufffd
c\ufffd\ufffd\ufffd\ufffd\ufffda\ufffdx\ufffdS\ufffd\ufffd\ufffd\ufffd/>\ufffd\ufffd\ufffdS\ufffd
\ufffd\ufffd\ufffd\ufffd>N\ufffdsye\ufffd\ufffd\ufffd\ufffdA\ufffd\ufffd\ufffd;\ufffd 8@`8\ufffd1\ufffd\ufffd\ufffdp\ufffdc 0\ufffd\ufffd
 @`8\ufffd1\ufffd\ufffd\ufffdp\ufffdc 0\ufffd\ufffd\ufffd@`8\ufffd1\ufffd\ufffd\ufffd
 endstream
 endobj
-161 0 obj
+160 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -20245,7 +21057,7 @@ endobj
 /Type /Annot
 >>
 endobj
-162 0 obj
+161 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 428
@@ -20289,7 +21101,7 @@ v
 #0(\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd8q\ufffd\u066c\ufffd[w\ufffd\ufffd\ufffdX5	\u0309e\ufffd\ufffd'>\ufffd\ufffd2\ufffd~\ufffd\ufffd\ufffd0+%\ufffdb@1\ufffdP(\ufffd\ufffd\ufffd\ufffdA`\ufffd 0\ufffdb@1\ufffdP(\ufffd\ufffd\ufffd\ufffdA`\ufffd 0\ufffdb@1\ufffdP(\ufffd\ufffd\ufffd\ufffdA`\ufffd 0\ufffdb@1\ufffdP(\ufffd\ufffd\ufffd\ufffdA`\ufffd 0\ufffdb@1\ufffdP(\ufffd\ufffd\ufffd\ufffdA`\ufffd 0\ufffdb@1\ufffdP(\ufffd\ufffd\ufffd\ufffdA`\ufffd 0\ufffdb@1\ufffdP(\ufffd\ufffd\ufffd\ufffdA`\ufffd 0\ufffdb@1\ufffdP(\ufffd\ufffd\ufffd\ufffdA`\ufffd 0\ufffdb@1\ufffdP(\ufffd\ufffd\ufffd\ufffdA`\ufffd 0\ufffdb@1\ufffdP(\ufffd\ufffd\ufffd\ufffdA`\ufffd 0\ufffdb@1\ufffdP(\ufffd\ufffd\ufffd\ufffdA`\ufffd 0\ufffdb@1\ufffdP(\ufffd\ufffd\ufffd\ufffdA`\ufffd 0\ufffdb@1\ufffdP(\ufffd\ufffd\ufffd\ufffdA`\ufffd 0\ufffdb@1\ufffdP(\ufffd\ufffd\ufffd\ufffdA`\ufffd 0\ufffdb@1\ufffdP(\ufffd\ufffd\ufffd\ufffdA`\ufffd 0\ufffdb@1\ufffdP(\ufffd\ufffd\ufffd\ufffdA`\ufffd\ufffd?\ufffd'G
 endstream
 endobj
-163 0 obj
+162 0 obj
 << /Length 721
 >>
 stream
@@ -20352,23 +21164,23 @@ Q
 
 endstream
 endobj
-164 0 obj
+163 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 163 0 R
+/Contents 162 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/XObject << /I18 162 0 R
-/I19 166 0 R
-/Stamp1 528 0 R
+/XObject << /I18 161 0 R
+/I19 165 0 R
+/Stamp1 527 0 R
 >>
 /Font << /F1.0 8 0 R
 >>
 >>
-/Annots [165 0 R 167 0 R]
+/Annots [164 0 R 166 0 R]
 >>
 endobj
-165 0 obj
+164 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -20379,7 +21191,7 @@ endobj
 /Type /Annot
 >>
 endobj
-166 0 obj
+165 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 489
@@ -20443,7 +21255,7 @@ M
 \ufffdRI2\ufffd\ufffdV\ufffd\ufffdW\ufffd\ufffd\ufffd7\ufffdR\ufffdg\ufffd\ufffd\ufffd\ufffd\ufffd\u02fe7G\ufffdX\ufffd\ufffdB\ufffd]j%\ufffd\ufffd\ufffd\ufffd\ufffdg\ufffd+7\ufffd\ufffd[\ufffd\ufffd\ufffd\ufffd\ufffdb\ufffdK\ufffd\ufffd\\ufffdd\u05fae\ufffd\ufffd6\ufffd;\ufffdS\ufffd\ufffdAQ\ufffd3a\ufffd \ufffd\ufffdK\ufffd\ufffd\ufffd\ufffd:s\ufffd\ufffd\ufffd\ufffd\ufffdG\ufffd\ufffdR\ufffdo2 0F \ufffd
\ufffd@0\ufffd`8 0\ufffdp\ufffdN\ufffd\u07dd\ufffd\ufffd\ufffdn4|\ufffd \ufffdb\ufffd\ufffd\ufffd6\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdaP;\ufffdD\ufffd\u0386\ufffd\ufffd\ufffda 0\ufffd`\ufffd@`\ufffd0\ufffd\ufffd\ufffd0\ufffda 0\ufffd`\ufffd@`\ufffd0\ufffd\ufffd\ufffd0\ufffda 0\ufffdB\ufffd,/|\ufffd\ufffdm\ufffdh\ufffd`\u0671
 endstream
 endobj
-167 0 obj
+166 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -20454,7 +21266,7 @@ endobj
 /Type /Annot
 >>
 endobj
-168 0 obj
+167 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 333
@@ -20497,7 +21309,7 @@ eu\u05b0
 )\ufffdr\ufffd4\ufffd%\ufffd\ufffd\ufffdpE\ufffd\ufffdh\ufffd|0\ufffdu\ufffdhF\ufffd\ufffd;\ufffd|>\ufffd~\ufffd\ufffd\ufffd{\ufffd\ufffda~\ufffd\ufffdQQ\ufffdE\ufffdyc80\ufffd\ufffd\ufffd\ufffdZ\ufffdy\ufffdm\ufffdI\ufffd\ufffd#G\ufffdVi#f\ufffdoXk\ufffd\ufffdD'\ufffdQ\u043b\ufffdP\ufffd\ufffdH\u0156\ufffd0aZ\ufffdL\ufffdoN\ufffd\ufffd&\u07ce\ufffdT\ufffdP\ufffd3\\ufffd\ufffdq\ufffd\ufffd\ufffdj,w\ufffd\ufffdK\ufffd\ufffd;\ufffd>On\ufffd;\ufffdvN\ufffdX\ufffdANW\ufffd\ufffd\ufffd\ufffd\ufffdF\ufffdOTo\ufffdS\ufffdK\ufffd\ufffd\ufffd\ufffd~\ufffd\ufffdEQ\ufffdA\ufffd\ufffdE\ufffd0\ufffd\ufffd\ufffd\ufffdE>\ufffdU\ufffd}\ufffd^\ufffdy..?b\ufffd\u0397\ufffd\ufffd\ufffd\ufffd\ufffde\ufffd\ufffd\ufffd\ufffdB\ufffdo\ufffd\ufffd\ufffdyR\u03bb\ufffd\ufffd ?\ufffd\ufffd:\ufffd\ufffd\ufffd\ufffd\ufffdU&\ufffd+\ufffdz\ufffdW!\ufffd\ufffd\ufffdSs\ufffd
\ufffddS!\ufffdZ6\ufffd\ufffd\ufffdg\ud597\ufffd\ufffdr.\ufffd][\ufffdTMF\ufffdH\u0729\ufffd\ufffd%KM^Z1\ufffd\ufffd_\u04bc_\ufffdN'\ufffd}\ufffd7*\ufffd-t\ufffd\ufffdt\ufffd\ufffd=(\ufffd\ufffda\ufffd\ufffdv\ufffdh>\ufffdm\ufffdaQ\ufffd+\ufffd\ufffd/\u071e\ufffdvMVG~4OX}{\ufffdR\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdN\ufffd	9\ufffdZ\ufffd\ufffd}\ufffd\ufffd\ufffdR\ufffdA2{\ufffd
\ufffd\ufffd"\u070a|P\ufffd^\ufffd1S\ufffd\ufffd\ufffd\ufffdKr\ufffd\u06cb?\ufffdh>o\ufffd\ufffd|T\ufffd\ufffd"\ufffd\ufffd\ufffd@E>*\ufffdP\ufffd\ufffd\ufffd|T\ufffd\ufffd"\ufffd\ufffd\ufffd@E>*\ufffdP\ufffd\ufffd\ufffd|T\ufffd\ufffd"\ufffd\ufffd\ufffd@E>*\ufffdP\ufffd\ufffd\ufffd|T\ufffd
 "\ufffd\ufffd\ufffd@E>\ufffd\ufffd\ufffdN\ufffd"
 endstream
 endobj
-169 0 obj
+168 0 obj
 << /Length 783
 >>
 stream
@@ -20560,23 +21372,23 @@ Q
 
 endstream
 endobj
-170 0 obj
+169 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 169 0 R
+/Contents 168 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/XObject << /I20 168 0 R
-/I21 172 0 R
-/Stamp1 528 0 R
+/XObject << /I20 167 0 R
+/I21 171 0 R
+/Stamp1 527 0 R
 >>
 /Font << /F1.0 8 0 R
 >>
 >>
-/Annots [171 0 R 173 0 R]
+/Annots [170 0 R 172 0 R]
 >>
 endobj
-171 0 obj
+170 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -20587,7 +21399,7 @@ endobj
 /Type /Annot
 >>
 endobj
-172 0 obj
+171 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 428
@@ -20646,7 +21458,7 @@ l*i,
 ,\ufffd\ufffd_\ufffd\ufffd\ufffd\ufffd\ufffd{\ufffd\ufffdt\ufffd\ufffd\ufffdS\ufffd\ufffdYR\ufffdA\ufffdTj
\ufffd&Fg\ufffd\ufffd\ufffd{U\ufffd\ufffdf\ufffd\ufffd\ufffd}\ufffd1\ufffd\ufffd,\ufffd\ufffd\ufffd\ufffd\ufffdc'6\ufffdmZ)\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdy\ufffd?~\ufffd\ufffdO?\ufffd\u062f\ufffd<[Z\ufffd+\ufffdRNRZ\ufffd\ufffdZ\u0470z\ufffd,*]\ufffd9\ufffd\ufffd@]\ufffdp\ufffd{\ufffdI\ufffd\ufffdQ\ufffd\ufffdHoI\ufffde\ufffd\ufffdR\ufffd\ufffd\ufffd\ufffd\ufffd\u05ef\ufffd\ufffd\ufffdO\ufffd\ufffd\u06f7\ufffd\ufffd?NJ`C\ufffdB\ufffd\ufffd\ufffd&_#G=h\ufffd\ufffdE#\ufffd?o$o\ufffd!0H+{\ufffd$\ufffd\ufffd\ufffd\ufffdYw\ufffd!p\ufffd@`\ufffdV \ufffd\ufffdo\ufffd\ufffd{\ufffd%^\ufffd\ufffd\ufffd! 286\ufffd\ufffd\ufffd
\ufffd\ufffd\ufffd\ufffd0\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd"`Gcb\ufffd
\ufffdR 0\ufffd\ufffd\ufffd@` 0\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd
 endstream
 endobj
-173 0 obj
+172 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -20657,7 +21469,7 @@ endobj
 /Type /Annot
 >>
 endobj
-174 0 obj
+173 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 651
@@ -20781,7 +21593,7 @@ Cr
 \ufffd\ufffds\ufffdRJ)\ufffd\ufffdz\ufffd*\ufffd\ufffdQ\ufffd"qPtVJ)\ufffd\ufffdRJU\ufffd\u8b14RJ)\ufffdTP\ufffd\ufffdJ)\ufffd\ufffdRJ\ufffd\u8b14RJ)\ufffdTP\ufffd\ufffdJ)\ufffd\ufffdRJU>:+\ufffd\ufffdRJ)\ufffd\ufffdZ\ufffd?]Kt\ufffd
 endstream
 endobj
-175 0 obj
+174 0 obj
 << /Length 4803
 >>
 stream
@@ -21081,23 +21893,23 @@ Q
 
 endstream
 endobj
-176 0 obj
+175 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 175 0 R
+/Contents 174 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/XObject << /I22 174 0 R
-/Stamp1 528 0 R
+/XObject << /I22 173 0 R
+/Stamp1 527 0 R
 >>
 /Font << /F2.0 18 0 R
 /F1.0 8 0 R
 >>
 >>
-/Annots [177 0 R 179 0 R 180 0 R 181 0 R 182 0 R 183 0 R 184 0 R]
+/Annots [176 0 R 178 0 R 179 0 R 180 0 R 181 0 R 182 0 R 183 0 R]
 >>
 endobj
-177 0 obj
+176 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -21108,10 +21920,10 @@ endobj
 /Type /Annot
 >>
 endobj
-178 0 obj
-[176 0 R /XYZ 0 454.93509394572027 null]
+177 0 obj
+[175 0 R /XYZ 0 454.93509394572027 null]
 endobj
-179 0 obj
+178 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -21122,7 +21934,7 @@ endobj
 /Type /Annot
 >>
 endobj
-180 0 obj
+179 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -21133,7 +21945,7 @@ endobj
 /Type /Annot
 >>
 endobj
-181 0 obj
+180 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -21144,7 +21956,7 @@ endobj
 /Type /Annot
 >>
 endobj
-182 0 obj
+181 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -21155,7 +21967,7 @@ endobj
 /Type /Annot
 >>
 endobj
-183 0 obj
+182 0 obj
 << /Border [0 0 0]
 /Dest (_ugvw_configuration-properties_suppressing-sign-up)
 /Subtype /Link
@@ -21163,7 +21975,7 @@ endobj
 /Type /Annot
 >>
 endobj
-184 0 obj
+183 0 obj
 << /Border [0 0 0]
 /Dest (_ugvw_configuration-properties_suppressing-password-reset)
 /Subtype /Link
@@ -21171,7 +21983,7 @@ endobj
 /Type /Annot
 >>
 endobj
-185 0 obj
+184 0 obj
 << /Length 31149
 >>
 stream
@@ -21356,12 +22168,12 @@ f
 h
 S
 Q
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 136.80666666666667 651.2250000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c636f6e746578742d706172616d3e> Tj
 ET
 
@@ -21378,12 +22190,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 158.80666666666667 636.4850000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c706172616d2d6e616d653e> Tj
 ET
 
@@ -21400,12 +22212,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 290.8066666666667 636.4850000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f706172616d2d6e616d653e> Tj
 ET
 
@@ -21422,12 +22234,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 158.80666666666667 621.7450000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c706172616d2d76616c75653e> Tj
 ET
 
@@ -21444,23 +22256,23 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 263.3066666666667 621.7450000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f706172616d2d76616c75653e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 136.80666666666667 607.0050000000002 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f636f6e746578742d706172616d3e> Tj
 ET
 
@@ -21527,7 +22339,7 @@ ET
 
 BT
 48.24000000000001 521.5660000000003 Td
-/F7.0 10.5 Tf
+/F6.0 10.5 Tf
 [<54> 29.78515625 <61626c6520312e205769636b> 20.01953125 <65742056696577657220436f6e6669677572> 20.01953125 <6174696f6e2050726f70657274696573>] TJ
 ET
 
@@ -21708,7 +22520,7 @@ ET
 
 BT
 221.69600040000003 483.7230000000002 Td
-/F7.0 10.5 Tf
+/F6.0 10.5 Tf
 <64656661756c742076616c7565> Tj
 ET
 
@@ -21878,7 +22690,7 @@ ET
 
 BT
 221.13950040000003 446.16300000000024 Td
-/F8.0 10.5 Tf
+/F7.0 10.5 Tf
 <66616c7365> Tj
 ET
 
@@ -22035,7 +22847,7 @@ ET
 
 BT
 221.13950040000003 408.6030000000002 Td
-/F8.0 10.5 Tf
+/F7.0 10.5 Tf
 <3135> Tj
 ET
 
@@ -22207,7 +23019,7 @@ ET
 
 BT
 221.13950040000003 371.04300000000023 Td
-/F8.0 10.5 Tf
+/F7.0 10.5 Tf
 <74727565> Tj
 ET
 
@@ -23240,41 +24052,40 @@ Q
 
 endstream
 endobj
-186 0 obj
+185 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 185 0 R
+/Contents 184 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 18 0 R
 /F1.0 8 0 R
 /F4.0 53 0 R
 /F3.1 45 0 R
-/F6.0 70 0 R
-/F7.0 158 0 R
-/F8.0 188 0 R
+/F6.0 157 0 R
+/F7.0 187 0 R
 >>
-/XObject << /Stamp1 528 0 R
+/XObject << /Stamp1 527 0 R
 >>
 >>
-/Annots [189 0 R 190 0 R 191 0 R 192 0 R 193 0 R 194 0 R]
+/Annots [188 0 R 189 0 R 190 0 R 191 0 R 192 0 R 193 0 R]
 >>
 endobj
-187 0 obj
-[186 0 R /XYZ 0 841.89 null]
+186 0 obj
+[185 0 R /XYZ 0 841.89 null]
 endobj
-188 0 obj
+187 0 obj
 << /Type /Font
-/BaseFont /AAAAFG+mplus1mn-italic
+/BaseFont /AAAAEQ+mplus1mn-italic
 /Subtype /TrueType
-/FontDescriptor 604 0 R
+/FontDescriptor 599 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 606 0 R
-/ToUnicode 605 0 R
+/Widths 601 0 R
+/ToUnicode 600 0 R
 >>
 endobj
-189 0 obj
+188 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -23285,7 +24096,7 @@ endobj
 /Type /Annot
 >>
 endobj
-190 0 obj
+189 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -23296,7 +24107,7 @@ endobj
 /Type /Annot
 >>
 endobj
-191 0 obj
+190 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -23307,7 +24118,7 @@ endobj
 /Type /Annot
 >>
 endobj
-192 0 obj
+191 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -23318,7 +24129,7 @@ endobj
 /Type /Annot
 >>
 endobj
-193 0 obj
+192 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -23329,7 +24140,7 @@ endobj
 /Type /Annot
 >>
 endobj
-194 0 obj
+193 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -23340,7 +24151,7 @@ endobj
 /Type /Annot
 >>
 endobj
-195 0 obj
+194 0 obj
 << /Length 33002
 >>
 stream
@@ -23570,7 +24381,7 @@ ET
 
 BT
 221.69600040000003 775.8629999999999 Td
-/F7.0 10.5 Tf
+/F6.0 10.5 Tf
 <64656661756c742076616c7565> Tj
 ET
 
@@ -23751,7 +24562,7 @@ ET
 
 BT
 221.13950040000003 738.3030000000001 Td
-/F8.0 10.5 Tf
+/F7.0 10.5 Tf
 <66616c7365> Tj
 ET
 
@@ -23944,7 +24755,7 @@ ET
 
 BT
 221.13950040000003 672.1830000000001 Td
-/F8.0 10.5 Tf
+/F7.0 10.5 Tf
 <66616c7365> Tj
 ET
 
@@ -24253,7 +25064,7 @@ ET
 
 BT
 221.13950040000003 597.0630000000001 Td
-/F8.0 10.5 Tf
+/F7.0 10.5 Tf
 <3132> Tj
 ET
 
@@ -24432,7 +25243,7 @@ ET
 
 BT
 221.13950040000003 559.5030000000002 Td
-/F8.0 10.5 Tf
+/F7.0 10.5 Tf
 <3132> Tj
 ET
 
@@ -24600,7 +25411,7 @@ ET
 
 BT
 221.13950040000003 511.1490000000001 Td
-/F8.0 10.5 Tf
+/F7.0 10.5 Tf
 <3132> Tj
 ET
 
@@ -24801,7 +25612,7 @@ ET
 
 BT
 221.13950040000003 473.58900000000017 Td
-/F8.0 10.5 Tf
+/F7.0 10.5 Tf
 <74727565> Tj
 ET
 
@@ -24998,7 +25809,7 @@ ET
 
 BT
 221.13950040000003 421.74900000000014 Td
-/F8.0 10.5 Tf
+/F7.0 10.5 Tf
 <74727565> Tj
 ET
 
@@ -25184,7 +25995,7 @@ ET
 
 BT
 221.13950040000003 369.9090000000001 Td
-/F8.0 10.5 Tf
+/F7.0 10.5 Tf
 <66616c7365> Tj
 ET
 
@@ -25374,7 +26185,7 @@ ET
 
 BT
 221.13950040000003 332.34900000000016 Td
-/F8.0 10.5 Tf
+/F7.0 10.5 Tf
 <74727565> Tj
 ET
 
@@ -25563,7 +26374,7 @@ ET
 
 BT
 221.13950040000003 266.22900000000016 Td
-/F8.0 10.5 Tf
+/F7.0 10.5 Tf
 <697369735769636b657452656d65> Tj
 ET
 
@@ -25574,7 +26385,7 @@ ET
 
 BT
 217.50650040000002 251.94900000000018 Td
-/F8.0 10.5 Tf
+/F7.0 10.5 Tf
 <6d6265724d65> Tj
 ET
 
@@ -25686,25 +26497,25 @@ Q
 
 endstream
 endobj
-196 0 obj
+195 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 195 0 R
+/Contents 194 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 18 0 R
-/F7.0 158 0 R
+/F6.0 157 0 R
 /F4.0 53 0 R
 /F1.0 8 0 R
-/F8.0 188 0 R
+/F7.0 187 0 R
 >>
-/XObject << /Stamp1 528 0 R
+/XObject << /Stamp1 527 0 R
 >>
 >>
-/Annots [197 0 R 198 0 R 199 0 R 200 0 R 201 0 R 202 0 R 203 0 R]
+/Annots [196 0 R 197 0 R 198 0 R 199 0 R 200 0 R 201 0 R 202 0 R]
 >>
 endobj
-197 0 obj
+196 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -25715,7 +26526,7 @@ endobj
 /Type /Annot
 >>
 endobj
-198 0 obj
+197 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -25726,7 +26537,7 @@ endobj
 /Type /Annot
 >>
 endobj
-199 0 obj
+198 0 obj
 << /Border [0 0 0]
 /Dest (_ugvw_configuration-properties_abbreviating-titles)
 /Subtype /Link
@@ -25734,7 +26545,7 @@ endobj
 /Type /Annot
 >>
 endobj
-200 0 obj
+199 0 obj
 << /Border [0 0 0]
 /Dest (_ugvw_configuration-properties_abbreviating-titles)
 /Subtype /Link
@@ -25742,7 +26553,7 @@ endobj
 /Type /Annot
 >>
 endobj
-201 0 obj
+200 0 obj
 << /Border [0 0 0]
 /Dest (_ugvw_configuration-properties_abbreviating-titles)
 /Subtype /Link
@@ -25750,7 +26561,7 @@ endobj
 /Type /Annot
 >>
 endobj
-202 0 obj
+201 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -25761,7 +26572,7 @@ endobj
 /Type /Annot
 >>
 endobj
-203 0 obj
+202 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -25772,7 +26583,7 @@ endobj
 /Type /Annot
 >>
 endobj
-204 0 obj
+203 0 obj
 << /Length 31268
 >>
 stream
@@ -25978,7 +26789,7 @@ ET
 
 BT
 221.69600040000003 775.8629999999999 Td
-/F7.0 10.5 Tf
+/F6.0 10.5 Tf
 <64656661756c742076616c7565> Tj
 ET
 
@@ -26470,7 +27281,7 @@ ET
 
 BT
 221.13950040000003 429.42300000000023 Td
-/F8.0 10.5 Tf
+/F7.0 10.5 Tf
 <66616c7365> Tj
 ET
 
@@ -26649,7 +27460,7 @@ ET
 
 BT
 221.13950040000003 391.8630000000003 Td
-/F8.0 10.5 Tf
+/F7.0 10.5 Tf
 <74727565> Tj
 ET
 
@@ -26846,7 +27657,7 @@ ET
 
 BT
 221.13950040000003 340.02300000000037 Td
-/F8.0 10.5 Tf
+/F7.0 10.5 Tf
 <66616c7365> Tj
 ET
 
@@ -27050,7 +27861,7 @@ ET
 
 BT
 221.13950040000003 288.18300000000045 Td
-/F8.0 10.5 Tf
+/F7.0 10.5 Tf
 <66616c7365> Tj

<TRUNCATED>

[09/44] isis-site git commit: ISIS-1594: provide an 'edit' button

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/help.html
----------------------------------------------------------------------
diff --git a/content/help.html b/content/help.html
index 4e48b80..27a80c5 100644
--- a/content/help.html
+++ b/content/help.html
@@ -1,12 +1,10 @@
 <!doctype html>
 <html class="no-js" lang="en">
-<head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-
-    <title>Help</title>
-
-    <!--
+ <head> 
+  <meta charset="utf-8"> 
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"> 
+  <title>Help</title> 
+  <!--
         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
@@ -23,31 +21,21 @@
         KIND, either express or implied.  See the License for the
         specific language governing permissions and limitations
         under the License.
-    -->
-
-    <!-- No caching headers -->
-    <meta http-equiv="cache-control" content="no-cache" />
-    <meta http-equiv="pragma" content="no-cache" />
-    <meta http-equiv="expires" content="-1" />
-
-
-    <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
-    <link href="./css/foundation/5.5.1/foundation.css" rel="stylesheet" />
-    <script src="./js/foundation/5.5.1/vendor/modernizr.js"></script>
-    <link href="./css/asciidoctor/colony.css" rel="stylesheet">
-    <link href="./css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-
-
-
-    <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
-    <!--[if lt IE 9]>
+    --> 
+  <!-- No caching headers --> 
+  <meta http-equiv="cache-control" content="no-cache"> 
+  <meta http-equiv="pragma" content="no-cache"> 
+  <meta http-equiv="expires" content="-1"> 
+  <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line --> 
+  <link href="./css/foundation/5.5.1/foundation.css" rel="stylesheet"> 
+  <script src="./js/foundation/5.5.1/vendor/modernizr.js"></script> 
+  <link href="./css/asciidoctor/colony.css" rel="stylesheet"> 
+  <link href="./css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet"> 
+  <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet"> 
+  <!--[if lt IE 9]>
       <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
-    <![endif]-->
-
-
-
-    <style type="text/css">
+    <![endif]--> 
+  <style type="text/css">
         pre code {
             background-color: inherit;
             border-style: none;
@@ -192,9 +180,8 @@ table.CodeRay td.code>pre{padding:0}
         color:#fff;
         font-size: 1.1em;
     }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         @media only screen and (min-width: 40.063em) {
           .top-bar {
             .contain-to-grid .top-bar {
@@ -205,9 +192,8 @@ table.CodeRay td.code>pre{padding:0}
         .row {
             max-width: 80rem;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .extended-quote,
         .extended-quote-first {
             margin-left: 40px;
@@ -231,9 +217,8 @@ table.CodeRay td.code>pre{padding:0}
             text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
         }
         
-    </style>
-
-    <style>
+    </style> 
+  <style>
         body {
           position: relative;
         }
@@ -255,6 +240,7 @@ table.CodeRay td.code>pre{padding:0}
 
         div#doc-content {
             margin-top: 30px;
+            padding-top: 30px;
         }
 
         div.documentation-page table.frame-all {
@@ -286,9 +272,8 @@ table.CodeRay td.code>pre{padding:0}
             min-height: 2000px;
         }
 
-    </style>
-
-    <style>
+    </style> 
+  <style>
 
         @media only screen and (min-width: 768px) {
           #toc.toc2 ul ul { margin-left: -10px; }
@@ -316,15 +301,13 @@ table.CodeRay td.code>pre{padding:0}
         body div#toc2 li.tocify-item.active a {
             color: red;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         footer {
             margin-top: 1000px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* overriding colony.css stylesheet */
         .literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
            /*padding: 1.25em 1.5625em 1.125em 1.5625em;*/
@@ -372,9 +355,8 @@ table.CodeRay td.code>pre{padding:0}
         .imageblock img {
             margin-bottom: 10px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* from http://ben.balter.com/2014/03/13/pages-anchor-links/ */
         .header-link {
           position: absolute;
@@ -395,9 +377,8 @@ table.CodeRay td.code>pre{padding:0}
         h6:hover .header-link {
           opacity: 1;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .top-bar
         {
             -webkit-transition-duration: .5s;
@@ -425,236 +406,154 @@ table.CodeRay td.code>pre{padding:0}
             -webkit-transition-property: -webkit-transform;
             transition-property: transform;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         #doc-content a.guide {
             color: white;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
+        .tocify {
+            margin-top: 80px;
+        }
+    </style> 
+  <style>
         .tocify {
             margin-top: 80px;
         }
-    </style>
-
-
-</script>
-
-</head>
-<body>
-
-<<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
-    <div class="github-fork-ribbon">
-        <a href="https://github.com/apache/isis#fork-destination-box">Fork me on GitHub</a>
-    </div>
-</div>
-
-
-<div class="row">
-
-    <div class="fixed contain-to-grid header">
-        <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
-            <ul class="title-area">
-                <li class="name">
-                    <h1>
-                        <a href="/index.html">Apache Isis&trade;</a>
-                    </h1>
-                </li>
-                <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
-                <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
-            </ul>
-
-            <section class="top-bar-section">
-                <ul class="right">
-
-                    <li class="has-form">
-                       <FORM class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
-                        <div class="row collapse">
-                            <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
-                            <INPUT type="hidden" name="cof" value="FORID:0">
-                            <INPUT class="form-control" name="q" type="text" placeholder="Search">
-                        </div>
-                    </FORM>
-                     </li>
-
-                </ul>
-
-                <!-- Left Nav Section -->
-                <ul class="left">
-
-                    <li><a href="/documentation.html">Documentation</a></li>
-                    <li><a href="/downloads.html">Downloads</a></li>
-                    <li><a href="/help.html">Help</a></li>
-                    <li><a href="/asf.html">@ASF</a></li>
-
-                </ul>
-
-            </section>
-        </nav>
-    </div>
-</div>
-
-<div class="row">
-
-    <div id="doc-content-left" class="large-9 medium-9 columns">
-
-
-        <div id="doc-content">
-          <div id="preamble">
-<div class="sectionbody">
-<div class="paragraph">
-<p><br/><br/><br/></p>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_help">Help:</h2>
-<div class="sectionbody">
-<div class="ulist">
-<ul>
-<li>
-<p><a href="support.html">Mailing Lists</a></p>
-</li>
-<li>
-<p>Mailing List Archives: <a href="https://lists.apache.org/list.html?users&#0064;isis.apache.org">ASF Pony mail</a>, <a href="http://isis.markmail.org/search/?q=">Markmail</a></p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS">JIRA</a></p>
-</li>
-<li>
-<p><a href="http://github.com/apache/isis">Github mirror</a></p>
-</li>
-<li>
-<p><a href="http://stackoverflow.com/questions/tagged/isis">Stack Overflow</a> (tagged=isis)</p>
-</li>
-<li>
-<p><a href="guides/dg.html#_dg_contributing">How to contribute</a></p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_commonly_used_resources">Commonly-used Resources</h2>
-<div class="sectionbody">
-<div class="ulist">
-<ul>
-<li>
-<p>Browse <a href="http://github.com/apache/isis">Github mirror</a></p>
-</li>
-<li>
-<p><a href="https://issues.apache.org/jira/browse/ISIS">JIRA</a></p>
-</li>
-<li>
-<p><a href="http://stackoverflow.com/questions/tagged/isis">Stackoverflow (tagged=isis)</a> and <a href="http://stackoverflow.com/feeds/tag/isis">Stackoverflow (RSS feed)</a></p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_other_resources">Other Resources</h2>
-<div class="sectionbody">
-<div class="ulist">
-<ul>
-<li>
-<p><a href="download.html">Source code repo</a> (on Apache)</p>
-</li>
-<li>
-<p><a href="https://cwiki.apache.org/confluence/display/ISIS/Index">Confluence Wiki</a> (register then request perms via mailing list)</p>
-</li>
-<li>
-<p><a href="doap_isis.rdf">DOAP RDF file</a> (as per [Apache requirements](<a href="http://projects.apache.org/doap.html)" class="bare">http://projects.apache.org/doap.html)</a>)</p>
-</li>
-<li>
-<p><a href="https://builds.apache.org/job/isis-core-ubuntu/">CI Builds</a></p>
-</li>
-<li>
-<p><a href="https://fisheye6.atlassian.com/changelog/isis-git">Fisheye</a></p>
-</li>
-<li>
-<p><a href="https://analysis.apache.org/dashboard/index/org.apache.isis.core:isis">Sonar (@Apache)</a> (core module only)</p>
-</li>
-<li>
-<p><a href="http://nemo.sonarsource.org/dashboard/index/org.apache.isis:isis-all">Sonar (3rd party)</a> (all modules)</p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_example_apps_open_source">Example apps (open-source)</h2>
-<div class="sectionbody">
-<div class="ulist">
-<ul>
-<li>
-<p><a href="https://github.com/estatio/estatio">Estatio</a></p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_committers_blogs">Committers' Blogs</h2>
-<div class="sectionbody">
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://danhaywood.com/">Dan Haywood</a></p>
-</li>
-<li>
-<p><a href="http://www.objectconnexions.co.uk/">Rob Matthews</a></p>
-</li>
-<li>
-<p><a href="http://www.kmz.co.za/blog/">Kevin Meyer</a></p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-        </div>
-
-        <footer>
-          <hr>
-          <p class="small">
-          Copyright &copy; 2010~2016 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0.
-          <br/>
-          Apache, the Apache feather logo, Apache&nbsp;Isis, and the Apache&nbsp;Isis project logo are all trademarks of The&nbsp;Apache&nbsp;Software&nbsp;Foundation.
-          </p>
-        </footer>
-
-    </div>
-
-    <div id="doc-content-right" class="large-3 medium-3 xcolumns">
-        <div id="toc" class="toc2">
-            <div class="fallback-toc">
-                <ul class="sectlevel1">
-<li><a href="#_help">Help:</a></li>
-<li><a href="#_commonly_used_resources">Commonly-used Resources</a></li>
-<li><a href="#_other_resources">Other Resources</a></li>
-<li><a href="#_example_apps_open_source">Example apps (open-source)</a></li>
-<li><a href="#_committers_blogs">Committers' Blogs</a></li>
-</ul>
-            </div>
-        </div>
-    </div>
-
-</div>
-
-
-<script src="./js/foundation/5.5.1/vendor/jquery.js"></script>
-<script src="./js/foundation/5.5.1/foundation.min.js"></script>
-
-
-<link href="./css/jquery.tocify/1.9.0/jquery.tocify.css" rel="stylesheet">
-<script src="./js/jqueryui/1.11.4/jquery-ui.min.js"></script>
-<script src="./js/jquery.tocify/1.9.0/jquery.tocify.js"></script>
-
-
-
-<script type="text/javascript">
+    </style>  
+ </head> 
+ <body> 
+  <div class="row"> 
+   <div class="fixed contain-to-grid header"> 
+    <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem"> 
+     <ul class="title-area"> 
+      <li class="name"> <h1> <a href="/index.html">Apache Isis\u2122</a> </h1> </li> 
+      <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone --> 
+      <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li> 
+     </ul> 
+     <section class="top-bar-section"> 
+      <ul class="right"> 
+       <li class="has-form"> 
+        <form class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse"> 
+         <div class="row collapse"> 
+          <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya"> 
+          <input type="hidden" name="cof" value="FORID:0"> 
+          <input class="form-control" name="q" type="text" placeholder="Search"> 
+         </div> 
+        </form> </li> 
+      </ul> 
+      <!-- Left Nav Section --> 
+      <ul class="left"> 
+       <li><a href="/documentation.html">Documentation</a></li> 
+       <li><a href="/downloads.html">Downloads</a></li> 
+       <li><a href="/help.html">Help</a></li> 
+       <li><a href="/asf.html">@ASF</a></li> 
+      </ul> 
+     </section> 
+    </nav> 
+   </div> 
+  </div> 
+  <div class="row"> 
+   <div id="doc-content-left" class="large-9 medium-9 columns"> 
+    <div id="doc-content">
+     <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/help.adoc&quot;" style="float: right; font-size: small; padding: 6px;  "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+     <div class="sect1"> 
+      <h2 id="_help">Help:</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_help.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="ulist"> 
+        <ul> 
+         <li> <p><a href="support.html">Mailing Lists</a></p> </li> 
+         <li> <p>Mailing List Archives: <a href="https://lists.apache.org/list.html?users@isis.apache.org">ASF Pony mail</a>, <a href="http://isis.markmail.org/search/?q=">Markmail</a></p> </li> 
+         <li> <p><a href="https://issues.apache.org/jira/browse/ISIS">JIRA</a></p> </li> 
+         <li> <p><a href="http://github.com/apache/isis">Github mirror</a></p> </li> 
+         <li> <p><a href="http://stackoverflow.com/questions/tagged/isis">Stack Overflow</a> (tagged=isis)</p> </li> 
+         <li> <p><a href="guides/dg.html#_dg_contributing">How to contribute</a></p> </li> 
+        </ul> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_commonly_used_resources">Commonly-used Resources</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_commonly_used_resources.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="ulist"> 
+        <ul> 
+         <li> <p>Browse <a href="http://github.com/apache/isis">Github mirror</a></p> </li> 
+         <li> <p><a href="https://issues.apache.org/jira/browse/ISIS">JIRA</a></p> </li> 
+         <li> <p><a href="http://stackoverflow.com/questions/tagged/isis">Stackoverflow (tagged=isis)</a> and <a href="http://stackoverflow.com/feeds/tag/isis">Stackoverflow (RSS feed)</a></p> </li> 
+        </ul> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_other_resources">Other Resources</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_other_resources.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="ulist"> 
+        <ul> 
+         <li> <p><a href="download.html">Source code repo</a> (on Apache)</p> </li> 
+         <li> <p><a href="https://cwiki.apache.org/confluence/display/ISIS/Index">Confluence Wiki</a> (register then request perms via mailing list)</p> </li> 
+         <li> <p><a href="doap_isis.rdf">DOAP RDF file</a> (as per [Apache requirements](<a href="http://projects.apache.org/doap.html)" class="bare">http://projects.apache.org/doap.html)</a>)</p> </li> 
+         <li> <p><a href="https://builds.apache.org/job/isis-core-ubuntu/">CI Builds</a></p> </li> 
+         <li> <p><a href="https://fisheye6.atlassian.com/changelog/isis-git">Fisheye</a></p> </li> 
+         <li> <p><a href="https://analysis.apache.org/dashboard/index/org.apache.isis.core:isis">Sonar (@Apache)</a> (core module only)</p> </li> 
+         <li> <p><a href="http://nemo.sonarsource.org/dashboard/index/org.apache.isis:isis-all">Sonar (3rd party)</a> (all modules)</p> </li> 
+        </ul> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_example_apps_open_source">Example apps (open-source)</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_example_apps_open_source.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="ulist"> 
+        <ul> 
+         <li> <p><a href="https://github.com/estatio/estatio">Estatio</a></p> </li> 
+        </ul> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_committers_blogs">Committers' Blogs</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_committers_blogs.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="ulist"> 
+        <ul> 
+         <li> <p><a href="http://danhaywood.com/">Dan Haywood</a></p> </li> 
+         <li> <p><a href="http://www.objectconnexions.co.uk/">Rob Matthews</a></p> </li> 
+         <li> <p><a href="http://www.kmz.co.za/blog/">Kevin Meyer</a></p> </li> 
+        </ul> 
+       </div> 
+      </div> 
+     </div> 
+    </div> 
+    <footer> 
+     <hr> 
+     <p class="small"> Copyright � 2010~2016 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0. <br> Apache, the Apache feather logo, Apache&nbsp;Isis, and the Apache&nbsp;Isis project logo are all trademarks of The&nbsp;Apache&nbsp;Software&nbsp;Foundation. </p> 
+    </footer> 
+   </div> 
+   <div id="doc-content-right" class="large-3 medium-3 xcolumns"> 
+    <div id="toc" class="toc2"> 
+     <div class="fallback-toc"> 
+      <ul class="sectlevel1"> 
+       <li><a href="#_help">Help:</a></li> 
+       <li><a href="#_commonly_used_resources">Commonly-used Resources</a></li> 
+       <li><a href="#_other_resources">Other Resources</a></li> 
+       <li><a href="#_example_apps_open_source">Example apps (open-source)</a></li> 
+       <li><a href="#_committers_blogs">Committers' Blogs</a></li> 
+      </ul> 
+     </div> 
+    </div> 
+   </div> 
+  </div> 
+  <script src="./js/foundation/5.5.1/vendor/jquery.js"></script> 
+  <script src="./js/foundation/5.5.1/foundation.min.js"></script> 
+  <link href="./css/jquery.tocify/1.9.0/jquery.tocify.css" rel="stylesheet"> 
+  <script src="./js/jqueryui/1.11.4/jquery-ui.min.js"></script> 
+  <script src="./js/jquery.tocify/1.9.0/jquery.tocify.js"></script> 
+  <script type="text/javascript">
     $(function () {
         $("#toc").tocify({
             scrollTo: 50,
@@ -667,9 +566,8 @@ table.CodeRay td.code>pre{padding:0}
         });
         $(".fallback-toc").hide();
     });
-</script>
-
-<script type="text/javascript">
+</script> 
+  <script type="text/javascript">
 
   /****
 
@@ -779,9 +677,8 @@ table.CodeRay td.code>pre{padding:0}
 
     ***/
 
-</script>
-
-<script type="text/javascript">
+</script> 
+  <script type="text/javascript">
 
 $(document).ready(function(){
     if("Documentation" === "Help") {
@@ -793,10 +690,8 @@ $(document).ready(function(){
 
 });
 
-</script>
-
-
-<script>
+</script> 
+  <script>
 
 $( document ).ready(function() {
 
@@ -887,7 +782,6 @@ $( document ).ready(function() {
 
 
 });
-</script>
-
-</body>
+</script>  
+ </body>
 </html>

http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/how-isis-works.html
----------------------------------------------------------------------
diff --git a/content/how-isis-works.html b/content/how-isis-works.html
index 419bd20..96beec6 100644
--- a/content/how-isis-works.html
+++ b/content/how-isis-works.html
@@ -1,12 +1,10 @@
 <!doctype html>
 <html class="no-js" lang="en">
-<head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-
-    <title>How Apache Isis Works</title>
-
-    <!--
+ <head> 
+  <meta charset="utf-8"> 
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"> 
+  <title>How Apache Isis Works</title> 
+  <!--
         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
@@ -23,31 +21,21 @@
         KIND, either express or implied.  See the License for the
         specific language governing permissions and limitations
         under the License.
-    -->
-
-    <!-- No caching headers -->
-    <meta http-equiv="cache-control" content="no-cache" />
-    <meta http-equiv="pragma" content="no-cache" />
-    <meta http-equiv="expires" content="-1" />
-
-
-    <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
-    <link href="./css/foundation/5.5.1/foundation.css" rel="stylesheet" />
-    <script src="./js/foundation/5.5.1/vendor/modernizr.js"></script>
-    <link href="./css/asciidoctor/colony.css" rel="stylesheet">
-    <link href="./css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-
-
-
-    <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
-    <!--[if lt IE 9]>
+    --> 
+  <!-- No caching headers --> 
+  <meta http-equiv="cache-control" content="no-cache"> 
+  <meta http-equiv="pragma" content="no-cache"> 
+  <meta http-equiv="expires" content="-1"> 
+  <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line --> 
+  <link href="./css/foundation/5.5.1/foundation.css" rel="stylesheet"> 
+  <script src="./js/foundation/5.5.1/vendor/modernizr.js"></script> 
+  <link href="./css/asciidoctor/colony.css" rel="stylesheet"> 
+  <link href="./css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet"> 
+  <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet"> 
+  <!--[if lt IE 9]>
       <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
-    <![endif]-->
-
-
-
-    <style type="text/css">
+    <![endif]--> 
+  <style type="text/css">
         pre code {
             background-color: inherit;
             border-style: none;
@@ -192,9 +180,8 @@ table.CodeRay td.code>pre{padding:0}
         color:#fff;
         font-size: 1.1em;
     }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         @media only screen and (min-width: 40.063em) {
           .top-bar {
             .contain-to-grid .top-bar {
@@ -205,9 +192,8 @@ table.CodeRay td.code>pre{padding:0}
         .row {
             max-width: 80rem;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .extended-quote,
         .extended-quote-first {
             margin-left: 40px;
@@ -231,9 +217,8 @@ table.CodeRay td.code>pre{padding:0}
             text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
         }
         
-    </style>
-
-    <style>
+    </style> 
+  <style>
         body {
           position: relative;
         }
@@ -255,6 +240,7 @@ table.CodeRay td.code>pre{padding:0}
 
         div#doc-content {
             margin-top: 30px;
+            padding-top: 30px;
         }
 
         div.documentation-page table.frame-all {
@@ -286,9 +272,8 @@ table.CodeRay td.code>pre{padding:0}
             min-height: 2000px;
         }
 
-    </style>
-
-    <style>
+    </style> 
+  <style>
 
         @media only screen and (min-width: 768px) {
           #toc.toc2 ul ul { margin-left: -10px; }
@@ -316,15 +301,13 @@ table.CodeRay td.code>pre{padding:0}
         body div#toc2 li.tocify-item.active a {
             color: red;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         footer {
             margin-top: 1000px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* overriding colony.css stylesheet */
         .literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
            /*padding: 1.25em 1.5625em 1.125em 1.5625em;*/
@@ -372,9 +355,8 @@ table.CodeRay td.code>pre{padding:0}
         .imageblock img {
             margin-bottom: 10px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* from http://ben.balter.com/2014/03/13/pages-anchor-links/ */
         .header-link {
           position: absolute;
@@ -395,9 +377,8 @@ table.CodeRay td.code>pre{padding:0}
         h6:hover .header-link {
           opacity: 1;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .top-bar
         {
             -webkit-transition-duration: .5s;
@@ -425,143 +406,98 @@ table.CodeRay td.code>pre{padding:0}
             -webkit-transition-property: -webkit-transform;
             transition-property: transform;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         #doc-content a.guide {
             color: white;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
+        .tocify {
+            margin-top: 80px;
+        }
+    </style> 
+  <style>
         .tocify {
             margin-top: 80px;
         }
-    </style>
-
-
-</script>
-
-</head>
-<body>
-
-<<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
-    <div class="github-fork-ribbon">
-        <a href="https://github.com/apache/isis#fork-destination-box">Fork me on GitHub</a>
-    </div>
-</div>
-
-
-<div class="row">
-
-    <div class="fixed contain-to-grid header">
-        <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
-            <ul class="title-area">
-                <li class="name">
-                    <h1>
-                        <a href="/index.html">Apache Isis&trade;</a>
-                    </h1>
-                </li>
-                <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
-                <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
-            </ul>
-
-            <section class="top-bar-section">
-                <ul class="right">
-
-                    <li class="has-form">
-                       <FORM class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
-                        <div class="row collapse">
-                            <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
-                            <INPUT type="hidden" name="cof" value="FORID:0">
-                            <INPUT class="form-control" name="q" type="text" placeholder="Search">
-                        </div>
-                    </FORM>
-                     </li>
-
-                </ul>
-
-                <!-- Left Nav Section -->
-                <ul class="left">
-
-                    <li><a href="/documentation.html">Documentation</a></li>
-                    <li><a href="/downloads.html">Downloads</a></li>
-                    <li><a href="/help.html">Help</a></li>
-                    <li><a href="/asf.html">@ASF</a></li>
-
-                </ul>
-
-            </section>
-        </nav>
-    </div>
-</div>
-
-<div class="row">
-
-    <div id="doc-content-left" class="large-9 medium-9 columns">
-
-
-        <div id="doc-content">
-          <div class="paragraph">
-<p><br/><br/></p>
-</div>
-<div class="paragraph">
-<p>This screencast explains how Apache Isis builds a webapp from the underlying domain object model&#8230;&#8203;</p>
-</div>
-<div class="videoblock">
-<div class="content">
-<iframe width="840px" height="630px" src="https://www.youtube.com/embed/ludOLyi6VyY?rel=0" frameborder="0" allowfullscreen></iframe>
-</div>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>Note that this screencast shows an earlier version of the <a href="ugvw.html">Wicket viewer</a> UI (specifically, pre 1.8.0).</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-        </div>
-
-        <footer>
-          <hr>
-          <p class="small">
-          Copyright &copy; 2010~2016 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0.
-          <br/>
-          Apache, the Apache feather logo, Apache&nbsp;Isis, and the Apache&nbsp;Isis project logo are all trademarks of The&nbsp;Apache&nbsp;Software&nbsp;Foundation.
-          </p>
-        </footer>
-
-    </div>
-
-    <div id="doc-content-right" class="large-3 medium-3 xcolumns">
-        <div id="toc" class="toc2">
-            <div class="fallback-toc">
-                
-            </div>
-        </div>
-    </div>
-
-</div>
-
-
-<script src="./js/foundation/5.5.1/vendor/jquery.js"></script>
-<script src="./js/foundation/5.5.1/foundation.min.js"></script>
-
-
-<link href="./css/jquery.tocify/1.9.0/jquery.tocify.css" rel="stylesheet">
-<script src="./js/jqueryui/1.11.4/jquery-ui.min.js"></script>
-<script src="./js/jquery.tocify/1.9.0/jquery.tocify.js"></script>
-
-
-
-<script type="text/javascript">
+    </style>  
+ </head> 
+ <body> 
+  <div class="row"> 
+   <div class="fixed contain-to-grid header"> 
+    <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem"> 
+     <ul class="title-area"> 
+      <li class="name"> <h1> <a href="/index.html">Apache Isis\u2122</a> </h1> </li> 
+      <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone --> 
+      <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li> 
+     </ul> 
+     <section class="top-bar-section"> 
+      <ul class="right"> 
+       <li class="has-form"> 
+        <form class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse"> 
+         <div class="row collapse"> 
+          <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya"> 
+          <input type="hidden" name="cof" value="FORID:0"> 
+          <input class="form-control" name="q" type="text" placeholder="Search"> 
+         </div> 
+        </form> </li> 
+      </ul> 
+      <!-- Left Nav Section --> 
+      <ul class="left"> 
+       <li><a href="/documentation.html">Documentation</a></li> 
+       <li><a href="/downloads.html">Downloads</a></li> 
+       <li><a href="/help.html">Help</a></li> 
+       <li><a href="/asf.html">@ASF</a></li> 
+      </ul> 
+     </section> 
+    </nav> 
+   </div> 
+  </div> 
+  <div class="row"> 
+   <div id="doc-content-left" class="large-9 medium-9 columns"> 
+    <div id="doc-content">
+     <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/how-isis-works.adoc&quot;" style="float: right; font-size: small; padding: 6px;  "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+     <div class="paragraph"> 
+      <p>This screencast explains how Apache Isis builds a webapp from the underlying domain object model\u2026\u200b</p> 
+     </div> 
+     <div class="videoblock"> 
+      <div class="content"> 
+       <iframe width="840px" height="630px" src="https://www.youtube.com/embed/ludOLyi6VyY?rel=0" frameborder="0" allowfullscreen></iframe> 
+      </div> 
+     </div> 
+     <div class="admonitionblock note"> 
+      <table> 
+       <tbody>
+        <tr> 
+         <td class="icon"> <i class="fa icon-note" title="Note"></i> </td> 
+         <td class="content"> 
+          <div class="paragraph"> 
+           <p>Note that this screencast shows an earlier version of the <a href="ugvw.html">Wicket viewer</a> UI (specifically, pre 1.8.0).</p> 
+          </div> </td> 
+        </tr> 
+       </tbody>
+      </table> 
+     </div> 
+    </div> 
+    <footer> 
+     <hr> 
+     <p class="small"> Copyright � 2010~2016 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0. <br> Apache, the Apache feather logo, Apache&nbsp;Isis, and the Apache&nbsp;Isis project logo are all trademarks of The&nbsp;Apache&nbsp;Software&nbsp;Foundation. </p> 
+    </footer> 
+   </div> 
+   <div id="doc-content-right" class="large-3 medium-3 xcolumns"> 
+    <div id="toc" class="toc2"> 
+     <div class="fallback-toc"> 
+     </div> 
+    </div> 
+   </div> 
+  </div> 
+  <script src="./js/foundation/5.5.1/vendor/jquery.js"></script> 
+  <script src="./js/foundation/5.5.1/foundation.min.js"></script> 
+  <link href="./css/jquery.tocify/1.9.0/jquery.tocify.css" rel="stylesheet"> 
+  <script src="./js/jqueryui/1.11.4/jquery-ui.min.js"></script> 
+  <script src="./js/jquery.tocify/1.9.0/jquery.tocify.js"></script> 
+  <script type="text/javascript">
     $(function () {
         $("#toc").tocify({
             scrollTo: 50,
@@ -574,9 +510,8 @@ table.CodeRay td.code>pre{padding:0}
         });
         $(".fallback-toc").hide();
     });
-</script>
-
-<script type="text/javascript">
+</script> 
+  <script type="text/javascript">
 
   /****
 
@@ -686,9 +621,8 @@ table.CodeRay td.code>pre{padding:0}
 
     ***/
 
-</script>
-
-<script type="text/javascript">
+</script> 
+  <script type="text/javascript">
 
 $(document).ready(function(){
     if("Documentation" === "How Apache Isis Works") {
@@ -700,10 +634,8 @@ $(document).ready(function(){
 
 });
 
-</script>
-
-
-<script>
+</script> 
+  <script>
 
 $( document ).ready(function() {
 
@@ -794,7 +726,6 @@ $( document ).ready(function() {
 
 
 });
-</script>
-
-</body>
+</script>  
+ </body>
 </html>

http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/icons.html
----------------------------------------------------------------------
diff --git a/content/icons.html b/content/icons.html
index c14932f..50894ec 100644
--- a/content/icons.html
+++ b/content/icons.html
@@ -1,12 +1,10 @@
 <!doctype html>
 <html class="no-js" lang="en">
-<head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-
-    <title>Icons</title>
-
-    <!--
+ <head> 
+  <meta charset="utf-8"> 
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"> 
+  <title>Icons</title> 
+  <!--
         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
@@ -23,31 +21,21 @@
         KIND, either express or implied.  See the License for the
         specific language governing permissions and limitations
         under the License.
-    -->
-
-    <!-- No caching headers -->
-    <meta http-equiv="cache-control" content="no-cache" />
-    <meta http-equiv="pragma" content="no-cache" />
-    <meta http-equiv="expires" content="-1" />
-
-
-    <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
-    <link href="./css/foundation/5.5.1/foundation.css" rel="stylesheet" />
-    <script src="./js/foundation/5.5.1/vendor/modernizr.js"></script>
-    <link href="./css/asciidoctor/colony.css" rel="stylesheet">
-    <link href="./css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-
-
-
-    <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
-    <!--[if lt IE 9]>
+    --> 
+  <!-- No caching headers --> 
+  <meta http-equiv="cache-control" content="no-cache"> 
+  <meta http-equiv="pragma" content="no-cache"> 
+  <meta http-equiv="expires" content="-1"> 
+  <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line --> 
+  <link href="./css/foundation/5.5.1/foundation.css" rel="stylesheet"> 
+  <script src="./js/foundation/5.5.1/vendor/modernizr.js"></script> 
+  <link href="./css/asciidoctor/colony.css" rel="stylesheet"> 
+  <link href="./css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet"> 
+  <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet"> 
+  <!--[if lt IE 9]>
       <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
-    <![endif]-->
-
-
-
-    <style type="text/css">
+    <![endif]--> 
+  <style type="text/css">
         pre code {
             background-color: inherit;
             border-style: none;
@@ -192,9 +180,8 @@ table.CodeRay td.code>pre{padding:0}
         color:#fff;
         font-size: 1.1em;
     }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         @media only screen and (min-width: 40.063em) {
           .top-bar {
             .contain-to-grid .top-bar {
@@ -205,9 +192,8 @@ table.CodeRay td.code>pre{padding:0}
         .row {
             max-width: 80rem;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .extended-quote,
         .extended-quote-first {
             margin-left: 40px;
@@ -231,9 +217,8 @@ table.CodeRay td.code>pre{padding:0}
             text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
         }
         
-    </style>
-
-    <style>
+    </style> 
+  <style>
         body {
           position: relative;
         }
@@ -255,6 +240,7 @@ table.CodeRay td.code>pre{padding:0}
 
         div#doc-content {
             margin-top: 30px;
+            padding-top: 30px;
         }
 
         div.documentation-page table.frame-all {
@@ -286,9 +272,8 @@ table.CodeRay td.code>pre{padding:0}
             min-height: 2000px;
         }
 
-    </style>
-
-    <style>
+    </style> 
+  <style>
 
         @media only screen and (min-width: 768px) {
           #toc.toc2 ul ul { margin-left: -10px; }
@@ -316,15 +301,13 @@ table.CodeRay td.code>pre{padding:0}
         body div#toc2 li.tocify-item.active a {
             color: red;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         footer {
             margin-top: 1000px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* overriding colony.css stylesheet */
         .literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
            /*padding: 1.25em 1.5625em 1.125em 1.5625em;*/
@@ -372,9 +355,8 @@ table.CodeRay td.code>pre{padding:0}
         .imageblock img {
             margin-bottom: 10px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* from http://ben.balter.com/2014/03/13/pages-anchor-links/ */
         .header-link {
           position: absolute;
@@ -395,9 +377,8 @@ table.CodeRay td.code>pre{padding:0}
         h6:hover .header-link {
           opacity: 1;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .top-bar
         {
             -webkit-transition-duration: .5s;
@@ -425,162 +406,102 @@ table.CodeRay td.code>pre{padding:0}
             -webkit-transition-property: -webkit-transform;
             transition-property: transform;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         #doc-content a.guide {
             color: white;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
+        .tocify {
+            margin-top: 80px;
+        }
+    </style> 
+  <style>
         .tocify {
             margin-top: 80px;
         }
-    </style>
-
-
-</script>
-
-</head>
-<body>
-
-<<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
-    <div class="github-fork-ribbon">
-        <a href="https://github.com/apache/isis#fork-destination-box">Fork me on GitHub</a>
-    </div>
-</div>
-
-
-<div class="row">
-
-    <div class="fixed contain-to-grid header">
-        <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
-            <ul class="title-area">
-                <li class="name">
-                    <h1>
-                        <a href="/index.html">Apache Isis&trade;</a>
-                    </h1>
-                </li>
-                <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
-                <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
-            </ul>
-
-            <section class="top-bar-section">
-                <ul class="right">
-
-                    <li class="has-form">
-                       <FORM class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
-                        <div class="row collapse">
-                            <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
-                            <INPUT type="hidden" name="cof" value="FORID:0">
-                            <INPUT class="form-control" name="q" type="text" placeholder="Search">
-                        </div>
-                    </FORM>
-                     </li>
-
-                </ul>
-
-                <!-- Left Nav Section -->
-                <ul class="left">
-
-                    <li><a href="/documentation.html">Documentation</a></li>
-                    <li><a href="/downloads.html">Downloads</a></li>
-                    <li><a href="/help.html">Help</a></li>
-                    <li><a href="/asf.html">@ASF</a></li>
-
-                </ul>
-
-            </section>
-        </nav>
-    </div>
-</div>
-
-<div class="row">
-
-    <div id="doc-content-left" class="large-9 medium-9 columns">
-
-
-        <div id="doc-content">
-          <div class="paragraph">
-<p><br/><br/></p>
-</div>
-<div class="paragraph">
-<p>Most Apache Isis viewers use icons to help identify domain objects in the user interface. It&#8217;s a good idea to ensure that these are styled consistently. Here are some open source icon sets for both personal and commercial use (though some require a link back to the authors website):</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://icons8.com/">icons8</a> (as used in the <a href="../powered-by/powered-by.html">Estatio</a> app) - styled for Win8, Android and MacOS</p>
-</li>
-<li>
-<p><a href="http://tango.freedesktop.org/Tango_Icon_Library">tango desktop</a> icon set - as used in Linux GNOME and KDE desktops</p>
-</li>
-<li>
-<p><a href="http://thenounproject.com/">the noun project</a> community of icon providers (both free and commercial)</p>
-</li>
-<li>
-<p><a href="http://www.flaticon.com/">flaticon</a> - free vector icons</p>
-</li>
-<li>
-<p><a href="http://google.github.io/material-design-icons/">Google material design</a> and <a href="http://www.google.com/design/spec/resources/sticker-sheets.html#">zip here</a></p>
-</li>
-<li>
-<p><a href="http://adamwhitcroft.com/batch/">batch</a> (300+ icons)</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>You are also free to use these icon sets, with no restrictions:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="https://github.com/apache/isis/blob/master/src/site/resources/images/icons/haywood.zip?raw=true">haywood</a></p>
-</li>
-<li>
-<p><a href="https://github.com/apache/isis/blob/master/src/site/resources/images/icons/nogl.zip?raw=true">nogl</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>If you know of any others freely usable and easily accessible, let us know through the <a href="./support.html">mailing list</a>.</p>
-</div>
-        </div>
-
-        <footer>
-          <hr>
-          <p class="small">
-          Copyright &copy; 2010~2016 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0.
-          <br/>
-          Apache, the Apache feather logo, Apache&nbsp;Isis, and the Apache&nbsp;Isis project logo are all trademarks of The&nbsp;Apache&nbsp;Software&nbsp;Foundation.
-          </p>
-        </footer>
-
-    </div>
-
-    <div id="doc-content-right" class="large-3 medium-3 xcolumns">
-        <div id="toc" class="toc2">
-            <div class="fallback-toc">
-                
-            </div>
-        </div>
-    </div>
-
-</div>
-
-
-<script src="./js/foundation/5.5.1/vendor/jquery.js"></script>
-<script src="./js/foundation/5.5.1/foundation.min.js"></script>
-
-
-<link href="./css/jquery.tocify/1.9.0/jquery.tocify.css" rel="stylesheet">
-<script src="./js/jqueryui/1.11.4/jquery-ui.min.js"></script>
-<script src="./js/jquery.tocify/1.9.0/jquery.tocify.js"></script>
-
-
-
-<script type="text/javascript">
+    </style>  
+ </head> 
+ <body> 
+  <div class="row"> 
+   <div class="fixed contain-to-grid header"> 
+    <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem"> 
+     <ul class="title-area"> 
+      <li class="name"> <h1> <a href="/index.html">Apache Isis\u2122</a> </h1> </li> 
+      <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone --> 
+      <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li> 
+     </ul> 
+     <section class="top-bar-section"> 
+      <ul class="right"> 
+       <li class="has-form"> 
+        <form class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse"> 
+         <div class="row collapse"> 
+          <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya"> 
+          <input type="hidden" name="cof" value="FORID:0"> 
+          <input class="form-control" name="q" type="text" placeholder="Search"> 
+         </div> 
+        </form> </li> 
+      </ul> 
+      <!-- Left Nav Section --> 
+      <ul class="left"> 
+       <li><a href="/documentation.html">Documentation</a></li> 
+       <li><a href="/downloads.html">Downloads</a></li> 
+       <li><a href="/help.html">Help</a></li> 
+       <li><a href="/asf.html">@ASF</a></li> 
+      </ul> 
+     </section> 
+    </nav> 
+   </div> 
+  </div> 
+  <div class="row"> 
+   <div id="doc-content-left" class="large-9 medium-9 columns"> 
+    <div id="doc-content">
+     <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/icons.adoc&quot;" style="float: right; font-size: small; padding: 6px;  "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+     <div class="paragraph"> 
+      <p>Most Apache Isis viewers use icons to help identify domain objects in the user interface. It\u2019s a good idea to ensure that these are styled consistently. Here are some open source icon sets for both personal and commercial use (though some require a link back to the authors website):</p> 
+     </div> 
+     <div class="ulist"> 
+      <ul> 
+       <li> <p><a href="http://icons8.com/">icons8</a> (as used in the <a href="../powered-by/powered-by.html">Estatio</a> app) - styled for Win8, Android and MacOS</p> </li> 
+       <li> <p><a href="http://tango.freedesktop.org/Tango_Icon_Library">tango desktop</a> icon set - as used in Linux GNOME and KDE desktops</p> </li> 
+       <li> <p><a href="http://thenounproject.com/">the noun project</a> community of icon providers (both free and commercial)</p> </li> 
+       <li> <p><a href="http://www.flaticon.com/">flaticon</a> - free vector icons</p> </li> 
+       <li> <p><a href="http://google.github.io/material-design-icons/">Google material design</a> and <a href="http://www.google.com/design/spec/resources/sticker-sheets.html#">zip here</a></p> </li> 
+       <li> <p><a href="http://adamwhitcroft.com/batch/">batch</a> (300+ icons)</p> </li> 
+      </ul> 
+     </div> 
+     <div class="paragraph"> 
+      <p>You are also free to use these icon sets, with no restrictions:</p> 
+     </div> 
+     <div class="ulist"> 
+      <ul> 
+       <li> <p><a href="https://github.com/apache/isis/blob/master/src/site/resources/images/icons/haywood.zip?raw=true">haywood</a></p> </li> 
+       <li> <p><a href="https://github.com/apache/isis/blob/master/src/site/resources/images/icons/nogl.zip?raw=true">nogl</a></p> </li> 
+      </ul> 
+     </div> 
+     <div class="paragraph"> 
+      <p>If you know of any others freely usable and easily accessible, let us know through the <a href="./support.html">mailing list</a>.</p> 
+     </div> 
+    </div> 
+    <footer> 
+     <hr> 
+     <p class="small"> Copyright � 2010~2016 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0. <br> Apache, the Apache feather logo, Apache&nbsp;Isis, and the Apache&nbsp;Isis project logo are all trademarks of The&nbsp;Apache&nbsp;Software&nbsp;Foundation. </p> 
+    </footer> 
+   </div> 
+   <div id="doc-content-right" class="large-3 medium-3 xcolumns"> 
+    <div id="toc" class="toc2"> 
+     <div class="fallback-toc"> 
+     </div> 
+    </div> 
+   </div> 
+  </div> 
+  <script src="./js/foundation/5.5.1/vendor/jquery.js"></script> 
+  <script src="./js/foundation/5.5.1/foundation.min.js"></script> 
+  <link href="./css/jquery.tocify/1.9.0/jquery.tocify.css" rel="stylesheet"> 
+  <script src="./js/jqueryui/1.11.4/jquery-ui.min.js"></script> 
+  <script src="./js/jquery.tocify/1.9.0/jquery.tocify.js"></script> 
+  <script type="text/javascript">
     $(function () {
         $("#toc").tocify({
             scrollTo: 50,
@@ -593,9 +514,8 @@ table.CodeRay td.code>pre{padding:0}
         });
         $(".fallback-toc").hide();
     });
-</script>
-
-<script type="text/javascript">
+</script> 
+  <script type="text/javascript">
 
   /****
 
@@ -705,9 +625,8 @@ table.CodeRay td.code>pre{padding:0}
 
     ***/
 
-</script>
-
-<script type="text/javascript">
+</script> 
+  <script type="text/javascript">
 
 $(document).ready(function(){
     if("Documentation" === "Icons") {
@@ -719,10 +638,8 @@ $(document).ready(function(){
 
 });
 
-</script>
-
-
-<script>
+</script> 
+  <script>
 
 $( document ).ready(function() {
 
@@ -813,7 +730,6 @@ $( document ).ready(function() {
 
 
 });
-</script>
-
-</body>
+</script>  
+ </body>
 </html>

http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/introducing-apache-isis/common-use-cases/common-use-cases.html
----------------------------------------------------------------------
diff --git a/content/introducing-apache-isis/common-use-cases/common-use-cases.html b/content/introducing-apache-isis/common-use-cases/common-use-cases.html
index 14e7bc1..e3413f1 100644
--- a/content/introducing-apache-isis/common-use-cases/common-use-cases.html
+++ b/content/introducing-apache-isis/common-use-cases/common-use-cases.html
@@ -1,12 +1,10 @@
 <!doctype html>
 <html class="no-js" lang="en">
-<head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-
-    <title>Common Use Cases</title>
-
-    <!--
+ <head> 
+  <meta charset="utf-8"> 
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"> 
+  <title>Common Use Cases</title> 
+  <!--
         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
@@ -23,31 +21,21 @@
         KIND, either express or implied.  See the License for the
         specific language governing permissions and limitations
         under the License.
-    -->
-
-    <!-- No caching headers -->
-    <meta http-equiv="cache-control" content="no-cache" />
-    <meta http-equiv="pragma" content="no-cache" />
-    <meta http-equiv="expires" content="-1" />
-
-
-    <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
-    <link href="../../css/foundation/5.5.1/foundation.css" rel="stylesheet" />
-    <script src="../../js/foundation/5.5.1/vendor/modernizr.js"></script>
-    <link href="../../css/asciidoctor/colony.css" rel="stylesheet">
-    <link href="../../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-
-
-
-    <link href="../../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
-    <!--[if lt IE 9]>
+    --> 
+  <!-- No caching headers --> 
+  <meta http-equiv="cache-control" content="no-cache"> 
+  <meta http-equiv="pragma" content="no-cache"> 
+  <meta http-equiv="expires" content="-1"> 
+  <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line --> 
+  <link href="../../css/foundation/5.5.1/foundation.css" rel="stylesheet"> 
+  <script src="../../js/foundation/5.5.1/vendor/modernizr.js"></script> 
+  <link href="../../css/asciidoctor/colony.css" rel="stylesheet"> 
+  <link href="../../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet"> 
+  <link href="../../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet"> 
+  <!--[if lt IE 9]>
       <link href="../../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
-    <![endif]-->
-
-
-
-    <style type="text/css">
+    <![endif]--> 
+  <style type="text/css">
         pre code {
             background-color: inherit;
             border-style: none;
@@ -192,9 +180,8 @@ table.CodeRay td.code>pre{padding:0}
         color:#fff;
         font-size: 1.1em;
     }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         @media only screen and (min-width: 40.063em) {
           .top-bar {
             .contain-to-grid .top-bar {
@@ -205,9 +192,8 @@ table.CodeRay td.code>pre{padding:0}
         .row {
             max-width: 80rem;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .extended-quote,
         .extended-quote-first {
             margin-left: 40px;
@@ -231,9 +217,8 @@ table.CodeRay td.code>pre{padding:0}
             text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
         }
         
-    </style>
-
-    <style>
+    </style> 
+  <style>
         body {
           position: relative;
         }
@@ -255,6 +240,7 @@ table.CodeRay td.code>pre{padding:0}
 
         div#doc-content {
             margin-top: 30px;
+            padding-top: 30px;
         }
 
         div.documentation-page table.frame-all {
@@ -286,9 +272,8 @@ table.CodeRay td.code>pre{padding:0}
             min-height: 2000px;
         }
 
-    </style>
-
-    <style>
+    </style> 
+  <style>
 
         @media only screen and (min-width: 768px) {
           #toc.toc2 ul ul { margin-left: -10px; }
@@ -316,15 +301,13 @@ table.CodeRay td.code>pre{padding:0}
         body div#toc2 li.tocify-item.active a {
             color: red;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         footer {
             margin-top: 1000px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* overriding colony.css stylesheet */
         .literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
            /*padding: 1.25em 1.5625em 1.125em 1.5625em;*/
@@ -372,9 +355,8 @@ table.CodeRay td.code>pre{padding:0}
         .imageblock img {
             margin-bottom: 10px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* from http://ben.balter.com/2014/03/13/pages-anchor-links/ */
         .header-link {
           position: absolute;
@@ -395,9 +377,8 @@ table.CodeRay td.code>pre{padding:0}
         h6:hover .header-link {
           opacity: 1;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .top-bar
         {
             -webkit-transition-duration: .5s;
@@ -425,130 +406,87 @@ table.CodeRay td.code>pre{padding:0}
             -webkit-transition-property: -webkit-transform;
             transition-property: transform;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         #doc-content a.guide {
             color: white;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .tocify {
             margin-top: 80px;
         }
-    </style>
-
-
-</script>
-
-</head>
-<body>
-
-<<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
-    <div class="github-fork-ribbon">
-        <a href="https://github.com/apache/isis#fork-destination-box">Fork me on GitHub</a>
-    </div>
-</div>
-
-
-<div class="row">
-
-    <div class="fixed contain-to-grid header">
-        <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
-            <ul class="title-area">
-                <li class="name">
-                    <h1>
-                        <a href="/index.html">Apache Isis&trade;</a>
-                    </h1>
-                </li>
-                <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
-                <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
-            </ul>
-
-            <section class="top-bar-section">
-                <ul class="right">
-
-                    <li class="has-form">
-                       <FORM class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
-                        <div class="row collapse">
-                            <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
-                            <INPUT type="hidden" name="cof" value="FORID:0">
-                            <INPUT class="form-control" name="q" type="text" placeholder="Search">
-                        </div>
-                    </FORM>
-                     </li>
-
-                </ul>
-
-                <!-- Left Nav Section -->
-                <ul class="left">
-
-                    <li><a href="/documentation.html">Documentation</a></li>
-                    <li><a href="/downloads.html">Downloads</a></li>
-                    <li><a href="/help.html">Help</a></li>
-                    <li><a href="/asf.html">@ASF</a></li>
-
-                </ul>
-
-            </section>
-        </nav>
-    </div>
-</div>
-
-<div class="row">
-
-    <div id="doc-content-left" class="large-9 medium-9 columns">
-
-
-        <div id="doc-content">
-          <div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-TODO
-</td>
-</tr>
-</table>
-</div>
-        </div>
-
-        <footer>
-          <hr>
-          <p class="small">
-          Copyright &copy; 2010~2016 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0.
-          <br/>
-          Apache, the Apache feather logo, Apache&nbsp;Isis, and the Apache&nbsp;Isis project logo are all trademarks of The&nbsp;Apache&nbsp;Software&nbsp;Foundation.
-          </p>
-        </footer>
-
-    </div>
-
-    <div id="doc-content-right" class="large-3 medium-3 xcolumns">
-        <div id="toc" class="toc2">
-            <div class="fallback-toc">
-                
-            </div>
-        </div>
-    </div>
-
-</div>
-
-
-<script src="../../js/foundation/5.5.1/vendor/jquery.js"></script>
-<script src="../../js/foundation/5.5.1/foundation.min.js"></script>
-
-
-<link href="../../css/jquery.tocify/1.9.0/jquery.tocify.css" rel="stylesheet">
-<script src="../../js/jqueryui/1.11.4/jquery-ui.min.js"></script>
-<script src="../../js/jquery.tocify/1.9.0/jquery.tocify.js"></script>
-
-
-
-<script type="text/javascript">
+    </style> 
+  <style>
+        .tocify {
+            margin-top: 80px;
+        }
+    </style>  
+ </head> 
+ <body> 
+  <div class="row"> 
+   <div class="fixed contain-to-grid header"> 
+    <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem"> 
+     <ul class="title-area"> 
+      <li class="name"> <h1> <a href="/index.html">Apache Isis\u2122</a> </h1> </li> 
+      <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone --> 
+      <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li> 
+     </ul> 
+     <section class="top-bar-section"> 
+      <ul class="right"> 
+       <li class="has-form"> 
+        <form class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse"> 
+         <div class="row collapse"> 
+          <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya"> 
+          <input type="hidden" name="cof" value="FORID:0"> 
+          <input class="form-control" name="q" type="text" placeholder="Search"> 
+         </div> 
+        </form> </li> 
+      </ul> 
+      <!-- Left Nav Section --> 
+      <ul class="left"> 
+       <li><a href="/documentation.html">Documentation</a></li> 
+       <li><a href="/downloads.html">Downloads</a></li> 
+       <li><a href="/help.html">Help</a></li> 
+       <li><a href="/asf.html">@ASF</a></li> 
+      </ul> 
+     </section> 
+    </nav> 
+   </div> 
+  </div> 
+  <div class="row"> 
+   <div id="doc-content-left" class="large-9 medium-9 columns"> 
+    <div id="doc-content">
+     <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/introducing-apache-isis/common-use-cases/common-use-cases.adoc&quot;" style="float: right; font-size: small; padding: 6px;  "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+     <div class="admonitionblock note"> 
+      <table> 
+       <tbody>
+        <tr> 
+         <td class="icon"> <i class="fa icon-note" title="Note"></i> </td> 
+         <td class="content"> TODO </td> 
+        </tr> 
+       </tbody>
+      </table> 
+     </div> 
+    </div> 
+    <footer> 
+     <hr> 
+     <p class="small"> Copyright � 2010~2016 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0. <br> Apache, the Apache feather logo, Apache&nbsp;Isis, and the Apache&nbsp;Isis project logo are all trademarks of The&nbsp;Apache&nbsp;Software&nbsp;Foundation. </p> 
+    </footer> 
+   </div> 
+   <div id="doc-content-right" class="large-3 medium-3 xcolumns"> 
+    <div id="toc" class="toc2"> 
+     <div class="fallback-toc"> 
+     </div> 
+    </div> 
+   </div> 
+  </div> 
+  <script src="../../js/foundation/5.5.1/vendor/jquery.js"></script> 
+  <script src="../../js/foundation/5.5.1/foundation.min.js"></script> 
+  <link href="../../css/jquery.tocify/1.9.0/jquery.tocify.css" rel="stylesheet"> 
+  <script src="../../js/jqueryui/1.11.4/jquery-ui.min.js"></script> 
+  <script src="../../js/jquery.tocify/1.9.0/jquery.tocify.js"></script> 
+  <script type="text/javascript">
     $(function () {
         $("#toc").tocify({
             scrollTo: 50,
@@ -561,9 +499,8 @@ TODO
         });
         $(".fallback-toc").hide();
     });
-</script>
-
-<script type="text/javascript">
+</script> 
+  <script type="text/javascript">
 
   /****
 
@@ -673,9 +610,8 @@ TODO
 
     ***/
 
-</script>
-
-<script type="text/javascript">
+</script> 
+  <script type="text/javascript">
 
 $(document).ready(function(){
     if("Documentation" === "Common Use Cases") {
@@ -687,10 +623,8 @@ $(document).ready(function(){
 
 });
 
-</script>
-
-
-<script>
+</script> 
+  <script>
 
 $( document ).ready(function() {
 
@@ -781,7 +715,6 @@ $( document ).ready(function() {
 
 
 });
-</script>
-
-</body>
+</script>  
+ </body>
 </html>

http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/introducing-apache-isis/isis-in-pictures/isis-in-pictures.html
----------------------------------------------------------------------
diff --git a/content/introducing-apache-isis/isis-in-pictures/isis-in-pictures.html b/content/introducing-apache-isis/isis-in-pictures/isis-in-pictures.html
index 653b509..93d95e4 100644
--- a/content/introducing-apache-isis/isis-in-pictures/isis-in-pictures.html
+++ b/content/introducing-apache-isis/isis-in-pictures/isis-in-pictures.html
@@ -1,12 +1,10 @@
 <!doctype html>
 <html class="no-js" lang="en">
-<head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-
-    <title>Apache Isis in Pictures</title>
-
-    <!--
+ <head> 
+  <meta charset="utf-8"> 
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"> 
+  <title>Apache Isis in Pictures</title> 
+  <!--
         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
@@ -23,31 +21,21 @@
         KIND, either express or implied.  See the License for the
         specific language governing permissions and limitations
         under the License.
-    -->
-
-    <!-- No caching headers -->
-    <meta http-equiv="cache-control" content="no-cache" />
-    <meta http-equiv="pragma" content="no-cache" />
-    <meta http-equiv="expires" content="-1" />
-
-
-    <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
-    <link href="../../css/foundation/5.5.1/foundation.css" rel="stylesheet" />
-    <script src="../../js/foundation/5.5.1/vendor/modernizr.js"></script>
-    <link href="../../css/asciidoctor/colony.css" rel="stylesheet">
-    <link href="../../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-
-
-
-    <link href="../../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
-    <!--[if lt IE 9]>
+    --> 
+  <!-- No caching headers --> 
+  <meta http-equiv="cache-control" content="no-cache"> 
+  <meta http-equiv="pragma" content="no-cache"> 
+  <meta http-equiv="expires" content="-1"> 
+  <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line --> 
+  <link href="../../css/foundation/5.5.1/foundation.css" rel="stylesheet"> 
+  <script src="../../js/foundation/5.5.1/vendor/modernizr.js"></script> 
+  <link href="../../css/asciidoctor/colony.css" rel="stylesheet"> 
+  <link href="../../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet"> 
+  <link href="../../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet"> 
+  <!--[if lt IE 9]>
       <link href="../../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
-    <![endif]-->
-
-
-
-    <style type="text/css">
+    <![endif]--> 
+  <style type="text/css">
         pre code {
             background-color: inherit;
             border-style: none;
@@ -192,9 +180,8 @@ table.CodeRay td.code>pre{padding:0}
         color:#fff;
         font-size: 1.1em;
     }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         @media only screen and (min-width: 40.063em) {
           .top-bar {
             .contain-to-grid .top-bar {
@@ -205,9 +192,8 @@ table.CodeRay td.code>pre{padding:0}
         .row {
             max-width: 80rem;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .extended-quote,
         .extended-quote-first {
             margin-left: 40px;
@@ -231,9 +217,8 @@ table.CodeRay td.code>pre{padding:0}
             text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
         }
         
-    </style>
-
-    <style>
+    </style> 
+  <style>
         body {
           position: relative;
         }
@@ -255,6 +240,7 @@ table.CodeRay td.code>pre{padding:0}
 
         div#doc-content {
             margin-top: 30px;
+            padding-top: 30px;
         }
 
         div.documentation-page table.frame-all {
@@ -286,9 +272,8 @@ table.CodeRay td.code>pre{padding:0}
             min-height: 2000px;
         }
 
-    </style>
-
-    <style>
+    </style> 
+  <style>
 
         @media only screen and (min-width: 768px) {
           #toc.toc2 ul ul { margin-left: -10px; }
@@ -316,15 +301,13 @@ table.CodeRay td.code>pre{padding:0}
         body div#toc2 li.tocify-item.active a {
             color: red;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         footer {
             margin-top: 1000px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* overriding colony.css stylesheet */
         .literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
            /*padding: 1.25em 1.5625em 1.125em 1.5625em;*/
@@ -372,9 +355,8 @@ table.CodeRay td.code>pre{padding:0}
         .imageblock img {
             margin-bottom: 10px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* from http://ben.balter.com/2014/03/13/pages-anchor-links/ */
         .header-link {
           position: absolute;
@@ -395,9 +377,8 @@ table.CodeRay td.code>pre{padding:0}
         h6:hover .header-link {
           opacity: 1;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .top-bar
         {
             -webkit-transition-duration: .5s;
@@ -425,130 +406,87 @@ table.CodeRay td.code>pre{padding:0}
             -webkit-transition-property: -webkit-transform;
             transition-property: transform;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         #doc-content a.guide {
             color: white;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .tocify {
             margin-top: 80px;
         }
-    </style>
-
-
-</script>
-
-</head>
-<body>
-
-<<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
-    <div class="github-fork-ribbon">
-        <a href="https://github.com/apache/isis#fork-destination-box">Fork me on GitHub</a>
-    </div>
-</div>
-
-
-<div class="row">
-
-    <div class="fixed contain-to-grid header">
-        <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
-            <ul class="title-area">
-                <li class="name">
-                    <h1>
-                        <a href="/index.html">Apache Isis&trade;</a>
-                    </h1>
-                </li>
-                <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
-                <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
-            </ul>
-
-            <section class="top-bar-section">
-                <ul class="right">
-
-                    <li class="has-form">
-                       <FORM class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
-                        <div class="row collapse">
-                            <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
-                            <INPUT type="hidden" name="cof" value="FORID:0">
-                            <INPUT class="form-control" name="q" type="text" placeholder="Search">
-                        </div>
-                    </FORM>
-                     </li>
-
-                </ul>
-
-                <!-- Left Nav Section -->
-                <ul class="left">
-
-                    <li><a href="/documentation.html">Documentation</a></li>
-                    <li><a href="/downloads.html">Downloads</a></li>
-                    <li><a href="/help.html">Help</a></li>
-                    <li><a href="/asf.html">@ASF</a></li>
-
-                </ul>
-
-            </section>
-        </nav>
-    </div>
-</div>
-
-<div class="row">
-
-    <div id="doc-content-left" class="large-9 medium-9 columns">
-
-
-        <div id="doc-content">
-          <div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-TODO
-</td>
-</tr>
-</table>
-</div>
-        </div>
-
-        <footer>
-          <hr>
-          <p class="small">
-          Copyright &copy; 2010~2016 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0.
-          <br/>
-          Apache, the Apache feather logo, Apache&nbsp;Isis, and the Apache&nbsp;Isis project logo are all trademarks of The&nbsp;Apache&nbsp;Software&nbsp;Foundation.
-          </p>
-        </footer>
-
-    </div>
-
-    <div id="doc-content-right" class="large-3 medium-3 xcolumns">
-        <div id="toc" class="toc2">
-            <div class="fallback-toc">
-                
-            </div>
-        </div>
-    </div>
-
-</div>
-
-
-<script src="../../js/foundation/5.5.1/vendor/jquery.js"></script>
-<script src="../../js/foundation/5.5.1/foundation.min.js"></script>
-
-
-<link href="../../css/jquery.tocify/1.9.0/jquery.tocify.css" rel="stylesheet">
-<script src="../../js/jqueryui/1.11.4/jquery-ui.min.js"></script>
-<script src="../../js/jquery.tocify/1.9.0/jquery.tocify.js"></script>
-
-
-
-<script type="text/javascript">
+    </style> 
+  <style>
+        .tocify {
+            margin-top: 80px;
+        }
+    </style>  
+ </head> 
+ <body> 
+  <div class="row"> 
+   <div class="fixed contain-to-grid header"> 
+    <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem"> 
+     <ul class="title-area"> 
+      <li class="name"> <h1> <a href="/index.html">Apache Isis\u2122</a> </h1> </li> 
+      <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone --> 
+      <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li> 
+     </ul> 
+     <section class="top-bar-section"> 
+      <ul class="right"> 
+       <li class="has-form"> 
+        <form class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse"> 
+         <div class="row collapse"> 
+          <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya"> 
+          <input type="hidden" name="cof" value="FORID:0"> 
+          <input class="form-control" name="q" type="text" placeholder="Search"> 
+         </div> 
+        </form> </li> 
+      </ul> 
+      <!-- Left Nav Section --> 
+      <ul class="left"> 
+       <li><a href="/documentation.html">Documentation</a></li> 
+       <li><a href="/downloads.html">Downloads</a></li> 
+       <li><a href="/help.html">Help</a></li> 
+       <li><a href="/asf.html">@ASF</a></li> 
+      </ul> 
+     </section> 
+    </nav> 
+   </div> 
+  </div> 
+  <div class="row"> 
+   <div id="doc-content-left" class="large-9 medium-9 columns"> 
+    <div id="doc-content">
+     <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/introducing-apache-isis/isis-in-pictures/isis-in-pictures.adoc&quot;" style="float: right; font-size: small; padding: 6px;  "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+     <div class="admonitionblock note"> 
+      <table> 
+       <tbody>
+        <tr> 
+         <td class="icon"> <i class="fa icon-note" title="Note"></i> </td> 
+         <td class="content"> TODO </td> 
+        </tr> 
+       </tbody>
+      </table> 
+     </div> 
+    </div> 
+    <footer> 
+     <hr> 
+     <p class="small"> Copyright � 2010~2016 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0. <br> Apache, the Apache feather logo, Apache&nbsp;Isis, and the Apache&nbsp;Isis project logo are all trademarks of The&nbsp;Apache&nbsp;Software&nbsp;Foundation. </p> 
+    </footer> 
+   </div> 
+   <div id="doc-content-right" class="large-3 medium-3 xcolumns"> 
+    <div id="toc" class="toc2"> 
+     <div class="fallback-toc"> 
+     </div> 
+    </div> 
+   </div> 
+  </div> 
+  <script src="../../js/foundation/5.5.1/vendor/jquery.js"></script> 
+  <script src="../../js/foundation/5.5.1/foundation.min.js"></script> 
+  <link href="../../css/jquery.tocify/1.9.0/jquery.tocify.css" rel="stylesheet"> 
+  <script src="../../js/jqueryui/1.11.4/jquery-ui.min.js"></script> 
+  <script src="../../js/jquery.tocify/1.9.0/jquery.tocify.js"></script> 
+  <script type="text/javascript">
     $(function () {
         $("#toc").tocify({
             scrollTo: 50,
@@ -561,9 +499,8 @@ TODO
         });
         $(".fallback-toc").hide();
     });
-</script>
-
-<script type="text/javascript">
+</script> 
+  <script type="text/javascript">
 
   /****
 
@@ -673,9 +610,8 @@ TODO
 
     ***/
 
-</script>
-
-<script type="text/javascript">
+</script> 
+  <script type="text/javascript">
 
 $(document).ready(function(){
     if("Documentation" === "Apache Isis in Pictures") {
@@ -687,10 +623,8 @@ $(document).ready(function(){
 
 });
 
-</script>
-
-
-<script>
+</script> 
+  <script>
 
 $( document ).ready(function() {
 
@@ -781,7 +715,6 @@ $( document ).ready(function() {
 
 
 });
-</script>
-
-</body>
+</script>  
+ </body>
 </html>


[43/44] isis-site git commit: ISIS-1594: provide an 'edit' button

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/common-use-cases.html
----------------------------------------------------------------------
diff --git a/content/common-use-cases.html b/content/common-use-cases.html
index aa29d3f..e35d7ca 100644
--- a/content/common-use-cases.html
+++ b/content/common-use-cases.html
@@ -1,12 +1,10 @@
 <!doctype html>
 <html class="no-js" lang="en">
-<head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-
-    <title>Common Use Cases</title>
-
-    <!--
+ <head> 
+  <meta charset="utf-8"> 
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"> 
+  <title>Common Use Cases</title> 
+  <!--
         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
@@ -23,31 +21,21 @@
         KIND, either express or implied.  See the License for the
         specific language governing permissions and limitations
         under the License.
-    -->
-
-    <!-- No caching headers -->
-    <meta http-equiv="cache-control" content="no-cache" />
-    <meta http-equiv="pragma" content="no-cache" />
-    <meta http-equiv="expires" content="-1" />
-
-
-    <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
-    <link href="./css/foundation/5.5.1/foundation.css" rel="stylesheet" />
-    <script src="./js/foundation/5.5.1/vendor/modernizr.js"></script>
-    <link href="./css/asciidoctor/colony.css" rel="stylesheet">
-    <link href="./css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-
-
-
-    <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
-    <!--[if lt IE 9]>
+    --> 
+  <!-- No caching headers --> 
+  <meta http-equiv="cache-control" content="no-cache"> 
+  <meta http-equiv="pragma" content="no-cache"> 
+  <meta http-equiv="expires" content="-1"> 
+  <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line --> 
+  <link href="./css/foundation/5.5.1/foundation.css" rel="stylesheet"> 
+  <script src="./js/foundation/5.5.1/vendor/modernizr.js"></script> 
+  <link href="./css/asciidoctor/colony.css" rel="stylesheet"> 
+  <link href="./css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet"> 
+  <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet"> 
+  <!--[if lt IE 9]>
       <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
-    <![endif]-->
-
-
-
-    <style type="text/css">
+    <![endif]--> 
+  <style type="text/css">
         pre code {
             background-color: inherit;
             border-style: none;
@@ -192,9 +180,8 @@ table.CodeRay td.code>pre{padding:0}
         color:#fff;
         font-size: 1.1em;
     }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         @media only screen and (min-width: 40.063em) {
           .top-bar {
             .contain-to-grid .top-bar {
@@ -205,9 +192,8 @@ table.CodeRay td.code>pre{padding:0}
         .row {
             max-width: 80rem;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .extended-quote,
         .extended-quote-first {
             margin-left: 40px;
@@ -231,9 +217,8 @@ table.CodeRay td.code>pre{padding:0}
             text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
         }
         
-    </style>
-
-    <style>
+    </style> 
+  <style>
         body {
           position: relative;
         }
@@ -255,6 +240,7 @@ table.CodeRay td.code>pre{padding:0}
 
         div#doc-content {
             margin-top: 30px;
+            padding-top: 30px;
         }
 
         div.documentation-page table.frame-all {
@@ -286,9 +272,8 @@ table.CodeRay td.code>pre{padding:0}
             min-height: 2000px;
         }
 
-    </style>
-
-    <style>
+    </style> 
+  <style>
 
         @media only screen and (min-width: 768px) {
           #toc.toc2 ul ul { margin-left: -10px; }
@@ -316,15 +301,13 @@ table.CodeRay td.code>pre{padding:0}
         body div#toc2 li.tocify-item.active a {
             color: red;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         footer {
             margin-top: 1000px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* overriding colony.css stylesheet */
         .literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
            /*padding: 1.25em 1.5625em 1.125em 1.5625em;*/
@@ -372,9 +355,8 @@ table.CodeRay td.code>pre{padding:0}
         .imageblock img {
             margin-bottom: 10px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* from http://ben.balter.com/2014/03/13/pages-anchor-links/ */
         .header-link {
           position: absolute;
@@ -395,9 +377,8 @@ table.CodeRay td.code>pre{padding:0}
         h6:hover .header-link {
           opacity: 1;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .top-bar
         {
             -webkit-transition-duration: .5s;
@@ -425,209 +406,162 @@ table.CodeRay td.code>pre{padding:0}
             -webkit-transition-property: -webkit-transform;
             transition-property: transform;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         #doc-content a.guide {
             color: white;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
+        .tocify {
+            margin-top: 80px;
+        }
+    </style> 
+  <style>
         .tocify {
             margin-top: 80px;
         }
-    </style>
-
-
-</script>
-
-</head>
-<body>
-
-<<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
-    <div class="github-fork-ribbon">
-        <a href="https://github.com/apache/isis#fork-destination-box">Fork me on GitHub</a>
-    </div>
-</div>
-
-
-<div class="row">
-
-    <div class="fixed contain-to-grid header">
-        <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
-            <ul class="title-area">
-                <li class="name">
-                    <h1>
-                        <a href="/index.html">Apache Isis&trade;</a>
-                    </h1>
-                </li>
-                <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
-                <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
-            </ul>
-
-            <section class="top-bar-section">
-                <ul class="right">
-
-                    <li class="has-form">
-                       <FORM class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
-                        <div class="row collapse">
-                            <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
-                            <INPUT type="hidden" name="cof" value="FORID:0">
-                            <INPUT class="form-control" name="q" type="text" placeholder="Search">
-                        </div>
-                    </FORM>
-                     </li>
-
-                </ul>
-
-                <!-- Left Nav Section -->
-                <ul class="left">
-
-                    <li><a href="/documentation.html">Documentation</a></li>
-                    <li><a href="/downloads.html">Downloads</a></li>
-                    <li><a href="/help.html">Help</a></li>
-                    <li><a href="/asf.html">@ASF</a></li>
-
-                </ul>
-
-            </section>
-        </nav>
-    </div>
-</div>
-
-<div class="row">
-
-    <div id="doc-content-left" class="large-9 medium-9 columns">
-
-
-        <div id="doc-content">
-          <div id="preamble">
-<div class="sectionbody">
-<div class="paragraph">
-<p><br/><br/></p>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_prototyping">Prototyping</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Apache Isis is great for rapid prototyping, because all you need to write in order to get an application up-and-running is the domain model objects.</p>
-</div>
-<div class="paragraph">
-<p>By focussing just on the domain, you&#8217;ll also find that you start to develop a ubiquitous language - a set of terms and concepts that the entire team (business and technologists alike) have a shared understanding.</p>
-</div>
-<div class="paragraph">
-<p>Once you&#8217;ve sketched out your domain model, you can then either start-over using your preferred framework, or you might choose to take the domain model forward into more formal specification and testing.</p>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_deploy_as_an_human_usable_webapp">Deploy as an human-usable webapp</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>One of the original motivations for Apache Isis itself was to be able automatically generate a user interface for a domain object model.</p>
-</div>
-<div class="paragraph">
-<p>Apache Isis' has a pluggable architecture allowing different user interface technologies. The principal implementation (as configured by the <a href="./simple-archetype.html">simple archetype</a>) is the <a href="guides/ugvw.html#">Wicket viewer</a>. This provides an appealing default user interface, with the ability to customize the user interface by writing new <a href="http://wicket.apache.org">Apache Wicket</a> components. Some third-party components can be found in the (non-ASF) <a href="http://isisaddons.org">Isis Addons</a> (non-ASF) project, integrating the Wicket viewer with <a href="https://github.com/isisaddons/isis-wicket-gmap3">google maps</a>, <a href="https://github.com/isisaddons/isis-wicket-fullcalendar2">a full calendar</a> and a <a href="https://github.com/isisaddons/isis-wicket-excel">export to Excel</a> component.</p>
-</div>
-<div class="paragraph">
-<p>Deploying on Apache Isis means that the framework also manages object persistence. Again this is pluggable, but the principal implementation is the JDO/DataNucleus objectstore. Because JDO supports both SQL and NoSQL databases, you can then deploy on a variety of platforms, including the <a href="https://developers.google.com/appengine/">Google App Engine (GAE)</a> and <a href="http://neo4j.com/">Neo4J</a>.</p>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_deploy_as_a_restful_web_service">Deploy as a RESTful web service</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>REST (Representation State Transfer) is an architectural style for building highly scalable distributed systems, using the same principles as the World Wide Web. Many commercial web APIs (twitter, facebook, Amazon) are implemented as either pure REST APIs or some approximation therein.</p>
-</div>
-<div class="paragraph">
-<p>The <a href="http://restfulobjects.org">Restful Objects specification</a> defines a means by a domain object model can be exposed as RESTful resources using JSON representations over HTTP. Apache Isis' <a href="guides/ugvro.html#">RestfulObjects viewer</a> is an implementation of that spec, making any Apache Isis domain object automatically available via REST.</p>
-</div>
-<div class="paragraph">
-<p>There are two main use cases for deploying Apache Isis as a RESTful web service are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>to allow a custom UI to be built against the RESTful API</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>For example, using Javascript/JQuery, or an RIA technology such as Flex, JavaFX, Silverlight</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>to enable integration between systems</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>REST is designed to be machine-readable, and so is an excellent choice for synchronous data interchange scenarios.</p>
-</div>
-<div class="paragraph">
-<p>As for the auto-generated webapps, the framework manages object persistence, for example using the JDO/DataNucleus objectstore. It is perfectly possible to deploy the RESTful API alongside an auto-generated webapp; both work from the same domain object model.</p>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_deploy_on_your_own_platform">Deploy on your own platform</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>The programming model defined by Apache Isis deliberately minimizes the dependencies on the rest of the framework. In fact, the only hard dependency that the domain model classes have on Apache Isis is through the <code>org.apache.isis.applib</code> classes, mostly to pick up annotations such as <code>@Disabled</code>. The idea is to make it easy to be able to write take a domain object prototyped and/or tested using Apache Isis, but to deploy on some other framework&#8217;s runtime.</p>
-</div>
-<div class="paragraph">
-<p>If you are interested in taking this approach, note that there is one important interface that must be implemented by your own framework, namely <code>DomainObjectContainer</code>. This interface represents the one-and-only "touchpoint" between the domain objects and the runtime. If you inspect the methods then you&#8217;ll see it covers such concerns as persistence, and of raising warnings or errors.</p>
-</div>
-<div class="paragraph">
-<p>Apache Isis' own runtime injects an (implementation of this) interface into each and every domain object. You will likely need to do something similar within your own framework, (or come up with an equivalent mechanism, eg Service Locator pattern).</p>
-</div>
-</div>
-</div>
-        </div>
-
-        <footer>
-          <hr>
-          <p class="small">
-          Copyright &copy; 2010~2016 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0.
-          <br/>
-          Apache, the Apache feather logo, Apache&nbsp;Isis, and the Apache&nbsp;Isis project logo are all trademarks of The&nbsp;Apache&nbsp;Software&nbsp;Foundation.
-          </p>
-        </footer>
-
-    </div>
-
-    <div id="doc-content-right" class="large-3 medium-3 xcolumns">
-        <div id="toc" class="toc2">
-            <div class="fallback-toc">
-                <ul class="sectlevel1">
-<li><a href="#_prototyping">Prototyping</a></li>
-<li><a href="#_deploy_as_an_human_usable_webapp">Deploy as an human-usable webapp</a></li>
-<li><a href="#_deploy_as_a_restful_web_service">Deploy as a RESTful web service</a></li>
-<li><a href="#_deploy_on_your_own_platform">Deploy on your own platform</a></li>
-</ul>
-            </div>
-        </div>
-    </div>
-
-</div>
-
-
-<script src="./js/foundation/5.5.1/vendor/jquery.js"></script>
-<script src="./js/foundation/5.5.1/foundation.min.js"></script>
-
-
-<link href="./css/jquery.tocify/1.9.0/jquery.tocify.css" rel="stylesheet">
-<script src="./js/jqueryui/1.11.4/jquery-ui.min.js"></script>
-<script src="./js/jquery.tocify/1.9.0/jquery.tocify.js"></script>
-
-
-
-<script type="text/javascript">
+    </style>  
+ </head> 
+ <body> 
+  <div class="row"> 
+   <div class="fixed contain-to-grid header"> 
+    <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem"> 
+     <ul class="title-area"> 
+      <li class="name"> <h1> <a href="/index.html">Apache Isis\u2122</a> </h1> </li> 
+      <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone --> 
+      <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li> 
+     </ul> 
+     <section class="top-bar-section"> 
+      <ul class="right"> 
+       <li class="has-form"> 
+        <form class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse"> 
+         <div class="row collapse"> 
+          <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya"> 
+          <input type="hidden" name="cof" value="FORID:0"> 
+          <input class="form-control" name="q" type="text" placeholder="Search"> 
+         </div> 
+        </form> </li> 
+      </ul> 
+      <!-- Left Nav Section --> 
+      <ul class="left"> 
+       <li><a href="/documentation.html">Documentation</a></li> 
+       <li><a href="/downloads.html">Downloads</a></li> 
+       <li><a href="/help.html">Help</a></li> 
+       <li><a href="/asf.html">@ASF</a></li> 
+      </ul> 
+     </section> 
+    </nav> 
+   </div> 
+  </div> 
+  <div class="row"> 
+   <div id="doc-content-left" class="large-9 medium-9 columns"> 
+    <div id="doc-content">
+     <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/common-use-cases.adoc&quot;" style="float: right; font-size: small; padding: 6px;  "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+     <div class="sect1"> 
+      <h2 id="_prototyping">Prototyping</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_prototyping.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>Apache Isis is great for rapid prototyping, because all you need to write in order to get an application up-and-running is the domain model objects.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>By focussing just on the domain, you\u2019ll also find that you start to develop a ubiquitous language - a set of terms and concepts that the entire team (business and technologists alike) have a shared understanding.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>Once you\u2019ve sketched out your domain model, you can then either start-over using your preferred framework, or you might choose to take the domain model forward into more formal specification and testing.</p> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_deploy_as_an_human_usable_webapp">Deploy as an human-usable webapp</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_deploy_as_an_human_usable_webapp.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>One of the original motivations for Apache Isis itself was to be able automatically generate a user interface for a domain object model.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>Apache Isis' has a pluggable architecture allowing different user interface technologies. The principal implementation (as configured by the <a href="./simple-archetype.html">simple archetype</a>) is the <a href="guides/ugvw.html#">Wicket viewer</a>. This provides an appealing default user interface, with the ability to customize the user interface by writing new <a href="http://wicket.apache.org">Apache Wicket</a> components. Some third-party components can be found in the (non-ASF) <a href="http://isisaddons.org">Isis Addons</a> (non-ASF) project, integrating the Wicket viewer with <a href="https://github.com/isisaddons/isis-wicket-gmap3">google maps</a>, <a href="https://github.com/isisaddons/isis-wicket-fullcalendar2">a full calendar</a> and a <a href="https://github.com/isisaddons/isis-wicket-excel">export to Excel</a> component.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>Deploying on Apache Isis means that the framework also manages object persistence. Again this is pluggable, but the principal implementation is the JDO/DataNucleus objectstore. Because JDO supports both SQL and NoSQL databases, you can then deploy on a variety of platforms, including the <a href="https://developers.google.com/appengine/">Google App Engine (GAE)</a> and <a href="http://neo4j.com/">Neo4J</a>.</p> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_deploy_as_a_restful_web_service">Deploy as a RESTful web service</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_deploy_as_a_restful_web_service.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>REST (Representation State Transfer) is an architectural style for building highly scalable distributed systems, using the same principles as the World Wide Web. Many commercial web APIs (twitter, facebook, Amazon) are implemented as either pure REST APIs or some approximation therein.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>The <a href="http://restfulobjects.org">Restful Objects specification</a> defines a means by a domain object model can be exposed as RESTful resources using JSON representations over HTTP. Apache Isis' <a href="guides/ugvro.html#">RestfulObjects viewer</a> is an implementation of that spec, making any Apache Isis domain object automatically available via REST.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>There are two main use cases for deploying Apache Isis as a RESTful web service are:</p> 
+       </div> 
+       <div class="ulist"> 
+        <ul> 
+         <li> <p>to allow a custom UI to be built against the RESTful API</p> </li> 
+        </ul> 
+       </div> 
+       <div class="paragraph"> 
+        <p>For example, using Javascript/JQuery, or an RIA technology such as Flex, JavaFX, Silverlight</p> 
+       </div> 
+       <div class="ulist"> 
+        <ul> 
+         <li> <p>to enable integration between systems</p> </li> 
+        </ul> 
+       </div> 
+       <div class="paragraph"> 
+        <p>REST is designed to be machine-readable, and so is an excellent choice for synchronous data interchange scenarios.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>As for the auto-generated webapps, the framework manages object persistence, for example using the JDO/DataNucleus objectstore. It is perfectly possible to deploy the RESTful API alongside an auto-generated webapp; both work from the same domain object model.</p> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_deploy_on_your_own_platform">Deploy on your own platform</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_deploy_on_your_own_platform.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>The programming model defined by Apache Isis deliberately minimizes the dependencies on the rest of the framework. In fact, the only hard dependency that the domain model classes have on Apache Isis is through the <code>org.apache.isis.applib</code> classes, mostly to pick up annotations such as <code>@Disabled</code>. The idea is to make it easy to be able to write take a domain object prototyped and/or tested using Apache Isis, but to deploy on some other framework\u2019s runtime.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>If you are interested in taking this approach, note that there is one important interface that must be implemented by your own framework, namely <code>DomainObjectContainer</code>. This interface represents the one-and-only "touchpoint" between the domain objects and the runtime. If you inspect the methods then you\u2019ll see it covers such concerns as persistence, and of raising warnings or errors.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>Apache Isis' own runtime injects an (implementation of this) interface into each and every domain object. You will likely need to do something similar within your own framework, (or come up with an equivalent mechanism, eg Service Locator pattern).</p> 
+       </div> 
+      </div> 
+     </div> 
+    </div> 
+    <footer> 
+     <hr> 
+     <p class="small"> Copyright � 2010~2016 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0. <br> Apache, the Apache feather logo, Apache&nbsp;Isis, and the Apache&nbsp;Isis project logo are all trademarks of The&nbsp;Apache&nbsp;Software&nbsp;Foundation. </p> 
+    </footer> 
+   </div> 
+   <div id="doc-content-right" class="large-3 medium-3 xcolumns"> 
+    <div id="toc" class="toc2"> 
+     <div class="fallback-toc"> 
+      <ul class="sectlevel1"> 
+       <li><a href="#_prototyping">Prototyping</a></li> 
+       <li><a href="#_deploy_as_an_human_usable_webapp">Deploy as an human-usable webapp</a></li> 
+       <li><a href="#_deploy_as_a_restful_web_service">Deploy as a RESTful web service</a></li> 
+       <li><a href="#_deploy_on_your_own_platform">Deploy on your own platform</a></li> 
+      </ul> 
+     </div> 
+    </div> 
+   </div> 
+  </div> 
+  <script src="./js/foundation/5.5.1/vendor/jquery.js"></script> 
+  <script src="./js/foundation/5.5.1/foundation.min.js"></script> 
+  <link href="./css/jquery.tocify/1.9.0/jquery.tocify.css" rel="stylesheet"> 
+  <script src="./js/jqueryui/1.11.4/jquery-ui.min.js"></script> 
+  <script src="./js/jquery.tocify/1.9.0/jquery.tocify.js"></script> 
+  <script type="text/javascript">
     $(function () {
         $("#toc").tocify({
             scrollTo: 50,
@@ -640,9 +574,8 @@ table.CodeRay td.code>pre{padding:0}
         });
         $(".fallback-toc").hide();
     });
-</script>
-
-<script type="text/javascript">
+</script> 
+  <script type="text/javascript">
 
   /****
 
@@ -752,9 +685,8 @@ table.CodeRay td.code>pre{padding:0}
 
     ***/
 
-</script>
-
-<script type="text/javascript">
+</script> 
+  <script type="text/javascript">
 
 $(document).ready(function(){
     if("Documentation" === "Common Use Cases") {
@@ -766,10 +698,8 @@ $(document).ready(function(){
 
 });
 
-</script>
-
-
-<script>
+</script> 
+  <script>
 
 $( document ).ready(function() {
 
@@ -860,7 +790,6 @@ $( document ).ready(function() {
 
 
 });
-</script>
-
-</body>
+</script>  
+ </body>
 </html>

http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/documentation.html
----------------------------------------------------------------------
diff --git a/content/documentation.html b/content/documentation.html
index 4441a84..8703bda 100644
--- a/content/documentation.html
+++ b/content/documentation.html
@@ -1,12 +1,10 @@
 <!doctype html>
 <html class="no-js" lang="en">
-<head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-
-    <title>Documentation</title>
-
-    <!--
+ <head> 
+  <meta charset="utf-8"> 
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"> 
+  <title>Documentation</title> 
+  <!--
         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
@@ -23,31 +21,21 @@
         KIND, either express or implied.  See the License for the
         specific language governing permissions and limitations
         under the License.
-    -->
-
-    <!-- No caching headers -->
-    <meta http-equiv="cache-control" content="no-cache" />
-    <meta http-equiv="pragma" content="no-cache" />
-    <meta http-equiv="expires" content="-1" />
-
-
-    <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
-    <link href="./css/foundation/5.5.1/foundation.css" rel="stylesheet" />
-    <script src="./js/foundation/5.5.1/vendor/modernizr.js"></script>
-    <link href="./css/asciidoctor/colony.css" rel="stylesheet">
-    <link href="./css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-
-
-
-    <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
-    <!--[if lt IE 9]>
+    --> 
+  <!-- No caching headers --> 
+  <meta http-equiv="cache-control" content="no-cache"> 
+  <meta http-equiv="pragma" content="no-cache"> 
+  <meta http-equiv="expires" content="-1"> 
+  <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line --> 
+  <link href="./css/foundation/5.5.1/foundation.css" rel="stylesheet"> 
+  <script src="./js/foundation/5.5.1/vendor/modernizr.js"></script> 
+  <link href="./css/asciidoctor/colony.css" rel="stylesheet"> 
+  <link href="./css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet"> 
+  <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet"> 
+  <!--[if lt IE 9]>
       <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
-    <![endif]-->
-
-
-
-    <style type="text/css">
+    <![endif]--> 
+  <style type="text/css">
         pre code {
             background-color: inherit;
             border-style: none;
@@ -192,9 +180,8 @@ table.CodeRay td.code>pre{padding:0}
         color:#fff;
         font-size: 1.1em;
     }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         @media only screen and (min-width: 40.063em) {
           .top-bar {
             .contain-to-grid .top-bar {
@@ -205,9 +192,8 @@ table.CodeRay td.code>pre{padding:0}
         .row {
             max-width: 80rem;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .extended-quote,
         .extended-quote-first {
             margin-left: 40px;
@@ -231,9 +217,8 @@ table.CodeRay td.code>pre{padding:0}
             text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
         }
         
-    </style>
-
-    <style>
+    </style> 
+  <style>
         body {
           position: relative;
         }
@@ -255,6 +240,7 @@ table.CodeRay td.code>pre{padding:0}
 
         div#doc-content {
             margin-top: 30px;
+            padding-top: 30px;
         }
 
         div.documentation-page table.frame-all {
@@ -286,9 +272,8 @@ table.CodeRay td.code>pre{padding:0}
             min-height: 2000px;
         }
 
-    </style>
-
-    <style>
+    </style> 
+  <style>
 
         @media only screen and (min-width: 768px) {
           #toc.toc2 ul ul { margin-left: -10px; }
@@ -316,15 +301,13 @@ table.CodeRay td.code>pre{padding:0}
         body div#toc2 li.tocify-item.active a {
             color: red;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         footer {
             margin-top: 1000px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* overriding colony.css stylesheet */
         .literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
            /*padding: 1.25em 1.5625em 1.125em 1.5625em;*/
@@ -372,9 +355,8 @@ table.CodeRay td.code>pre{padding:0}
         .imageblock img {
             margin-bottom: 10px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* from http://ben.balter.com/2014/03/13/pages-anchor-links/ */
         .header-link {
           position: absolute;
@@ -395,9 +377,8 @@ table.CodeRay td.code>pre{padding:0}
         h6:hover .header-link {
           opacity: 1;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .top-bar
         {
             -webkit-transition-duration: .5s;
@@ -425,387 +406,292 @@ table.CodeRay td.code>pre{padding:0}
             -webkit-transition-property: -webkit-transform;
             transition-property: transform;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         #doc-content a.guide {
             color: white;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
+        .tocify {
+            margin-top: 80px;
+        }
+    </style> 
+  <style>
         .tocify {
             margin-top: 80px;
         }
-    </style>
-
-
-</script>
-
-</head>
-<body>
-
-<<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
-    <div class="github-fork-ribbon">
-        <a href="https://github.com/apache/isis#fork-destination-box">Fork me on GitHub</a>
-    </div>
-</div>
-
-
-<div class="row">
-
-    <div class="fixed contain-to-grid header">
-        <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
-            <ul class="title-area">
-                <li class="name">
-                    <h1>
-                        <a href="/index.html">Apache Isis&trade;</a>
-                    </h1>
-                </li>
-                <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
-                <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
-            </ul>
-
-            <section class="top-bar-section">
-                <ul class="right">
-
-                    <li class="has-form">
-                       <FORM class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
-                        <div class="row collapse">
-                            <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
-                            <INPUT type="hidden" name="cof" value="FORID:0">
-                            <INPUT class="form-control" name="q" type="text" placeholder="Search">
-                        </div>
-                    </FORM>
-                     </li>
-
-                </ul>
-
-                <!-- Left Nav Section -->
-                <ul class="left">
-
-                    <li><a href="/documentation.html">Documentation</a></li>
-                    <li><a href="/downloads.html">Downloads</a></li>
-                    <li><a href="/help.html">Help</a></li>
-                    <li><a href="/asf.html">@ASF</a></li>
-
-                </ul>
-
-            </section>
-        </nav>
-    </div>
-</div>
-
-<div class="row">
-
-    <div id="doc-content-left" class="large-9 medium-9 columns">
-
-
-        <div id="doc-content">
-          <div class="paragraph">
-<p><br/><br/><br/></p>
-</div>
-<div class="paragraph">
-<p><div class="extended-quote-first"><p>Perfection is finally attained not when there is no longer anything to add but when there is no longer anything to take away.
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><div class="extended-quote-attribution"><p>-- Antoine de Saint-Exupery
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><br/></p>
-</div>
-<div class="openblock documentation-page">
-<div class="content">
-<table class="tableblock frame-none grid-all spread">
-<colgroup>
-<col style="width: 33.3333%;">
-<col style="width: 33.3333%;">
-<col style="width: 33.3334%;">
-</colgroup>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><strong>What is Apache Isis?</strong></p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><strong><a href="./isis-in-pictures.html" target="_blank">What is Apache Isis?</a> &#8230;&#8203; in pictures</strong></p>
-</li>
-<li>
-<p><a href="./powered-by.html" target="_blank">Powered by Apache Isis</a></p>
-</li>
-<li>
-<p><a href="./how-isis-works.html" target="_blank">How Apache Isis Works</a> <span class="image"><a class="image" href="how-isis-works.html"><img src="images/tv_show-25.png" alt="tv show 25" width="25px"></a></span></p>
-</li>
-<li>
-<p><a href="./common-use-cases.html" target="_blank">Common Use Cases</a></p>
-</li>
-</ul>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><strong>Learning More</strong></p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="./screencasts.html" target="_blank">Screencasts</a> <span class="image"><a class="image" href="screencasts.html"><img src="images/tv_show-25.png" alt="tv show 25" width="25px"></a></span></p>
-</li>
-<li>
-<p><a href="./guides/tg.html" target="_blank">Tutorials</a></p>
-</li>
-<li>
-<p><a href="http://www.javadoc.io/doc/org.apache.isis.core/isis-core-applib/1.11.0" target="_blank">Javadoc (for Applib)</a> (not ASF)</p>
-</li>
-</ul>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><strong>Resources:</strong></p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><strong><a href="./cheat-sheet.html" target="_blank">Cheat Sheet</a></strong></p>
-</li>
-<li>
-<p><a href="./icons.html" target="_blank">Icons</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p><strong>3rd-party add-ons (not ASF)</strong></p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://www.isisaddons.org" target="_blank">Isis addons</a></p>
-</li>
-<li>
-<p><a href="http://catalog.incode.org" target="_blank">Incode Catalog</a></p>
-</li>
-</ul>
-</div></div></td>
-</tr>
-</tbody>
-</table>
-<table class="tableblock frame-all grid-all spread">
-<colgroup>
-<col style="width: 33.3333%;">
-<col style="width: 33.3333%;">
-<col style="width: 33.3334%;">
-</colgroup>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><strong>User Guides:</strong></p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><strong><a href="./guides/ugfun.html" target="_blank">Fundamentals</a></strong>  <span class="image"><a class="image" href="./guides/ugfun.pdf"><img src="images/PDF-50.png" alt="PDF 50" width="20px"></a></span></p>
-</li>
-<li>
-<p><a href="./guides/ugvw.html" target="_blank">Wicket Viewer</a>  <span class="image"><a class="image" href="./guides/ugvw.pdf"><img src="images/PDF-50.png" alt="PDF 50" width="20px"></a></span></p>
-</li>
-<li>
-<p><a href="./guides/ugvro.html" target="_blank">Restful Objects Viewer</a>  <span class="image"><a class="image" href="./guides/ugvro.pdf"><img src="images/PDF-50.png" alt="PDF 50" width="20px"></a></span></p>
-</li>
-<li>
-<p><a href="./guides/ugodn.html" target="_blank">DataNucleus Object Store</a>  <span class="image"><a class="image" href="./guides/ugvro.pdf"><img src="images/PDF-50.png" alt="PDF 50" width="20px"></a></span></p>
-</li>
-<li>
-<p><a href="./guides/ugsec.html" target="_blank">Security</a>  <span class="image"><a class="image" href="./guides/ugsec.pdf"><img src="images/PDF-50.png" alt="PDF 50" width="20px"></a></span></p>
-</li>
-<li>
-<p><strong><a href="./guides/ugtst.html" target="_blank">Testing</a></strong>  <span class="image"><a class="image" href="./guides/ugtst.pdf"><img src="images/PDF-50.png" alt="PDF 50" width="20px"></a></span></p>
-</li>
-<li>
-<p><a href="./guides/ugbtb.html" target="_blank">Beyond the Basics</a>  <span class="image"><a class="image" href="./guides/ugbtb.pdf"><img src="images/PDF-50.png" alt="PDF 50" width="20px"></a></span></p>
-</li>
-</ul>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><strong>Reference Guides:</strong></p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><strong><a href="./guides/rgant.html" target="_blank">Annotations</a></strong>  <span class="image"><a class="image" href="./guides/rgant.pdf"><img src="images/PDF-50.png" alt="PDF 50" width="20px"></a></span></p>
-</li>
-<li>
-<p><strong><a href="./guides/rgsvc.html" target="_blank">Domain Services</a></strong>  <span class="image"><a class="image" href="./guides/rgsvc.pdf"><img src="images/PDF-50.png" alt="PDF 50" width="20px"></a></span></p>
-</li>
-<li>
-<p><a href="./guides/rgcfg.html" target="_blank">Core Config&#8217;n Properties</a>  <span class="image"><a class="image" href="./guides/rgcfg.pdf"><img src="images/PDF-50.png" alt="PDF 50" width="20px"></a></span></p>
-</li>
-<li>
-<p><a href="./guides/rgcms.html" target="_blank">Classes, Methods and Schema</a>  <span class="image"><a class="image" href="./guides/rgcms.pdf"><img src="images/PDF-50.png" alt="PDF 50" width="20px"></a></span></p>
-</li>
-<li>
-<p><a href="./guides/rgmvn.html" target="_blank">Apache Isis Maven plugin</a>  <span class="image"><a class="image" href="./guides/rgmvn.pdf"><img src="images/PDF-50.png" alt="PDF 50" width="20px"></a></span></p>
-</li>
-<li>
-<p><a href="./guides/rgfis.html" target="_blank">Framework Internal Services</a>  <span class="image"><a class="image" href="./guides/fwsvc.pdf"><img src="images/PDF-50.png" alt="PDF 50" width="20px"></a></span></p>
-</li>
-</ul>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><strong>"Supporting" Guides:</strong></p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><strong><a href="./guides/dg.html" target="_blank">Developers' Guide</a></strong>  <span class="image"><a class="image" href="./guides/dg.pdf"><img src="images/PDF-50.png" alt="PDF 50" width="20px"></a></span></p>
-<div class="ulist">
-<ul>
-<li>
-<p>Setting up <a href="./guides/dg.html#_dg_ide_intellij" target="_blank">IntelliJ</a> or <a href="./guides/dg.html#_dg_ide_eclipse" target="_blank">Eclipse</a></p>
-</li>
-<li>
-<p><a href="./guides/dg.html#_dg_contributing" target="_blank">Contributing patches</a> (pull requests)</p>
-</li>
-</ul>
-</div>
-</li>
-<li>
-<p><a href="./guides/cgcom.html" target="_blank">Committers' Guide</a>  <span class="image"><a class="image" href="./guides/cgcom.pdf"><img src="images/PDF-50.png" alt="PDF 50" width="20px"></a></span></p>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="./guides/cgcom.html#_cgcom_cutting-a-release" target="_blank">Cutting a release</a></p>
-</li>
-<li>
-<p><a href="./guides/cgcom.html#_cgcom_verifying-releases" target="_blank">Verifying a release</a></p>
-</li>
-</ul>
-</div>
-</li>
-</ul>
-</div></div></td>
-</tr>
-</tbody>
-</table>
-<table class="tableblock frame-none grid-all spread">
-<colgroup>
-<col style="width: 33.3333%;">
-<col style="width: 33.3333%;">
-<col style="width: 33.3334%;">
-</colgroup>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><strong>Releases:</strong></p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="release-notes.html" target="_blank">Release Notes</a></p>
-</li>
-<li>
-<p><a href="migration-notes.html" target="_blank">Migration Notes</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p><strong>Get involved!</strong></p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Our <strong><a href="https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=87" target="_blank">Kanban board</a></strong> maps out the JIRA issues we are looking to tackle in the next few releases</p>
-</li>
-</ul>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><strong>Going Deeper:</strong></p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="./articles-and-presentations.html" target="_blank">Articles, Conferences, Podcasts</a></p>
-</li>
-<li>
-<p><a href="./books.html" target="_blank">Books</a></p>
-</li>
-<li>
-<p><a href="./resources/thesis/Pawson-Naked-Objects-thesis.pdf" target="_blank">Naked Objects PhD thesis</a> (Pawson)</p>
-</li>
-</ul>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><strong>Example Apps (not ASF):</strong></p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://github.com/estatio/estatio" target="_blank">Estatio</a></p>
-</li>
-<li>
-<p><a href="http://github.com/isisaddons/isis-app-todoapp" target="_blank">TodoApp</a></p>
-</li>
-<li>
-<p><a href="http://github.com/isisaddons/isis-app-kitchensink" target="_blank">Kitchensink</a> (<a href="http://mmyco.co.uk:8180/kitchensink/">online demo, v1.10.0</a>)</p>
-</li>
-<li>
-<p><a href="http://github.com/isisaddons/isis-app-neoapp" target="_blank">Neo4J Example</a></p>
-</li>
-<li>
-<p><a href="http://github.com/isisaddons/isis-app-quickstart" target="_blank">Quickstart</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>tools (not ASF):</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://github.com/isisaddons/isis-app-simpledsl" target="_blank">Isis DSL Example</a></p>
-</li>
-</ul>
-</div></div></td>
-</tr>
-</tbody>
-</table>
-</div>
-</div>
-        </div>
-
-        <footer>
-          <hr>
-          <p class="small">
-          Copyright &copy; 2010~2016 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0.
-          <br/>
-          Apache, the Apache feather logo, Apache&nbsp;Isis, and the Apache&nbsp;Isis project logo are all trademarks of The&nbsp;Apache&nbsp;Software&nbsp;Foundation.
-          </p>
-        </footer>
-
-    </div>
-
-    <div id="doc-content-right" class="large-3 medium-3 xcolumns">
-        <div id="toc" class="toc2">
-            <div class="fallback-toc">
-                
+    </style>  
+ </head> 
+ <body> 
+  <div class="row"> 
+   <div class="fixed contain-to-grid header"> 
+    <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem"> 
+     <ul class="title-area"> 
+      <li class="name"> <h1> <a href="/index.html">Apache Isis\u2122</a> </h1> </li> 
+      <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone --> 
+      <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li> 
+     </ul> 
+     <section class="top-bar-section"> 
+      <ul class="right"> 
+       <li class="has-form"> 
+        <form class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse"> 
+         <div class="row collapse"> 
+          <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya"> 
+          <input type="hidden" name="cof" value="FORID:0"> 
+          <input class="form-control" name="q" type="text" placeholder="Search"> 
+         </div> 
+        </form> </li> 
+      </ul> 
+      <!-- Left Nav Section --> 
+      <ul class="left"> 
+       <li><a href="/documentation.html">Documentation</a></li> 
+       <li><a href="/downloads.html">Downloads</a></li> 
+       <li><a href="/help.html">Help</a></li> 
+       <li><a href="/asf.html">@ASF</a></li> 
+      </ul> 
+     </section> 
+    </nav> 
+   </div> 
+  </div> 
+  <div class="row"> 
+   <div id="doc-content-left" class="large-9 medium-9 columns"> 
+    <div id="doc-content">
+     <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/documentation.adoc&quot;" style="float: right; font-size: small; padding: 6px;  "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+     <div class="paragraph"> 
+      <p></p>
+      <div class="extended-quote-first">
+       <p>Perfection is finally attained not when there is no longer anything to add but when there is no longer anything to take away. </p>
+      </div>
+      <p></p> 
+     </div> 
+     <div class="paragraph"> 
+      <p></p>
+      <div class="extended-quote-attribution">
+       <p>-- Antoine de Saint-Exupery </p>
+      </div>
+      <p></p> 
+     </div> 
+     <div class="paragraph"> 
+      <p><br></p> 
+     </div> 
+     <div class="openblock documentation-page"> 
+      <div class="content"> 
+       <table class="tableblock frame-none grid-all spread"> 
+        <colgroup> 
+         <col style="width: 33.3333%;"> 
+         <col style="width: 33.3333%;"> 
+         <col style="width: 33.3334%;"> 
+        </colgroup> 
+        <tbody> 
+         <tr> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="paragraph"> 
+             <p><strong>What is Apache Isis?</strong></p> 
+            </div> 
+            <div class="ulist"> 
+             <ul> 
+              <li> <p><strong><a href="./isis-in-pictures.html" target="_blank">What is Apache Isis?</a> \u2026\u200b in pictures</strong></p> </li> 
+              <li> <p><a href="./powered-by.html" target="_blank">Powered by Apache Isis</a></p> </li> 
+              <li> <p><a href="./how-isis-works.html" target="_blank">How Apache Isis Works</a> <span class="image"><a class="image" href="how-isis-works.html"><img src="images/tv_show-25.png" alt="tv show 25" width="25px"></a></span></p> </li> 
+              <li> <p><a href="./common-use-cases.html" target="_blank">Common Use Cases</a></p> </li> 
+             </ul> 
             </div>
-        </div>
-    </div>
-
-</div>
-
-
-<script src="./js/foundation/5.5.1/vendor/jquery.js"></script>
-<script src="./js/foundation/5.5.1/foundation.min.js"></script>
-
-
-<link href="./css/jquery.tocify/1.9.0/jquery.tocify.css" rel="stylesheet">
-<script src="./js/jqueryui/1.11.4/jquery-ui.min.js"></script>
-<script src="./js/jquery.tocify/1.9.0/jquery.tocify.js"></script>
-
-
-
-<script type="text/javascript">
+           </div></td> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="paragraph"> 
+             <p><strong>Learning More</strong></p> 
+            </div> 
+            <div class="ulist"> 
+             <ul> 
+              <li> <p><a href="./screencasts.html" target="_blank">Screencasts</a> <span class="image"><a class="image" href="screencasts.html"><img src="images/tv_show-25.png" alt="tv show 25" width="25px"></a></span></p> </li> 
+              <li> <p><a href="./guides/tg.html" target="_blank">Tutorials</a></p> </li> 
+              <li> <p><a href="http://www.javadoc.io/doc/org.apache.isis.core/isis-core-applib/1.11.0" target="_blank">Javadoc (for Applib)</a> (not ASF)</p> </li> 
+             </ul> 
+            </div>
+           </div></td> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="paragraph"> 
+             <p><strong>Resources:</strong></p> 
+            </div> 
+            <div class="ulist"> 
+             <ul> 
+              <li> <p><strong><a href="./cheat-sheet.html" target="_blank">Cheat Sheet</a></strong></p> </li> 
+              <li> <p><a href="./icons.html" target="_blank">Icons</a></p> </li> 
+             </ul> 
+            </div> 
+            <div class="paragraph"> 
+             <p><strong>3rd-party add-ons (not ASF)</strong></p> 
+            </div> 
+            <div class="ulist"> 
+             <ul> 
+              <li> <p><a href="http://www.isisaddons.org" target="_blank">Isis addons</a></p> </li> 
+              <li> <p><a href="http://catalog.incode.org" target="_blank">Incode Catalog</a></p> </li> 
+             </ul> 
+            </div>
+           </div></td> 
+         </tr> 
+        </tbody> 
+       </table> 
+       <table class="tableblock frame-all grid-all spread"> 
+        <colgroup> 
+         <col style="width: 33.3333%;"> 
+         <col style="width: 33.3333%;"> 
+         <col style="width: 33.3334%;"> 
+        </colgroup> 
+        <tbody> 
+         <tr> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="paragraph"> 
+             <p><strong>User Guides:</strong></p> 
+            </div> 
+            <div class="ulist"> 
+             <ul> 
+              <li> <p><strong><a href="./guides/ugfun.html" target="_blank">Fundamentals</a></strong> <span class="image"><a class="image" href="./guides/ugfun.pdf"><img src="images/PDF-50.png" alt="PDF 50" width="20px"></a></span></p> </li> 
+              <li> <p><a href="./guides/ugvw.html" target="_blank">Wicket Viewer</a> <span class="image"><a class="image" href="./guides/ugvw.pdf"><img src="images/PDF-50.png" alt="PDF 50" width="20px"></a></span></p> </li> 
+              <li> <p><a href="./guides/ugvro.html" target="_blank">Restful Objects Viewer</a> <span class="image"><a class="image" href="./guides/ugvro.pdf"><img src="images/PDF-50.png" alt="PDF 50" width="20px"></a></span></p> </li> 
+              <li> <p><a href="./guides/ugodn.html" target="_blank">DataNucleus Object Store</a> <span class="image"><a class="image" href="./guides/ugvro.pdf"><img src="images/PDF-50.png" alt="PDF 50" width="20px"></a></span></p> </li> 
+              <li> <p><a href="./guides/ugsec.html" target="_blank">Security</a> <span class="image"><a class="image" href="./guides/ugsec.pdf"><img src="images/PDF-50.png" alt="PDF 50" width="20px"></a></span></p> </li> 
+              <li> <p><strong><a href="./guides/ugtst.html" target="_blank">Testing</a></strong> <span class="image"><a class="image" href="./guides/ugtst.pdf"><img src="images/PDF-50.png" alt="PDF 50" width="20px"></a></span></p> </li> 
+              <li> <p><a href="./guides/ugbtb.html" target="_blank">Beyond the Basics</a> <span class="image"><a class="image" href="./guides/ugbtb.pdf"><img src="images/PDF-50.png" alt="PDF 50" width="20px"></a></span></p> </li> 
+             </ul> 
+            </div>
+           </div></td> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="paragraph"> 
+             <p><strong>Reference Guides:</strong></p> 
+            </div> 
+            <div class="ulist"> 
+             <ul> 
+              <li> <p><strong><a href="./guides/rgant.html" target="_blank">Annotations</a></strong> <span class="image"><a class="image" href="./guides/rgant.pdf"><img src="images/PDF-50.png" alt="PDF 50" width="20px"></a></span></p> </li> 
+              <li> <p><strong><a href="./guides/rgsvc.html" target="_blank">Domain Services</a></strong> <span class="image"><a class="image" href="./guides/rgsvc.pdf"><img src="images/PDF-50.png" alt="PDF 50" width="20px"></a></span></p> </li> 
+              <li> <p><a href="./guides/rgcfg.html" target="_blank">Core Config\u2019n Properties</a> <span class="image"><a class="image" href="./guides/rgcfg.pdf"><img src="images/PDF-50.png" alt="PDF 50" width="20px"></a></span></p> </li> 
+              <li> <p><a href="./guides/rgcms.html" target="_blank">Classes, Methods and Schema</a> <span class="image"><a class="image" href="./guides/rgcms.pdf"><img src="images/PDF-50.png" alt="PDF 50" width="20px"></a></span></p> </li> 
+              <li> <p><a href="./guides/rgmvn.html" target="_blank">Apache Isis Maven plugin</a> <span class="image"><a class="image" href="./guides/rgmvn.pdf"><img src="images/PDF-50.png" alt="PDF 50" width="20px"></a></span></p> </li> 
+              <li> <p><a href="./guides/rgfis.html" target="_blank">Framework Internal Services</a> <span class="image"><a class="image" href="./guides/fwsvc.pdf"><img src="images/PDF-50.png" alt="PDF 50" width="20px"></a></span></p> </li> 
+             </ul> 
+            </div>
+           </div></td> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="paragraph"> 
+             <p><strong>"Supporting" Guides:</strong></p> 
+            </div> 
+            <div class="ulist"> 
+             <ul> 
+              <li> <p><strong><a href="./guides/dg.html" target="_blank">Developers' Guide</a></strong> <span class="image"><a class="image" href="./guides/dg.pdf"><img src="images/PDF-50.png" alt="PDF 50" width="20px"></a></span></p> 
+               <div class="ulist"> 
+                <ul> 
+                 <li> <p>Setting up <a href="./guides/dg.html#_dg_ide_intellij" target="_blank">IntelliJ</a> or <a href="./guides/dg.html#_dg_ide_eclipse" target="_blank">Eclipse</a></p> </li> 
+                 <li> <p><a href="./guides/dg.html#_dg_contributing" target="_blank">Contributing patches</a> (pull requests)</p> </li> 
+                </ul> 
+               </div> </li> 
+              <li> <p><a href="./guides/cgcom.html" target="_blank">Committers' Guide</a> <span class="image"><a class="image" href="./guides/cgcom.pdf"><img src="images/PDF-50.png" alt="PDF 50" width="20px"></a></span></p> 
+               <div class="ulist"> 
+                <ul> 
+                 <li> <p><a href="./guides/cgcom.html#_cgcom_cutting-a-release" target="_blank">Cutting a release</a></p> </li> 
+                 <li> <p><a href="./guides/cgcom.html#_cgcom_verifying-releases" target="_blank">Verifying a release</a></p> </li> 
+                </ul> 
+               </div> </li> 
+             </ul> 
+            </div>
+           </div></td> 
+         </tr> 
+        </tbody> 
+       </table> 
+       <table class="tableblock frame-none grid-all spread"> 
+        <colgroup> 
+         <col style="width: 33.3333%;"> 
+         <col style="width: 33.3333%;"> 
+         <col style="width: 33.3334%;"> 
+        </colgroup> 
+        <tbody> 
+         <tr> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="paragraph"> 
+             <p><strong>Releases:</strong></p> 
+            </div> 
+            <div class="ulist"> 
+             <ul> 
+              <li> <p><a href="release-notes.html" target="_blank">Release Notes</a></p> </li> 
+              <li> <p><a href="migration-notes.html" target="_blank">Migration Notes</a></p> </li> 
+             </ul> 
+            </div> 
+            <div class="paragraph"> 
+             <p><strong>Get involved!</strong></p> 
+            </div> 
+            <div class="ulist"> 
+             <ul> 
+              <li> <p>Our <strong><a href="https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=87" target="_blank">Kanban board</a></strong> maps out the JIRA issues we are looking to tackle in the next few releases</p> </li> 
+             </ul> 
+            </div>
+           </div></td> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="paragraph"> 
+             <p><strong>Going Deeper:</strong></p> 
+            </div> 
+            <div class="ulist"> 
+             <ul> 
+              <li> <p><a href="./articles-and-presentations.html" target="_blank">Articles, Conferences, Podcasts</a></p> </li> 
+              <li> <p><a href="./books.html" target="_blank">Books</a></p> </li> 
+              <li> <p><a href="./resources/thesis/Pawson-Naked-Objects-thesis.pdf" target="_blank">Naked Objects PhD thesis</a> (Pawson)</p> </li> 
+             </ul> 
+            </div>
+           </div></td> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="paragraph"> 
+             <p><strong>Example Apps (not ASF):</strong></p> 
+            </div> 
+            <div class="ulist"> 
+             <ul> 
+              <li> <p><a href="http://github.com/estatio/estatio" target="_blank">Estatio</a></p> </li> 
+              <li> <p><a href="http://github.com/isisaddons/isis-app-todoapp" target="_blank">TodoApp</a></p> </li> 
+              <li> <p><a href="http://github.com/isisaddons/isis-app-kitchensink" target="_blank">Kitchensink</a> (<a href="http://mmyco.co.uk:8180/kitchensink/">online demo, v1.10.0</a>)</p> </li> 
+              <li> <p><a href="http://github.com/isisaddons/isis-app-neoapp" target="_blank">Neo4J Example</a></p> </li> 
+              <li> <p><a href="http://github.com/isisaddons/isis-app-quickstart" target="_blank">Quickstart</a></p> </li> 
+             </ul> 
+            </div> 
+            <div class="paragraph"> 
+             <p>tools (not ASF):</p> 
+            </div> 
+            <div class="ulist"> 
+             <ul> 
+              <li> <p><a href="http://github.com/isisaddons/isis-app-simpledsl" target="_blank">Isis DSL Example</a></p> </li> 
+             </ul> 
+            </div>
+           </div></td> 
+         </tr> 
+        </tbody> 
+       </table> 
+      </div> 
+     </div> 
+    </div> 
+    <footer> 
+     <hr> 
+     <p class="small"> Copyright � 2010~2016 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0. <br> Apache, the Apache feather logo, Apache&nbsp;Isis, and the Apache&nbsp;Isis project logo are all trademarks of The&nbsp;Apache&nbsp;Software&nbsp;Foundation. </p> 
+    </footer> 
+   </div> 
+   <div id="doc-content-right" class="large-3 medium-3 xcolumns"> 
+    <div id="toc" class="toc2"> 
+     <div class="fallback-toc"> 
+     </div> 
+    </div> 
+   </div> 
+  </div> 
+  <script src="./js/foundation/5.5.1/vendor/jquery.js"></script> 
+  <script src="./js/foundation/5.5.1/foundation.min.js"></script> 
+  <link href="./css/jquery.tocify/1.9.0/jquery.tocify.css" rel="stylesheet"> 
+  <script src="./js/jqueryui/1.11.4/jquery-ui.min.js"></script> 
+  <script src="./js/jquery.tocify/1.9.0/jquery.tocify.js"></script> 
+  <script type="text/javascript">
     $(function () {
         $("#toc").tocify({
             scrollTo: 50,
@@ -818,9 +704,8 @@ table.CodeRay td.code>pre{padding:0}
         });
         $(".fallback-toc").hide();
     });
-</script>
-
-<script type="text/javascript">
+</script> 
+  <script type="text/javascript">
 
   /****
 
@@ -930,9 +815,8 @@ table.CodeRay td.code>pre{padding:0}
 
     ***/
 
-</script>
-
-<script type="text/javascript">
+</script> 
+  <script type="text/javascript">
 
 $(document).ready(function(){
     if("Documentation" === "Documentation") {
@@ -944,10 +828,8 @@ $(document).ready(function(){
 
 });
 
-</script>
-
-
-<script>
+</script> 
+  <script>
 
 $( document ).ready(function() {
 
@@ -1038,7 +920,6 @@ $( document ).ready(function() {
 
 
 });
-</script>
-
-</body>
+</script>  
+ </body>
 </html>

http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/downloadable-presentations.html
----------------------------------------------------------------------
diff --git a/content/downloadable-presentations.html b/content/downloadable-presentations.html
index e3289c6..9d64170 100644
--- a/content/downloadable-presentations.html
+++ b/content/downloadable-presentations.html
@@ -1,12 +1,10 @@
 <!doctype html>
 <html class="no-js" lang="en">
-<head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-
-    <title>Downloadable Presentations</title>
-
-    <!--
+ <head> 
+  <meta charset="utf-8"> 
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"> 
+  <title>Downloadable Presentations</title> 
+  <!--
         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
@@ -23,31 +21,21 @@
         KIND, either express or implied.  See the License for the
         specific language governing permissions and limitations
         under the License.
-    -->
-
-    <!-- No caching headers -->
-    <meta http-equiv="cache-control" content="no-cache" />
-    <meta http-equiv="pragma" content="no-cache" />
-    <meta http-equiv="expires" content="-1" />
-
-
-    <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
-    <link href="./css/foundation/5.5.1/foundation.css" rel="stylesheet" />
-    <script src="./js/foundation/5.5.1/vendor/modernizr.js"></script>
-    <link href="./css/asciidoctor/colony.css" rel="stylesheet">
-    <link href="./css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-
-
-
-    <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
-    <!--[if lt IE 9]>
+    --> 
+  <!-- No caching headers --> 
+  <meta http-equiv="cache-control" content="no-cache"> 
+  <meta http-equiv="pragma" content="no-cache"> 
+  <meta http-equiv="expires" content="-1"> 
+  <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line --> 
+  <link href="./css/foundation/5.5.1/foundation.css" rel="stylesheet"> 
+  <script src="./js/foundation/5.5.1/vendor/modernizr.js"></script> 
+  <link href="./css/asciidoctor/colony.css" rel="stylesheet"> 
+  <link href="./css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet"> 
+  <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet"> 
+  <!--[if lt IE 9]>
       <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
-    <![endif]-->
-
-
-
-    <style type="text/css">
+    <![endif]--> 
+  <style type="text/css">
         pre code {
             background-color: inherit;
             border-style: none;
@@ -192,9 +180,8 @@ table.CodeRay td.code>pre{padding:0}
         color:#fff;
         font-size: 1.1em;
     }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         @media only screen and (min-width: 40.063em) {
           .top-bar {
             .contain-to-grid .top-bar {
@@ -205,9 +192,8 @@ table.CodeRay td.code>pre{padding:0}
         .row {
             max-width: 80rem;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .extended-quote,
         .extended-quote-first {
             margin-left: 40px;
@@ -231,9 +217,8 @@ table.CodeRay td.code>pre{padding:0}
             text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
         }
         
-    </style>
-
-    <style>
+    </style> 
+  <style>
         body {
           position: relative;
         }
@@ -255,6 +240,7 @@ table.CodeRay td.code>pre{padding:0}
 
         div#doc-content {
             margin-top: 30px;
+            padding-top: 30px;
         }
 
         div.documentation-page table.frame-all {
@@ -286,9 +272,8 @@ table.CodeRay td.code>pre{padding:0}
             min-height: 2000px;
         }
 
-    </style>
-
-    <style>
+    </style> 
+  <style>
 
         @media only screen and (min-width: 768px) {
           #toc.toc2 ul ul { margin-left: -10px; }
@@ -316,15 +301,13 @@ table.CodeRay td.code>pre{padding:0}
         body div#toc2 li.tocify-item.active a {
             color: red;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         footer {
             margin-top: 1000px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* overriding colony.css stylesheet */
         .literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
            /*padding: 1.25em 1.5625em 1.125em 1.5625em;*/
@@ -372,9 +355,8 @@ table.CodeRay td.code>pre{padding:0}
         .imageblock img {
             margin-bottom: 10px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* from http://ben.balter.com/2014/03/13/pages-anchor-links/ */
         .header-link {
           position: absolute;
@@ -395,9 +377,8 @@ table.CodeRay td.code>pre{padding:0}
         h6:hover .header-link {
           opacity: 1;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .top-bar
         {
             -webkit-transition-duration: .5s;
@@ -425,148 +406,101 @@ table.CodeRay td.code>pre{padding:0}
             -webkit-transition-property: -webkit-transform;
             transition-property: transform;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         #doc-content a.guide {
             color: white;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
+        .tocify {
+            margin-top: 80px;
+        }
+    </style> 
+  <style>
         .tocify {
             margin-top: 80px;
         }
-    </style>
-
-
-</script>
-
-</head>
-<body>
-
-<<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
-    <div class="github-fork-ribbon">
-        <a href="https://github.com/apache/isis#fork-destination-box">Fork me on GitHub</a>
-    </div>
-</div>
-
-
-<div class="row">
-
-    <div class="fixed contain-to-grid header">
-        <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
-            <ul class="title-area">
-                <li class="name">
-                    <h1>
-                        <a href="/index.html">Apache Isis&trade;</a>
-                    </h1>
-                </li>
-                <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
-                <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
-            </ul>
-
-            <section class="top-bar-section">
-                <ul class="right">
-
-                    <li class="has-form">
-                       <FORM class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
-                        <div class="row collapse">
-                            <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
-                            <INPUT type="hidden" name="cof" value="FORID:0">
-                            <INPUT class="form-control" name="q" type="text" placeholder="Search">
-                        </div>
-                    </FORM>
-                     </li>
-
-                </ul>
-
-                <!-- Left Nav Section -->
-                <ul class="left">
-
-                    <li><a href="/documentation.html">Documentation</a></li>
-                    <li><a href="/downloads.html">Downloads</a></li>
-                    <li><a href="/help.html">Help</a></li>
-                    <li><a href="/asf.html">@ASF</a></li>
-
-                </ul>
-
-            </section>
-        </nav>
-    </div>
-</div>
-
-<div class="row">
-
-    <div id="doc-content-left" class="large-9 medium-9 columns">
-
-
-        <div id="doc-content">
-          <div class="paragraph">
-<p><br/><br/></p>
-</div>
-<div class="paragraph">
-<p>The following presentation, available in multiple formats, provides some background on Apache Isis:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Introduction to Apache Isis (<a href="resources/downloadable-presentations/IntroducingApacheIsis.pptx">pptx</a>, <a href="resources/downloadable-presentations/IntroducingApacheIsis.ppt">ppt</a>, <a href="resources/downloadable-presentations/IntroducingApacheIsis.odp">odp</a>, <a href="resources/downloadable-presentations/IntroducingApacheIsis-slides.pdf">pdf slides</a>, <a href="resources/downloadable-presentations/IntroducingApacheIsis-notes.pdf">pdf notes</a>)</p>
-</li>
-</ul>
-</div>
-<div class="admonitionblock warning">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-warning" title="Warning"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>Our apologies, this presentation is somewhat out-of-date&#8230;&#8203;</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>Feel free to use/adapt as you see fit.</p>
-</div>
-        </div>
-
-        <footer>
-          <hr>
-          <p class="small">
-          Copyright &copy; 2010~2016 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0.
-          <br/>
-          Apache, the Apache feather logo, Apache&nbsp;Isis, and the Apache&nbsp;Isis project logo are all trademarks of The&nbsp;Apache&nbsp;Software&nbsp;Foundation.
-          </p>
-        </footer>
-
-    </div>
-
-    <div id="doc-content-right" class="large-3 medium-3 xcolumns">
-        <div id="toc" class="toc2">
-            <div class="fallback-toc">
-                
-            </div>
-        </div>
-    </div>
-
-</div>
-
-
-<script src="./js/foundation/5.5.1/vendor/jquery.js"></script>
-<script src="./js/foundation/5.5.1/foundation.min.js"></script>
-
-
-<link href="./css/jquery.tocify/1.9.0/jquery.tocify.css" rel="stylesheet">
-<script src="./js/jqueryui/1.11.4/jquery-ui.min.js"></script>
-<script src="./js/jquery.tocify/1.9.0/jquery.tocify.js"></script>
-
-
-
-<script type="text/javascript">
+    </style>  
+ </head> 
+ <body> 
+  <div class="row"> 
+   <div class="fixed contain-to-grid header"> 
+    <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem"> 
+     <ul class="title-area"> 
+      <li class="name"> <h1> <a href="/index.html">Apache Isis\u2122</a> </h1> </li> 
+      <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone --> 
+      <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li> 
+     </ul> 
+     <section class="top-bar-section"> 
+      <ul class="right"> 
+       <li class="has-form"> 
+        <form class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse"> 
+         <div class="row collapse"> 
+          <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya"> 
+          <input type="hidden" name="cof" value="FORID:0"> 
+          <input class="form-control" name="q" type="text" placeholder="Search"> 
+         </div> 
+        </form> </li> 
+      </ul> 
+      <!-- Left Nav Section --> 
+      <ul class="left"> 
+       <li><a href="/documentation.html">Documentation</a></li> 
+       <li><a href="/downloads.html">Downloads</a></li> 
+       <li><a href="/help.html">Help</a></li> 
+       <li><a href="/asf.html">@ASF</a></li> 
+      </ul> 
+     </section> 
+    </nav> 
+   </div> 
+  </div> 
+  <div class="row"> 
+   <div id="doc-content-left" class="large-9 medium-9 columns"> 
+    <div id="doc-content">
+     <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/downloadable-presentations.adoc&quot;" style="float: right; font-size: small; padding: 6px;  "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+     <div class="paragraph"> 
+      <p>The following presentation, available in multiple formats, provides some background on Apache Isis:</p> 
+     </div> 
+     <div class="ulist"> 
+      <ul> 
+       <li> <p>Introduction to Apache Isis (<a href="resources/downloadable-presentations/IntroducingApacheIsis.pptx">pptx</a>, <a href="resources/downloadable-presentations/IntroducingApacheIsis.ppt">ppt</a>, <a href="resources/downloadable-presentations/IntroducingApacheIsis.odp">odp</a>, <a href="resources/downloadable-presentations/IntroducingApacheIsis-slides.pdf">pdf slides</a>, <a href="resources/downloadable-presentations/IntroducingApacheIsis-notes.pdf">pdf notes</a>)</p> </li> 
+      </ul> 
+     </div> 
+     <div class="admonitionblock warning"> 
+      <table> 
+       <tbody>
+        <tr> 
+         <td class="icon"> <i class="fa icon-warning" title="Warning"></i> </td> 
+         <td class="content"> 
+          <div class="paragraph"> 
+           <p>This presentation is somewhat out-of-date\u2026\u200b</p> 
+          </div> </td> 
+        </tr> 
+       </tbody>
+      </table> 
+     </div> 
+     <div class="paragraph"> 
+      <p>Feel free to use/adapt as you see fit.</p> 
+     </div> 
+    </div> 
+    <footer> 
+     <hr> 
+     <p class="small"> Copyright � 2010~2016 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0. <br> Apache, the Apache feather logo, Apache&nbsp;Isis, and the Apache&nbsp;Isis project logo are all trademarks of The&nbsp;Apache&nbsp;Software&nbsp;Foundation. </p> 
+    </footer> 
+   </div> 
+   <div id="doc-content-right" class="large-3 medium-3 xcolumns"> 
+    <div id="toc" class="toc2"> 
+     <div class="fallback-toc"> 
+     </div> 
+    </div> 
+   </div> 
+  </div> 
+  <script src="./js/foundation/5.5.1/vendor/jquery.js"></script> 
+  <script src="./js/foundation/5.5.1/foundation.min.js"></script> 
+  <link href="./css/jquery.tocify/1.9.0/jquery.tocify.css" rel="stylesheet"> 
+  <script src="./js/jqueryui/1.11.4/jquery-ui.min.js"></script> 
+  <script src="./js/jquery.tocify/1.9.0/jquery.tocify.js"></script> 
+  <script type="text/javascript">
     $(function () {
         $("#toc").tocify({
             scrollTo: 50,
@@ -579,9 +513,8 @@ table.CodeRay td.code>pre{padding:0}
         });
         $(".fallback-toc").hide();
     });
-</script>
-
-<script type="text/javascript">
+</script> 
+  <script type="text/javascript">
 
   /****
 
@@ -691,9 +624,8 @@ table.CodeRay td.code>pre{padding:0}
 
     ***/
 
-</script>
-
-<script type="text/javascript">
+</script> 
+  <script type="text/javascript">
 
 $(document).ready(function(){
     if("Documentation" === "Downloadable Presentations") {
@@ -705,10 +637,8 @@ $(document).ready(function(){
 
 });
 
-</script>
-
-
-<script>
+</script> 
+  <script>
 
 $( document ).ready(function() {
 
@@ -799,7 +729,6 @@ $( document ).ready(function() {
 
 
 });
-</script>
-
-</body>
+</script>  
+ </body>
 </html>


[25/44] isis-site git commit: ISIS-1594: provide an 'edit' button

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/guides/tg.html
----------------------------------------------------------------------
diff --git a/content/guides/tg.html b/content/guides/tg.html
index ec9a266..e3fbd90 100644
--- a/content/guides/tg.html
+++ b/content/guides/tg.html
@@ -1,12 +1,10 @@
 <!doctype html>
 <html class="no-js" lang="en">
-<head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-
-    <title>Tutorials</title>
-
-    <!--
+ <head> 
+  <meta charset="utf-8"> 
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"> 
+  <title>Tutorials</title> 
+  <!--
         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
@@ -23,31 +21,21 @@
         KIND, either express or implied.  See the License for the
         specific language governing permissions and limitations
         under the License.
-    -->
-
-    <!-- No caching headers -->
-    <meta http-equiv="cache-control" content="no-cache" />
-    <meta http-equiv="pragma" content="no-cache" />
-    <meta http-equiv="expires" content="-1" />
-
-
-    <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
-    <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet" />
-    <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script>
-    <link href="../css/asciidoctor/colony.css" rel="stylesheet">
-    <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-
-
-
-    <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
-    <!--[if lt IE 9]>
+    --> 
+  <!-- No caching headers --> 
+  <meta http-equiv="cache-control" content="no-cache"> 
+  <meta http-equiv="pragma" content="no-cache"> 
+  <meta http-equiv="expires" content="-1"> 
+  <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line --> 
+  <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet"> 
+  <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script> 
+  <link href="../css/asciidoctor/colony.css" rel="stylesheet"> 
+  <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet"> 
+  <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet"> 
+  <!--[if lt IE 9]>
       <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
-    <![endif]-->
-
-
-
-    <style type="text/css">
+    <![endif]--> 
+  <style type="text/css">
         pre code {
             background-color: inherit;
             border-style: none;
@@ -192,9 +180,8 @@ table.CodeRay td.code>pre{padding:0}
         color:#fff;
         font-size: 1.1em;
     }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         @media only screen and (min-width: 40.063em) {
           .top-bar {
             .contain-to-grid .top-bar {
@@ -205,9 +192,8 @@ table.CodeRay td.code>pre{padding:0}
         .row {
             max-width: 80rem;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .extended-quote,
         .extended-quote-first {
             margin-left: 40px;
@@ -231,9 +217,8 @@ table.CodeRay td.code>pre{padding:0}
             text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
         }
         
-    </style>
-
-    <style>
+    </style> 
+  <style>
         body {
           position: relative;
         }
@@ -255,6 +240,7 @@ table.CodeRay td.code>pre{padding:0}
 
         div#doc-content {
             margin-top: 30px;
+            padding-top: 30px;
         }
 
         div.documentation-page table.frame-all {
@@ -286,9 +272,8 @@ table.CodeRay td.code>pre{padding:0}
             min-height: 2000px;
         }
 
-    </style>
-
-    <style>
+    </style> 
+  <style>
 
         @media only screen and (min-width: 768px) {
           #toc.toc2 ul ul { margin-left: -10px; }
@@ -316,15 +301,13 @@ table.CodeRay td.code>pre{padding:0}
         body div#toc2 li.tocify-item.active a {
             color: red;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         footer {
             margin-top: 1000px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* overriding colony.css stylesheet */
         .literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
            /*padding: 1.25em 1.5625em 1.125em 1.5625em;*/
@@ -372,9 +355,8 @@ table.CodeRay td.code>pre{padding:0}
         .imageblock img {
             margin-bottom: 10px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* from http://ben.balter.com/2014/03/13/pages-anchor-links/ */
         .header-link {
           position: absolute;
@@ -395,9 +377,8 @@ table.CodeRay td.code>pre{padding:0}
         h6:hover .header-link {
           opacity: 1;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .top-bar
         {
             -webkit-transition-duration: .5s;
@@ -425,200 +406,150 @@ table.CodeRay td.code>pre{padding:0}
             -webkit-transition-property: -webkit-transform;
             transition-property: transform;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         #doc-content a.guide {
             color: white;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
+        .tocify {
+            margin-top: 80px;
+        }
+    </style> 
+  <style>
         .tocify {
             margin-top: 80px;
         }
-    </style>
-
-
-</script>
-
-</head>
-<body>
-
-<<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
-    <div class="github-fork-ribbon">
-        <a href="https://github.com/apache/isis#fork-destination-box">Fork me on GitHub</a>
-    </div>
-</div>
-
-
-<div class="row">
-
-    <div class="fixed contain-to-grid header">
-        <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
-            <ul class="title-area">
-                <li class="name">
-                    <h1>
-                        <a href="/index.html">Apache Isis&trade;</a>
-                    </h1>
-                </li>
-                <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
-                <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
-            </ul>
-
-            <section class="top-bar-section">
-                <ul class="right">
-
-                    <li class="has-form">
-                       <FORM class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
-                        <div class="row collapse">
-                            <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
-                            <INPUT type="hidden" name="cof" value="FORID:0">
-                            <INPUT class="form-control" name="q" type="text" placeholder="Search">
-                        </div>
-                    </FORM>
-                     </li>
-
-                </ul>
-
-                <!-- Left Nav Section -->
-                <ul class="left">
-
-                    <li><a href="/documentation.html">Documentation</a></li>
-                    <li><a href="/downloads.html">Downloads</a></li>
-                    <li><a href="/help.html">Help</a></li>
-                    <li><a href="/asf.html">@ASF</a></li>
-
-                </ul>
-
-            </section>
-        </nav>
-    </div>
-</div>
-
-<div class="row">
-
-    <div id="doc-content-left" class="large-9 medium-9 columns">
-
-
-        <div id="doc-content">
-          <div class="sect1">
-<h2 id="_tg">1. Tutorials</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>This page contains a couple of tutorials for you to follow.</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>the <a href="#_tg_tutorials_pet-clinic">"petclinic"</a> tutorial takes you step-by-step through building a simple application of just three classes.  There are example solutions in the github repo in case you get lost.</p>
-</li>
-<li>
-<p>an <a href="#_tg_tutorials_pet-clinic-extended">extended version</a> of the "petclinic" tutorial, (with the text hosted on github repo).</p>
-</li>
-<li>
-<p>the <a href="#_tg_tutorials_stop-scaffolding-start-coding">"stop scaffolding, start coding"</a> tutorial is taken from a conference workshop.  It has less hand-holding, but lists out the steps for you to follow.  It&#8217;s a good cookbook to follow when you&#8217;re readng to take things further.</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>Have fun!</p>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_tg_tutorials_pet-clinic">2. Pet Clinic</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>This is a step-by-step tutorial to build up a simple "petclinic" application, starting from the <a href="ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp archetype</a>.
-It was originally written by Jeroen van der Wal.</p>
-</div>
-<div class="paragraph">
-<p>It consists of just three domain classes (<a href="http://yuml.me/edit/3db2078c">http://yuml.me/3db2078c</a>):</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/tutorials/pet-clinic/domain-model.png"><img src="images/tutorials/pet-clinic/domain-model.png" alt="domain model"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>This supports the following use cases:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>register a <code>Pet</code></p>
-</li>
-<li>
-<p>register an <code>Owner</code></p>
-</li>
-<li>
-<p>maintain a <code>Pet</code>'s details</p>
-</li>
-<li>
-<p>check in a <code>Pet</code> to visit the clinic</p>
-</li>
-<li>
-<p>enter a <code>Diagnosis</code></p>
-</li>
-<li>
-<p>check out a <code>Pet</code> after visiting the clinic</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>Either follow along or check out the tags from the corresponding <a href="https://github.com/danhaywood/isis-app-petclinic">github repo</a>.</p>
-</div>
-<div class="sect2">
-<h3 id="_prerequisites">2.1. Prerequisites</h3>
-<div class="paragraph">
-<p>You&#8217;ll need:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Java 7 JDK</p>
-</li>
-<li>
-<p><a href="http://maven.apache.org/">Maven</a> 3.2.x</p>
-</li>
-<li>
-<p>an IDE, such as <a href="http://www.eclipse.org/">Eclipse</a> or <a href="https://www.jetbrains.com/idea/">IntelliJ IDEA</a>.</p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_run_the_archetype">2.2. Run the archetype</h3>
-<div class="paragraph">
-<p>Throughout this tutorial you can, if you wish, just checkout from the github repo wherever you see a "git checkout" note:</p>
-</div>
-<div class="admonitionblock tip">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-tip" title="Tip"></i>
-</td>
-<td class="content">
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">git checkout https://github.com/danhaywood/isis-app-petclinic/commit/249abe476797438d83faa12ff88365da2c362451</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Do note that the tutorial was originally developed against Apache Isis 1.8.0-SNAPSHOT; replace "1.8.0-SNAPSHOT" for the any version from 1.8.0 up to 1.13.1.
-(The structure of Apache Isis archetype changed in 1.13.2).</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>Run the simpleapp archetype to build an empty Isis application:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">mvn archetype:generate  \
+    </style>  
+ </head> 
+ <body> 
+  <div class="row"> 
+   <div class="fixed contain-to-grid header"> 
+    <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem"> 
+     <ul class="title-area"> 
+      <li class="name"> <h1> <a href="/index.html">Apache Isis\u2122</a> </h1> </li> 
+      <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone --> 
+      <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li> 
+     </ul> 
+     <section class="top-bar-section"> 
+      <ul class="right"> 
+       <li class="has-form"> 
+        <form class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse"> 
+         <div class="row collapse"> 
+          <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya"> 
+          <input type="hidden" name="cof" value="FORID:0"> 
+          <input class="form-control" name="q" type="text" placeholder="Search"> 
+         </div> 
+        </form> </li> 
+      </ul> 
+      <!-- Left Nav Section --> 
+      <ul class="left"> 
+       <li><a href="/documentation.html">Documentation</a></li> 
+       <li><a href="/downloads.html">Downloads</a></li> 
+       <li><a href="/help.html">Help</a></li> 
+       <li><a href="/asf.html">@ASF</a></li> 
+      </ul> 
+     </section> 
+    </nav> 
+   </div> 
+  </div> 
+  <div class="row"> 
+   <div id="doc-content-left" class="large-9 medium-9 columns"> 
+    <div id="doc-content">
+     <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/tg.adoc&quot;" style="float: right; font-size: small; padding: 6px;  "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+     <div class="sect1"> 
+      <h2 id="_tg">1. Tutorials</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_tg.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>This page contains a couple of tutorials for you to follow.</p> 
+       </div> 
+       <div class="ulist"> 
+        <ul> 
+         <li> <p>the <a href="#_tg_tutorials_pet-clinic">"petclinic"</a> tutorial takes you step-by-step through building a simple application of just three classes. There are example solutions in the github repo in case you get lost.</p> </li> 
+         <li> <p>an <a href="#_tg_tutorials_pet-clinic-extended">extended version</a> of the "petclinic" tutorial, (with the text hosted on github repo).</p> </li> 
+         <li> <p>the <a href="#_tg_tutorials_stop-scaffolding-start-coding">"stop scaffolding, start coding"</a> tutorial is taken from a conference workshop. It has less hand-holding, but lists out the steps for you to follow. It\u2019s a good cookbook to follow when you\u2019re readng to take things further.</p> </li> 
+        </ul> 
+       </div> 
+       <div class="paragraph"> 
+        <p>Have fun!</p> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_tg_tutorials_pet-clinic">2. Pet Clinic</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_tg_tutorials_pet-clinic.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>This is a step-by-step tutorial to build up a simple "petclinic" application, starting from the <a href="ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp archetype</a>. It was originally written by Jeroen van der Wal.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>It consists of just three domain classes (<a href="http://yuml.me/edit/3db2078c">http://yuml.me/3db2078c</a>):</p> 
+       </div> 
+       <div class="imageblock"> 
+        <div class="content"> 
+         <a class="image" href="images/tutorials/pet-clinic/domain-model.png"><img src="images/tutorials/pet-clinic/domain-model.png" alt="domain model"></a> 
+        </div> 
+       </div> 
+       <div class="paragraph"> 
+        <p>This supports the following use cases:</p> 
+       </div> 
+       <div class="ulist"> 
+        <ul> 
+         <li> <p>register a <code>Pet</code></p> </li> 
+         <li> <p>register an <code>Owner</code></p> </li> 
+         <li> <p>maintain a <code>Pet</code>'s details</p> </li> 
+         <li> <p>check in a <code>Pet</code> to visit the clinic</p> </li> 
+         <li> <p>enter a <code>Diagnosis</code></p> </li> 
+         <li> <p>check out a <code>Pet</code> after visiting the clinic</p> </li> 
+        </ul> 
+       </div> 
+       <div class="paragraph"> 
+        <p>Either follow along or check out the tags from the corresponding <a href="https://github.com/danhaywood/isis-app-petclinic">github repo</a>.</p> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_prerequisites">2.1. Prerequisites</h3> 
+        <div class="paragraph"> 
+         <p>You\u2019ll need:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p>Java 7 JDK</p> </li> 
+          <li> <p><a href="http://maven.apache.org/">Maven</a> 3.2.x</p> </li> 
+          <li> <p>an IDE, such as <a href="http://www.eclipse.org/">Eclipse</a> or <a href="https://www.jetbrains.com/idea/">IntelliJ IDEA</a>.</p> </li> 
+         </ul> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_run_the_archetype">2.2. Run the archetype</h3> 
+        <div class="paragraph"> 
+         <p>Throughout this tutorial you can, if you wish, just checkout from the github repo wherever you see a "git checkout" note:</p> 
+        </div> 
+        <div class="admonitionblock tip"> 
+         <table> 
+          <tbody>
+           <tr> 
+            <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td> 
+            <td class="content"> 
+             <div class="listingblock"> 
+              <div class="content"> 
+               <pre class="CodeRay highlight"><code data-lang="bash">git checkout https://github.com/danhaywood/isis-app-petclinic/commit/249abe476797438d83faa12ff88365da2c362451</code></pre> 
+              </div> 
+             </div> 
+             <div class="paragraph"> 
+              <p>Do note that the tutorial was originally developed against Apache Isis 1.8.0-SNAPSHOT; replace "1.8.0-SNAPSHOT" for the any version from 1.8.0 up to 1.13.1. (The structure of Apache Isis archetype changed in 1.13.2).</p> 
+             </div> </td> 
+           </tr> 
+          </tbody>
+         </table> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Run the simpleapp archetype to build an empty Isis application:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="bash">mvn archetype:generate  \
     -D archetypeGroupId=org.apache.isis.archetype \
     -D archetypeArtifactId=simpleapp-archetype \
     -D archetypeVersion=1.13.1 \
@@ -626,863 +557,745 @@ It was originally written by Jeroen van der Wal.</p>
     -D artifactId=petclinic \
     -D version=1.0-SNAPSHOT \
     -D archetypeRepository=http://repository-estatio.forge.cloudbees.com/snapshot/ \
-    -B</code></pre>
-</div>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>You can use 1.13.2 (or later) version of the archetype if you wish, however be aware that the structure of the solution repo (mentioned above) will be different from the structure for applications generated from 1.13.2.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>This will generate the app in a <code>petclinic</code> directory. Move the contents back:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">mv petclinic/* .
-rmdir petclinic</code></pre>
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_build_and_run">2.3. Build and run</h3>
-<div class="paragraph">
-<p>Start off by building the app from the command line:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">mvn clean install</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>You can run using the mvn-jetty-plugin:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">mvn -pl webapp jetty:run</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>You can then browser to <a href="http://localhost:8080">http://localhost:8080</a></p>
-</div>
-<div class="paragraph">
-<p>If using 1.13.2 or later, then you can also use the <a href="https://github.com/danhaywood/java-mavenmixin-jettyconsole/blob/master/README.adoc">jetty-console</a> plugin:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">mvn clean install -Dmavenmixin-jettyconsole
-mvn -pl webapp antrun:run -Dmavenmixin-jettyconsole</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>This packages the app as a standalone JAR, and then runs using the AntRun plugin.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_using_the_app">2.4. Using the app</h3>
-<div class="paragraph">
-<p>Navigate to the Wicket UI (eg <a href="http://localhost:8080/wicket">http://localhost:8080/wicket</a>), and login (sven/pass).</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/tutorials/pet-clinic/010-01-login-page.png"><img src="images/tutorials/pet-clinic/010-01-login-page.png" alt="010 01 login page" width="600px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>The home page should be shown:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/tutorials/pet-clinic/010-02-home-page.png"><img src="images/tutorials/pet-clinic/010-02-home-page.png" alt="010 02 home page" width="600px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>Install the fixtures (example test data) using the <code>Prototyping</code> menu:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/tutorials/pet-clinic/010-03-prototyping-menu.png"><img src="images/tutorials/pet-clinic/010-03-prototyping-menu.png" alt="010 03 prototyping menu" width="600px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>List all objects using the <code>Simple Objects</code> menu:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/tutorials/pet-clinic/010-04-simpleobjects.png"><img src="images/tutorials/pet-clinic/010-04-simpleobjects.png" alt="010 04 simpleobjects" width="600px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>To return the objects created:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/tutorials/pet-clinic/010-05-simpleobject-list.png"><img src="images/tutorials/pet-clinic/010-05-simpleobject-list.png" alt="010 05 simpleobject list" width="600px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>Experiment some more, to:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>create a new object</p>
-</li>
-<li>
-<p>list all objects</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>Go back to the splash screen, and quit the app. Note that the database runs in-memory (using HSQLDB) so any data created will be lost between runs.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_dev_environment">2.5. Dev environment</h3>
-<div class="paragraph">
-<p>Set up <a href="dg.html#_dg_ide">an IDE</a> and import the project to be able to run and debug the app.</p>
-</div>
-<div class="paragraph">
-<p>Then set up a launch configuration so that you can run the app from within the IDE. To save having to run the fixtures
-every time, specify the following system properties:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">-Disis.persistor.datanucleus.install-fixtures=true -Disis.fixtures=fixture.simple.scenario.SimpleObjectsFixture</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>For example, here&#8217;s what a launch configuration in IntelliJ idea looks like:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/tutorials/pet-clinic/020-01-idea-configuration.png"><img src="images/tutorials/pet-clinic/020-01-idea-configuration.png" alt="020 01 idea configuration" width="600px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>where the "before launch" maven goal (to run the DataNucleus enhancer) is defined as:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/tutorials/pet-clinic/020-02-idea-configuration.png"><img src="images/tutorials/pet-clinic/020-02-idea-configuration.png" alt="020 02 idea configuration" width="400px"></a>
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_explore_codebase">2.6. Explore codebase</h3>
-<div class="paragraph">
-<p>Apache Isis applications are organized into several Maven modules. Within your IDE navigate to the various classes and correlate back to the generated UI:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><code>petclinic</code> : parent module</p>
-</li>
-<li>
-<p><code>petclinic-dom</code>: domain objects module</p>
-<div class="ulist">
-<ul>
-<li>
-<p>entity: <code>dom.simple.SimpleObject</code></p>
-</li>
-<li>
-<p>repository: <code>dom.simple.SimpleObjects</code></p>
-</li>
-</ul>
-</div>
-</li>
-<li>
-<p><code>petclinic-fixture</code>: fixtures module</p>
-<div class="ulist">
-<ul>
-<li>
-<p>fixture script:`fixture.simple.SimpleObjectsFixture`</p>
-</li>
-</ul>
-</div>
-</li>
-<li>
-<p><code>petclinic-integtests</code>: integration tests module</p>
-</li>
-<li>
-<p><code>petclinic-webapp</code>: webapp module</p>
-<div class="ulist">
-<ul>
-<li>
-<p>(builds the WAR file)</p>
-</li>
-</ul>
-</div>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_testing">2.7. Testing</h3>
-<div class="paragraph">
-<p>Testing is of course massively important, and Apache Isis makes both unit testing and (end-to-end) integration testing easy. Building the app from the Maven command line ("mvn clean install") will run all tests, but you should also run the tests from within the IDE.</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><code>myapp-dom</code> unit tests</p>
-</li>
-<li>
-<p>run</p>
-</li>
-<li>
-<p>inspect, eg</p>
-<div class="ulist">
-<ul>
-<li>
-<p><code>SimpleObjectTest</code></p>
-</li>
-</ul>
-</div>
-</li>
-<li>
-<p><code>myapp-integtests</code> integration tests</p>
-</li>
-<li>
-<p>run</p>
-</li>
-<li>
-<p>inspect, eg:</p>
-<div class="ulist">
-<ul>
-<li>
-<p><code>integration.tests.smoke.SimpleObjectsTest</code></p>
-</li>
-<li>
-<p><code>integration.specs.simple.SimpleObjectSpec_listAllAndCreate.feature</code></p>
-</li>
-</ul>
-</div>
-</li>
-<li>
-<p>generated report, eg</p>
-<div class="ulist">
-<ul>
-<li>
-<p><code>myapp/integtests/target/cucumber-html-report/index.html</code></p>
-<div class="ulist">
-<ul>
-<li>
-<p>change test in IDE, re-run (in Maven)</p>
-</li>
-</ul>
-</div>
-</li>
-</ul>
-</div>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>If you have issues with the integration tests, make sure that the domain classes have been enhanced by the DataNucleus enhancer. (The exact mechanics depends on the IDE being used).</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_update_pom_files">2.8. Update POM files</h3>
-<div class="admonitionblock tip">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-tip" title="Tip"></i>
-</td>
-<td class="content">
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">git checkout https://github.com/danhaywood/isis-app-petclinic/commit/68904752bc2de9ebb3c853b79236df2b3ad2c944</code></pre>
-</div>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>The POM files generated by the simpleapp archetype describe the app as "SimpleApp". Update them to say "PetClinic" instead.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_delete_the_bdd_specs">2.9. Delete the BDD specs</h3>
-<div class="admonitionblock tip">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-tip" title="Tip"></i>
-</td>
-<td class="content">
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">git checkout https://github.com/danhaywood/isis-app-petclinic/commit/9046226249429b269325dfa2baccf03635841c20</code></pre>
-</div>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>During this tutorial we&#8217;re going to keep the integration tests in-sync with the code, but we&#8217;re going to stop short of writing BDD/Cucumber specs.</p>
-</div>
-<div class="paragraph">
-<p>Therefore delete the BDD feature spec and glue in the <code>integtest</code> module:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><code>integration/specs/*</code></p>
-</li>
-<li>
-<p><code>integration/glue/*</code></p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_rename_artifacts">2.10. Rename artifacts</h3>
-<div class="admonitionblock tip">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-tip" title="Tip"></i>
-</td>
-<td class="content">
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">git checkout https://github.com/danhaywood/isis-app-petclinic/commit/bee3629c0b64058f939b6dd20f226be31810fc66</code></pre>
-</div>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>Time to start refactoring the app. The heart of the PetClinic app is the <code>Pet</code> concept, so go through the code and refactor. While we&#8217;re at it, refactor the app itself from "SimpleApp" to "PetClinicApp".</p>
-</div>
-<div class="paragraph">
-<p>See the git commit for more detail, but in outline, the renames required are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>in the <code>dom</code> module&#8217;s production code</p>
-<div class="ulist">
-<ul>
-<li>
-<p><code>SimpleObject</code> -&gt; <code>Pet</code> (entity)</p>
-</li>
-<li>
-<p><code>SimpleObjects</code> -&gt; <code>Pets</code> (repository domain service)</p>
-</li>
-<li>
-<p><code>SimpleObject.layout.json</code> -&gt; <code>Pet.layout.json</code> (layout hints for the <code>Pet</code> entity)</p>
-</li>
-<li>
-<p>delete the <code>SimpleObject.png</code>, and add a new <code>Pet.png</code> (icon shown against all <code>Pet</code> instances).</p>
-</li>
-</ul>
-</div>
-</li>
-<li>
-<p>in the <code>dom</code> module&#8217;s unit test code</p>
-<div class="ulist">
-<ul>
-<li>
-<p><code>SimpleObjectTest</code> -&gt; <code>PetTest</code> (unit tests for <code>Pet</code> entity)</p>
-</li>
-<li>
-<p><code>SimpleObjectsTest</code> -&gt; <code>PetsTest</code> (unit tests for <code>Pets</code> domain service)</p>
-</li>
-</ul>
-</div>
-</li>
-<li>
-<p>in the <code>fixture</code> module:</p>
-<div class="ulist">
-<ul>
-<li>
-<p><code>SimpleObjectsFixturesService</code> -&gt; <code>PetClinicAppFixturesService</code> (rendered as the prototyping menu in the UI)</p>
-</li>
-<li>
-<p><code>SimpleObjectsTearDownService</code> -&gt; <code>PetClinicAppTearDownService</code> (tear down all objects between integration tests)</p>
-</li>
-<li>
-<p><code>SimpleObjectAbstract</code> -&gt; <code>PetAbstract</code> (abstract class for setting up a single pet object</p>
-<div class="ulist">
-<ul>
-<li>
-<p>and corresponding subclasses to set up sample data (eg <code>PetForFido</code>)</p>
-</li>
-</ul>
-</div>
-</li>
-<li>
-<p><code>SimpleObjectsFixture</code> -&gt; <code>PetsFixture</code> (tear downs system and then sets up all pets)</p>
-</li>
-</ul>
-</div>
-</li>
-<li>
-<p>in the <code>integtest</code> module:</p>
-<div class="ulist">
-<ul>
-<li>
-<p><code>SimpleAppSystemInitializer</code> -&gt; <code>PetClinicAppSystemInitializer</code> (bootstraps integration tests with domain service/repositories)</p>
-</li>
-<li>
-<p><code>SimpleAppIntegTest</code> -&gt; <code>PetClinicAppIntegTest</code> (base class for integration tests)</p>
-</li>
-<li>
-<p><code>SimpleObjectTest</code> -&gt; <code>PetTest</code> (integration test for <code>Pet</code> entity)</p>
-</li>
-<li>
-<p><code>SimpleObjectsTest</code> -&gt; <code>PetsTest</code> (integration test for <code>Pets</code> domain service)</p>
-</li>
-</ul>
-</div>
-</li>
-<li>
-<p>in the <code>webapp</code> module:</p>
-<div class="ulist">
-<ul>
-<li>
-<p><code>SimpleApplication</code> -&gt; <code>PetClinicApplication</code></p>
-</li>
-<li>
-<p>update <code>isis.properties</code></p>
-</li>
-<li>
-<p>update <code>web.xml</code></p>
-</li>
-</ul>
-</div>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>Note that <code>Pet</code> has both both Isis and JDO annotations:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@javax</span>.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE) <i class="conum" data-value="1"></i><b>(1)</b>
+    -B</code></pre> 
+         </div> 
+        </div> 
+        <div class="admonitionblock note"> 
+         <table> 
+          <tbody>
+           <tr> 
+            <td class="icon"> <i class="fa icon-note" title="Note"></i> </td> 
+            <td class="content"> 
+             <div class="paragraph"> 
+              <p>You can use 1.13.2 (or later) version of the archetype if you wish, however be aware that the structure of the solution repo (mentioned above) will be different from the structure for applications generated from 1.13.2.</p> 
+             </div> </td> 
+           </tr> 
+          </tbody>
+         </table> 
+        </div> 
+        <div class="paragraph"> 
+         <p>This will generate the app in a <code>petclinic</code> directory. Move the contents back:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="bash">mv petclinic/* .
+rmdir petclinic</code></pre> 
+         </div> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_build_and_run">2.3. Build and run</h3> 
+        <div class="paragraph"> 
+         <p>Start off by building the app from the command line:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="bash">mvn clean install</code></pre> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>You can run using the mvn-jetty-plugin:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="bash">mvn -pl webapp jetty:run</code></pre> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>You can then browser to <a href="http://localhost:8080">http://localhost:8080</a></p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>If using 1.13.2 or later, then you can also use the <a href="https://github.com/danhaywood/java-mavenmixin-jettyconsole/blob/master/README.adoc">jetty-console</a> plugin:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="bash">mvn clean install -Dmavenmixin-jettyconsole
+mvn -pl webapp antrun:run -Dmavenmixin-jettyconsole</code></pre> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>This packages the app as a standalone JAR, and then runs using the AntRun plugin.</p> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_using_the_app">2.4. Using the app</h3> 
+        <div class="paragraph"> 
+         <p>Navigate to the Wicket UI (eg <a href="http://localhost:8080/wicket">http://localhost:8080/wicket</a>), and login (sven/pass).</p> 
+        </div> 
+        <div class="imageblock"> 
+         <div class="content"> 
+          <a class="image" href="images/tutorials/pet-clinic/010-01-login-page.png"><img src="images/tutorials/pet-clinic/010-01-login-page.png" alt="010 01 login page" width="600px"></a> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The home page should be shown:</p> 
+        </div> 
+        <div class="imageblock"> 
+         <div class="content"> 
+          <a class="image" href="images/tutorials/pet-clinic/010-02-home-page.png"><img src="images/tutorials/pet-clinic/010-02-home-page.png" alt="010 02 home page" width="600px"></a> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Install the fixtures (example test data) using the <code>Prototyping</code> menu:</p> 
+        </div> 
+        <div class="imageblock"> 
+         <div class="content"> 
+          <a class="image" href="images/tutorials/pet-clinic/010-03-prototyping-menu.png"><img src="images/tutorials/pet-clinic/010-03-prototyping-menu.png" alt="010 03 prototyping menu" width="600px"></a> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>List all objects using the <code>Simple Objects</code> menu:</p> 
+        </div> 
+        <div class="imageblock"> 
+         <div class="content"> 
+          <a class="image" href="images/tutorials/pet-clinic/010-04-simpleobjects.png"><img src="images/tutorials/pet-clinic/010-04-simpleobjects.png" alt="010 04 simpleobjects" width="600px"></a> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>To return the objects created:</p> 
+        </div> 
+        <div class="imageblock"> 
+         <div class="content"> 
+          <a class="image" href="images/tutorials/pet-clinic/010-05-simpleobject-list.png"><img src="images/tutorials/pet-clinic/010-05-simpleobject-list.png" alt="010 05 simpleobject list" width="600px"></a> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Experiment some more, to:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p>create a new object</p> </li> 
+          <li> <p>list all objects</p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Go back to the splash screen, and quit the app. Note that the database runs in-memory (using HSQLDB) so any data created will be lost between runs.</p> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_dev_environment">2.5. Dev environment</h3> 
+        <div class="paragraph"> 
+         <p>Set up <a href="dg.html#_dg_ide">an IDE</a> and import the project to be able to run and debug the app.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Then set up a launch configuration so that you can run the app from within the IDE. To save having to run the fixtures every time, specify the following system properties:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="bash">-Disis.persistor.datanucleus.install-fixtures=true -Disis.fixtures=fixture.simple.scenario.SimpleObjectsFixture</code></pre> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>For example, here\u2019s what a launch configuration in IntelliJ idea looks like:</p> 
+        </div> 
+        <div class="imageblock"> 
+         <div class="content"> 
+          <a class="image" href="images/tutorials/pet-clinic/020-01-idea-configuration.png"><img src="images/tutorials/pet-clinic/020-01-idea-configuration.png" alt="020 01 idea configuration" width="600px"></a> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>where the "before launch" maven goal (to run the DataNucleus enhancer) is defined as:</p> 
+        </div> 
+        <div class="imageblock"> 
+         <div class="content"> 
+          <a class="image" href="images/tutorials/pet-clinic/020-02-idea-configuration.png"><img src="images/tutorials/pet-clinic/020-02-idea-configuration.png" alt="020 02 idea configuration" width="400px"></a> 
+         </div> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_explore_codebase">2.6. Explore codebase</h3> 
+        <div class="paragraph"> 
+         <p>Apache Isis applications are organized into several Maven modules. Within your IDE navigate to the various classes and correlate back to the generated UI:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><code>petclinic</code> : parent module</p> </li> 
+          <li> <p><code>petclinic-dom</code>: domain objects module</p> 
+           <div class="ulist"> 
+            <ul> 
+             <li> <p>entity: <code>dom.simple.SimpleObject</code></p> </li> 
+             <li> <p>repository: <code>dom.simple.SimpleObjects</code></p> </li> 
+            </ul> 
+           </div> </li> 
+          <li> <p><code>petclinic-fixture</code>: fixtures module</p> 
+           <div class="ulist"> 
+            <ul> 
+             <li> <p>fixture script:`fixture.simple.SimpleObjectsFixture`</p> </li> 
+            </ul> 
+           </div> </li> 
+          <li> <p><code>petclinic-integtests</code>: integration tests module</p> </li> 
+          <li> <p><code>petclinic-webapp</code>: webapp module</p> 
+           <div class="ulist"> 
+            <ul> 
+             <li> <p>(builds the WAR file)</p> </li> 
+            </ul> 
+           </div> </li> 
+         </ul> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_testing">2.7. Testing</h3> 
+        <div class="paragraph"> 
+         <p>Testing is of course massively important, and Apache Isis makes both unit testing and (end-to-end) integration testing easy. Building the app from the Maven command line ("mvn clean install") will run all tests, but you should also run the tests from within the IDE.</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><code>myapp-dom</code> unit tests</p> </li> 
+          <li> <p>run</p> </li> 
+          <li> <p>inspect, eg</p> 
+           <div class="ulist"> 
+            <ul> 
+             <li> <p><code>SimpleObjectTest</code></p> </li> 
+            </ul> 
+           </div> </li> 
+          <li> <p><code>myapp-integtests</code> integration tests</p> </li> 
+          <li> <p>run</p> </li> 
+          <li> <p>inspect, eg:</p> 
+           <div class="ulist"> 
+            <ul> 
+             <li> <p><code>integration.tests.smoke.SimpleObjectsTest</code></p> </li> 
+             <li> <p><code>integration.specs.simple.SimpleObjectSpec_listAllAndCreate.feature</code></p> </li> 
+            </ul> 
+           </div> </li> 
+          <li> <p>generated report, eg</p> 
+           <div class="ulist"> 
+            <ul> 
+             <li> <p><code>myapp/integtests/target/cucumber-html-report/index.html</code></p> 
+              <div class="ulist"> 
+               <ul> 
+                <li> <p>change test in IDE, re-run (in Maven)</p> </li> 
+               </ul> 
+              </div> </li> 
+            </ul> 
+           </div> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>If you have issues with the integration tests, make sure that the domain classes have been enhanced by the DataNucleus enhancer. (The exact mechanics depends on the IDE being used).</p> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_update_pom_files">2.8. Update POM files</h3> 
+        <div class="admonitionblock tip"> 
+         <table> 
+          <tbody>
+           <tr> 
+            <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td> 
+            <td class="content"> 
+             <div class="listingblock"> 
+              <div class="content"> 
+               <pre class="CodeRay highlight"><code data-lang="bash">git checkout https://github.com/danhaywood/isis-app-petclinic/commit/68904752bc2de9ebb3c853b79236df2b3ad2c944</code></pre> 
+              </div> 
+             </div> </td> 
+           </tr> 
+          </tbody>
+         </table> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The POM files generated by the simpleapp archetype describe the app as "SimpleApp". Update them to say "PetClinic" instead.</p> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_delete_the_bdd_specs">2.9. Delete the BDD specs</h3> 
+        <div class="admonitionblock tip"> 
+         <table> 
+          <tbody>
+           <tr> 
+            <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td> 
+            <td class="content"> 
+             <div class="listingblock"> 
+              <div class="content"> 
+               <pre class="CodeRay highlight"><code data-lang="bash">git checkout https://github.com/danhaywood/isis-app-petclinic/commit/9046226249429b269325dfa2baccf03635841c20</code></pre> 
+              </div> 
+             </div> </td> 
+           </tr> 
+          </tbody>
+         </table> 
+        </div> 
+        <div class="paragraph"> 
+         <p>During this tutorial we\u2019re going to keep the integration tests in-sync with the code, but we\u2019re going to stop short of writing BDD/Cucumber specs.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Therefore delete the BDD feature spec and glue in the <code>integtest</code> module:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><code>integration/specs/*</code></p> </li> 
+          <li> <p><code>integration/glue/*</code></p> </li> 
+         </ul> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_rename_artifacts">2.10. Rename artifacts</h3> 
+        <div class="admonitionblock tip"> 
+         <table> 
+          <tbody>
+           <tr> 
+            <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td> 
+            <td class="content"> 
+             <div class="listingblock"> 
+              <div class="content"> 
+               <pre class="CodeRay highlight"><code data-lang="bash">git checkout https://github.com/danhaywood/isis-app-petclinic/commit/bee3629c0b64058f939b6dd20f226be31810fc66</code></pre> 
+              </div> 
+             </div> </td> 
+           </tr> 
+          </tbody>
+         </table> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Time to start refactoring the app. The heart of the PetClinic app is the <code>Pet</code> concept, so go through the code and refactor. While we\u2019re at it, refactor the app itself from "SimpleApp" to "PetClinicApp".</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>See the git commit for more detail, but in outline, the renames required are:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p>in the <code>dom</code> module\u2019s production code</p> 
+           <div class="ulist"> 
+            <ul> 
+             <li> <p><code>SimpleObject</code> -&gt; <code>Pet</code> (entity)</p> </li> 
+             <li> <p><code>SimpleObjects</code> -&gt; <code>Pets</code> (repository domain service)</p> </li> 
+             <li> <p><code>SimpleObject.layout.json</code> -&gt; <code>Pet.layout.json</code> (layout hints for the <code>Pet</code> entity)</p> </li> 
+             <li> <p>delete the <code>SimpleObject.png</code>, and add a new <code>Pet.png</code> (icon shown against all <code>Pet</code> instances).</p> </li> 
+            </ul> 
+           </div> </li> 
+          <li> <p>in the <code>dom</code> module\u2019s unit test code</p> 
+           <div class="ulist"> 
+            <ul> 
+             <li> <p><code>SimpleObjectTest</code> -&gt; <code>PetTest</code> (unit tests for <code>Pet</code> entity)</p> </li> 
+             <li> <p><code>SimpleObjectsTest</code> -&gt; <code>PetsTest</code> (unit tests for <code>Pets</code> domain service)</p> </li> 
+            </ul> 
+           </div> </li> 
+          <li> <p>in the <code>fixture</code> module:</p> 
+           <div class="ulist"> 
+            <ul> 
+             <li> <p><code>SimpleObjectsFixturesService</code> -&gt; <code>PetClinicAppFixturesService</code> (rendered as the prototyping menu in the UI)</p> </li> 
+             <li> <p><code>SimpleObjectsTearDownService</code> -&gt; <code>PetClinicAppTearDownService</code> (tear down all objects between integration tests)</p> </li> 
+             <li> <p><code>SimpleObjectAbstract</code> -&gt; <code>PetAbstract</code> (abstract class for setting up a single pet object</p> 
+              <div class="ulist"> 
+               <ul> 
+                <li> <p>and corresponding subclasses to set up sample data (eg <code>PetForFido</code>)</p> </li> 
+               </ul> 
+              </div> </li> 
+             <li> <p><code>SimpleObjectsFixture</code> -&gt; <code>PetsFixture</code> (tear downs system and then sets up all pets)</p> </li> 
+            </ul> 
+           </div> </li> 
+          <li> <p>in the <code>integtest</code> module:</p> 
+           <div class="ulist"> 
+            <ul> 
+             <li> <p><code>SimpleAppSystemInitializer</code> -&gt; <code>PetClinicAppSystemInitializer</code> (bootstraps integration tests with domain service/repositories)</p> </li> 
+             <li> <p><code>SimpleAppIntegTest</code> -&gt; <code>PetClinicAppIntegTest</code> (base class for integration tests)</p> </li> 
+             <li> <p><code>SimpleObjectTest</code> -&gt; <code>PetTest</code> (integration test for <code>Pet</code> entity)</p> </li> 
+             <li> <p><code>SimpleObjectsTest</code> -&gt; <code>PetsTest</code> (integration test for <code>Pets</code> domain service)</p> </li> 
+            </ul> 
+           </div> </li> 
+          <li> <p>in the <code>webapp</code> module:</p> 
+           <div class="ulist"> 
+            <ul> 
+             <li> <p><code>SimpleApplication</code> -&gt; <code>PetClinicApplication</code></p> </li> 
+             <li> <p>update <code>isis.properties</code></p> </li> 
+             <li> <p>update <code>web.xml</code></p> </li> 
+            </ul> 
+           </div> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Note that <code>Pet</code> has both both Isis and JDO annotations:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@javax</span>.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE) <i class="conum" data-value="1"></i><b>(1)</b>
 <span class="annotation">@javax</span>.jdo.annotations.DatastoreIdentity(                                      <i class="conum" data-value="2"></i><b>(2)</b>
         strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY,
-         column=<span class="string"><span class="delimiter">&quot;</span><span class="content">id</span><span class="delimiter">&quot;</span></span>)
+         column=<span class="string"><span class="delimiter">"</span><span class="content">id</span><span class="delimiter">"</span></span>)
 <span class="annotation">@javax</span>.jdo.annotations.Version(                                                <i class="conum" data-value="3"></i><b>(3)</b>
         strategy=VersionStrategy.VERSION_NUMBER,
-        column=<span class="string"><span class="delimiter">&quot;</span><span class="content">version</span><span class="delimiter">&quot;</span></span>)
-<span class="annotation">@javax</span>.jdo.annotations.Unique(name=<span class="string"><span class="delimiter">&quot;</span><span class="content">Pet_name_UNQ</span><span class="delimiter">&quot;</span></span>, members = {<span class="string"><span class="delimiter">&quot;</span><span class="content">name</span><span class="delimiter">&quot;</span></span>})         <i class="conum" data-value="4"></i><b>(4)</b>
-<span class="annotation">@ObjectType</span>(<span class="string"><span class="delimiter">&quot;</span><span class="content">PET</span><span class="delimiter">&quot;</span></span>)                                                             <i class="conum" data-value="5"></i><b>(5)</b>
+        column=<span class="string"><span class="delimiter">"</span><span class="content">version</span><span class="delimiter">"</span></span>)
+<span class="annotation">@javax</span>.jdo.annotations.Unique(name=<span class="string"><span class="delimiter">"</span><span class="content">Pet_name_UNQ</span><span class="delimiter">"</span></span>, members = {<span class="string"><span class="delimiter">"</span><span class="content">name</span><span class="delimiter">"</span></span>})         <i class="conum" data-value="4"></i><b>(4)</b>
+<span class="annotation">@ObjectType</span>(<span class="string"><span class="delimiter">"</span><span class="content">PET</span><span class="delimiter">"</span></span>)                                                             <i class="conum" data-value="5"></i><b>(5)</b>
 <span class="annotation">@Bookmarkable</span>                                                                  <i class="conum" data-value="6"></i><b>(6)</b>
 <span class="directive">public</span> <span class="type">class</span> <span class="class">Pet</span> <span class="directive">implements</span> <span class="predefined-type">Comparable</span>&lt;Pet&gt; {
     ...
-}</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>where:</p>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td><code>@PersistenceCapable</code> and</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="2"></i><b>2</b></td>
-<td><code>@DatastoreIdentity</code> specify a surrogate <code>Id</code> column to be used as the primary key</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="3"></i><b>3</b></td>
-<td><code>@Version</code> provides support for optimistic locking</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="4"></i><b>4</b></td>
-<td><code>@Unique</code> enforces a uniqueness constraint so that no two `Pet`s can have the same name (unrealistic, but can refactor later)</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="5"></i><b>5</b></td>
-<td><code>@ObjectType</code> is used by Apache Isis for its own internal "OID" identifier; this also appears in the URL in Apache Isis' Wicket viewer and REST API</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="6"></i><b>6</b></td>
-<td><code>@Bookmarkable</code> indicates that the object can be automatically bookmarked in Apache Isis' Wicket viewer</td>
-</tr>
-</table>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>The <code>@ObjectType</code> and <code>@Bookmarkable</code> annotations have since been deprecated, replaced with <code>@DomainObject(objectType=&#8230;&#8203;)</code> and <code>@DomainObjectLayout(bookmarking=&#8230;&#8203;)</code></p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>The <code>Pets</code> domain service also has Isis annotations:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@DomainService</span>(repositoryFor = Pet.class)
-<span class="annotation">@DomainServiceLayout</span>(menuOrder = <span class="string"><span class="delimiter">&quot;</span><span class="content">10</span><span class="delimiter">&quot;</span></span>)
+}</code></pre> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>where:</p> 
+        </div> 
+        <div class="colist arabic"> 
+         <table> 
+          <tbody>
+           <tr> 
+            <td><i class="conum" data-value="1"></i><b>1</b></td> 
+            <td><code>@PersistenceCapable</code> and</td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="2"></i><b>2</b></td> 
+            <td><code>@DatastoreIdentity</code> specify a surrogate <code>Id</code> column to be used as the primary key</td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="3"></i><b>3</b></td> 
+            <td><code>@Version</code> provides support for optimistic locking</td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="4"></i><b>4</b></td> 
+            <td><code>@Unique</code> enforces a uniqueness constraint so that no two `Pet`s can have the same name (unrealistic, but can refactor later)</td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="5"></i><b>5</b></td> 
+            <td><code>@ObjectType</code> is used by Apache Isis for its own internal "OID" identifier; this also appears in the URL in Apache Isis' Wicket viewer and REST API</td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="6"></i><b>6</b></td> 
+            <td><code>@Bookmarkable</code> indicates that the object can be automatically bookmarked in Apache Isis' Wicket viewer</td> 
+           </tr> 
+          </tbody>
+         </table> 
+        </div> 
+        <div class="admonitionblock note"> 
+         <table> 
+          <tbody>
+           <tr> 
+            <td class="icon"> <i class="fa icon-note" title="Note"></i> </td> 
+            <td class="content"> 
+             <div class="paragraph"> 
+              <p>The <code>@ObjectType</code> and <code>@Bookmarkable</code> annotations have since been deprecated, replaced with <code>@DomainObject(objectType=\u2026\u200b)</code> and <code>@DomainObjectLayout(bookmarking=\u2026\u200b)</code></p> 
+             </div> </td> 
+           </tr> 
+          </tbody>
+         </table> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The <code>Pets</code> domain service also has Isis annotations:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@DomainService</span>(repositoryFor = Pet.class)
+<span class="annotation">@DomainServiceLayout</span>(menuOrder = <span class="string"><span class="delimiter">"</span><span class="content">10</span><span class="delimiter">"</span></span>)
 <span class="directive">public</span> <span class="type">class</span> <span class="class">Pets</span> {
     ...
-}</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>where:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><code>DomainService</code> indicates that the service should be instantiated automatically (as a singleton)</p>
-</li>
-<li>
-<p><code>DomainServiceLayout</code> provides UI hints, in this case the positioning of the menu for the actions provided by the service</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>To run the application will require an update to the IDE configuration, for the changed name of the fixture class:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/tutorials/pet-clinic/030-01-idea-configuration-updated.png"><img src="images/tutorials/pet-clinic/030-01-idea-configuration-updated.png" alt="030 01 idea configuration updated" width="600px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>Running the app should now show `Pet`s:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/tutorials/pet-clinic/030-02-updated-app.png"><img src="images/tutorials/pet-clinic/030-02-updated-app.png" alt="030 02 updated app" width="600px"></a>
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_update_package_names">2.11. Update package names</h3>
-<div class="admonitionblock tip">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-tip" title="Tip"></i>
-</td>
-<td class="content">
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">git checkout https://github.com/danhaywood/isis-app-petclinic/commit/55ec36e520191f5fc8fe7f5b89956814eaf13317</code></pre>
-</div>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>The classes created by the simpleapp archetype are by default in the <code>simple</code> package. Move these classes to <code>pets</code> package instead. Also adjust package names where they appear as strings:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>in <code>PetClinicAppFixturesService</code>, change the package name from "fixture.simple" to "fixture.pets".</p>
-</li>
-<li>
-<p>in <code>PetClinicAppSystemInitializer</code>, change the package name "dom.simple" to "dom.pets", and similarly "fixture.simple" to "fixture.pets"</p>
-</li>
-<li>
-<p>in <code>WEB-INF/isis.properties</code>, similarly change the package name "dom.simple" to "dom.pets", and similarly "fixture.simple" to "fixture.pets"</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>To run the application will require a further update to the IDE configuration, for the changed package of the fixture class:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/tutorials/pet-clinic/040-01-idea-configuration-updated.png"><img src="images/tutorials/pet-clinic/040-01-idea-configuration-updated.png" alt="040 01 idea configuration updated" width="600px"></a>
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_add_code_petspecies_code_enum">2.12. Add <code>PetSpecies</code> enum</h3>
-<div class="admonitionblock tip">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-tip" title="Tip"></i>
-</td>
-<td class="content">
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">git checkout https://github.com/danhaywood/isis-app-petclinic/commit/55c9cd28ff960220719b3dc7cb8abadace8d0829</code></pre>
-</div>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>Each <code>Pet</code> is of a particular species. Model these as an enum called <code>PetSpecies</code>:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">enum</span> PetSpecies {
+}</code></pre> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>where:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><code>DomainService</code> indicates that the service should be instantiated automatically (as a singleton)</p> </li> 
+          <li> <p><code>DomainServiceLayout</code> provides UI hints, in this case the positioning of the menu for the actions provided by the service</p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>To run the application will require an update to the IDE configuration, for the changed name of the fixture class:</p> 
+        </div> 
+        <div class="imageblock"> 
+         <div class="content"> 
+          <a class="image" href="images/tutorials/pet-clinic/030-01-idea-configuration-updated.png"><img src="images/tutorials/pet-clinic/030-01-idea-configuration-updated.png" alt="030 01 idea configuration updated" width="600px"></a> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Running the app should now show `Pet`s:</p> 
+        </div> 
+        <div class="imageblock"> 
+         <div class="content"> 
+          <a class="image" href="images/tutorials/pet-clinic/030-02-updated-app.png"><img src="images/tutorials/pet-clinic/030-02-updated-app.png" alt="030 02 updated app" width="600px"></a> 
+         </div> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_update_package_names">2.11. Update package names</h3> 
+        <div class="admonitionblock tip"> 
+         <table> 
+          <tbody>
+           <tr> 
+            <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td> 
+            <td class="content"> 
+             <div class="listingblock"> 
+              <div class="content"> 
+               <pre class="CodeRay highlight"><code data-lang="bash">git checkout https://github.com/danhaywood/isis-app-petclinic/commit/55ec36e520191f5fc8fe7f5b89956814eaf13317</code></pre> 
+              </div> 
+             </div> </td> 
+           </tr> 
+          </tbody>
+         </table> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The classes created by the simpleapp archetype are by default in the <code>simple</code> package. Move these classes to <code>pets</code> package instead. Also adjust package names where they appear as strings:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p>in <code>PetClinicAppFixturesService</code>, change the package name from "fixture.simple" to "fixture.pets".</p> </li> 
+          <li> <p>in <code>PetClinicAppSystemInitializer</code>, change the package name "dom.simple" to "dom.pets", and similarly "fixture.simple" to "fixture.pets"</p> </li> 
+          <li> <p>in <code>WEB-INF/isis.properties</code>, similarly change the package name "dom.simple" to "dom.pets", and similarly "fixture.simple" to "fixture.pets"</p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>To run the application will require a further update to the IDE configuration, for the changed package of the fixture class:</p> 
+        </div> 
+        <div class="imageblock"> 
+         <div class="content"> 
+          <a class="image" href="images/tutorials/pet-clinic/040-01-idea-configuration-updated.png"><img src="images/tutorials/pet-clinic/040-01-idea-configuration-updated.png" alt="040 01 idea configuration updated" width="600px"></a> 
+         </div> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_add_code_petspecies_code_enum">2.12. Add <code>PetSpecies</code> enum</h3> 
+        <div class="admonitionblock tip"> 
+         <table> 
+          <tbody>
+           <tr> 
+            <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td> 
+            <td class="content"> 
+             <div class="listingblock"> 
+              <div class="content"> 
+               <pre class="CodeRay highlight"><code data-lang="bash">git checkout https://github.com/danhaywood/isis-app-petclinic/commit/55c9cd28ff960220719b3dc7cb8abadace8d0829</code></pre> 
+              </div> 
+             </div> </td> 
+           </tr> 
+          </tbody>
+         </table> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Each <code>Pet</code> is of a particular species. Model these as an enum called <code>PetSpecies</code>:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">enum</span> PetSpecies {
     Cat,
     Dog,
     Budgie,
     Hamster,
     Tortoise
-}</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Introduce a new property on <code>Pet</code> of this type:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">Pet</span> {
+}</code></pre> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Introduce a new property on <code>Pet</code> of this type:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">Pet</span> {
     ...
     private PetSpecies species;
-    <span class="annotation">@javax</span>.jdo.annotations.Column(allowsNull = <span class="string"><span class="delimiter">&quot;</span><span class="content">false</span><span class="delimiter">&quot;</span></span>)
+    <span class="annotation">@javax</span>.jdo.annotations.Column(allowsNull = <span class="string"><span class="delimiter">"</span><span class="content">false</span><span class="delimiter">"</span></span>)
     <span class="directive">public</span> PetSpecies getSpecies() { <span class="keyword">return</span> species; }
     <span class="directive">public</span> <span class="type">void</span> setSpecies(<span class="directive">final</span> PetSpecies species) { <span class="local-variable">this</span>.species = species; }
     ...
-}</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Update fixtures, unit tests and integration tests.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_icon_to_reflect_pet_species">2.13. Icon to reflect pet species</h3>
-<div class="admonitionblock tip">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-tip" title="Tip"></i>
-</td>
-<td class="content">
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">git checkout https://github.com/danhaywood/isis-app-petclinic/commit/2212765694693eb463f8fa88bab1bad154add0cb</code></pre>
-</div>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>Rather than using a single icon for a domain class, instead a different icon can be supplied for each instance. We can therefore have different icon files for each pet, reflecting that pet&#8217;s species.</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">Pet</span> {
+}</code></pre> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Update fixtures, unit tests and integration tests.</p> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_icon_to_reflect_pet_species">2.13. Icon to reflect pet species</h3> 
+        <div class="admonitionblock tip"> 
+         <table> 
+          <tbody>
+           <tr> 
+            <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td> 
+            <td class="content"> 
+             <div class="listingblock"> 
+              <div class="content"> 
+               <pre class="CodeRay highlight"><code data-lang="bash">git checkout https://github.com/danhaywood/isis-app-petclinic/commit/2212765694693eb463f8fa88bab1bad154add0cb</code></pre> 
+              </div> 
+             </div> </td> 
+           </tr> 
+          </tbody>
+         </table> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Rather than using a single icon for a domain class, instead a different icon can be supplied for each instance. We can therefore have different icon files for each pet, reflecting that pet\u2019s species.</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">Pet</span> {
     ...
     public <span class="predefined-type">String</span> iconName() {
         <span class="keyword">return</span> getSpecies().name();
     }
     ...
-}</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Download corresponding icon files (<code>Dog.png</code>, <code>Cat.png</code> etc)</p>
-</div>
-<div class="paragraph">
-<p>Running the app shows the <code>Pet</code> and its associated icon:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/tutorials/pet-clinic/050-01-list-all.png"><img src="images/tutorials/pet-clinic/050-01-list-all.png" alt="050 01 list all" width="600px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>with the corresponding view of the <code>Pet</code>:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/tutorials/pet-clinic/050-02-view-pet.png"><img src="images/tutorials/pet-clinic/050-02-view-pet.png" alt="050 02 view pet" width="600px"></a>
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_add_pet_s_code_owner_code">2.14. Add pet&#8217;s <code>Owner</code></h3>
-<div class="admonitionblock tip">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-tip" title="Tip"></i>
-</td>
-<td class="content">
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">git checkout https://github.com/danhaywood/isis-app-petclinic/commit/6f92a8ee8e76696d005da2a8b7a746444d017546</code></pre>
-</div>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>Add the <code>Owner</code> entity and corresponding <code>Owners</code> domain service (repository). Add a query to find `Order`s by name:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java">...
+}</code></pre> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Download corresponding icon files (<code>Dog.png</code>, <code>Cat.png</code> etc)</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Running the app shows the <code>Pet</code> and its associated icon:</p> 
+        </div> 
+        <div class="imageblock"> 
+         <div class="content"> 
+          <a class="image" href="images/tutorials/pet-clinic/050-01-list-all.png"><img src="images/tutorials/pet-clinic/050-01-list-all.png" alt="050 01 list all" width="600px"></a> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>with the corresponding view of the <code>Pet</code>:</p> 
+        </div> 
+        <div class="imageblock"> 
+         <div class="content"> 
+          <a class="image" href="images/tutorials/pet-clinic/050-02-view-pet.png"><img src="images/tutorials/pet-clinic/050-02-view-pet.png" alt="050 02 view pet" width="600px"></a> 
+         </div> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_add_pet_s_code_owner_code">2.14. Add pet\u2019s <code>Owner</code></h3> 
+        <div class="admonitionblock tip"> 
+         <table> 
+          <tbody>
+           <tr> 
+            <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td> 
+            <td class="content"> 
+             <div class="listingblock"> 
+              <div class="content"> 
+               <pre class="CodeRay highlight"><code data-lang="bash">git checkout https://github.com/danhaywood/isis-app-petclinic/commit/6f92a8ee8e76696d005da2a8b7a746444d017546</code></pre> 
+              </div> 
+             </div> </td> 
+           </tr> 
+          </tbody>
+         </table> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Add the <code>Owner</code> entity and corresponding <code>Owners</code> domain service (repository). Add a query to find `Order`s by name:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="java">...
 <span class="annotation">@javax</span>.jdo.annotations.Queries( {
         <span class="annotation">@javax</span>.jdo.annotations.Query(
-                name = <span class="string"><span class="delimiter">&quot;</span><span class="content">findByName</span><span class="delimiter">&quot;</span></span>, language = <span class="string"><span class="delimiter">&quot;</span><span class="content">JDOQL</span><span class="delimiter">&quot;</span></span>,
-                value = <span class="string"><span class="delimiter">&quot;</span><span class="content">SELECT </span><span class="delimiter">&quot;</span></span>
-                        + <span class="string"><span class="delimiter">&quot;</span><span class="content">FROM dom.owners.Owner </span><span class="delimiter">&quot;</span></span>
-                        + <span class="string"><span class="delimiter">&quot;</span><span class="content">WHERE name.matches(:name)</span><span class="delimiter">&quot;</span></span>)
+                name = <span class="string"><span class="delimiter">"</span><span class="content">findByName</span><span class="delimiter">"</span></span>, language = <span class="string"><span class="delimiter">"</span><span class="content">JDOQL</span><span class="delimiter">"</span></span>,
+                value = <span class="string"><span class="delimiter">"</span><span class="content">SELECT </span><span class="delimiter">"</span></span>
+                        + <span class="string"><span class="delimiter">"</span><span class="content">FROM dom.owners.Owner </span><span class="delimiter">"</span></span>
+                        + <span class="string"><span class="delimiter">"</span><span class="content">WHERE name.matches(:name)</span><span class="delimiter">"</span></span>)
 })
 <span class="directive">public</span> <span class="type">class</span> <span class="class">Owner</span> ... {
     ...
-}</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>and <code>findByName(&#8230;&#8203;)</code> in <code>Owners</code>:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">Owners</span> {
+}</code></pre> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>and <code>findByName(\u2026\u200b)</code> in <code>Owners</code>:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">Owners</span> {
     ...
     public <span class="predefined-type">List</span>&lt;<span class="predefined-type">Owner</span>&gt; findByName(
-            <span class="annotation">@ParameterLayout</span>(named = <span class="string"><span class="delimiter">&quot;</span><span class="content">Name</span><span class="delimiter">&quot;</span></span>)
+            <span class="annotation">@ParameterLayout</span>(named = <span class="string"><span class="delimiter">"</span><span class="content">Name</span><span class="delimiter">"</span></span>)
             <span class="directive">final</span> <span class="predefined-type">String</span> name) {
-        <span class="directive">final</span> <span class="predefined-type">String</span> nameArg = <span class="predefined-type">String</span>.format(<span class="string"><span class="delimiter">&quot;</span><span class="content">.*%s.*</span><span class="delimiter">&quot;</span></span>, name);
+        <span class="directive">final</span> <span class="predefined-type">String</span> nameArg = <span class="predefined-type">String</span>.format(<span class="string"><span class="delimiter">"</span><span class="content">.*%s.*</span><span class="delimiter">"</span></span>, name);
         <span class="directive">final</span> <span class="predefined-type">List</span>&lt;<span class="predefined-type">Owner</span>&gt; owners = container.allMatches(
                 <span class="keyword">new</span> QueryDefault&lt;&gt;(
                         <span class="predefined-type">Owner</span>.class,
-                        <span class="string"><span class="delimiter">&quot;</span><span class="content">findByName</span><span class="delimiter">&quot;</span></span>,
-                        <span class="string"><span class="delimiter">&quot;</span><span class="content">name</span><span class="delimiter">&quot;</span></span>, nameArg));
+                        <span class="string"><span class="delimiter">"</span><span class="content">findByName</span><span class="delimiter">"</span></span>,
+                        <span class="string"><span class="delimiter">"</span><span class="content">name</span><span class="delimiter">"</span></span>, nameArg));
         <span class="keyword">return</span> owners;
     }
     ...
-}</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Add an <code>owner</code> property to <code>Pet</code>, with supporting <code>autoCompleteXxx()</code> method (so that available owners are shown in a drop-down list box):</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">Pet</span> ... {
+}</code></pre> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Add an <code>owner</code> property to <code>Pet</code>, with supporting <code>autoCompleteXxx()</code> method (so that available owners are shown in a drop-down list box):</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">Pet</span> ... {
     ...
     private <span class="predefined-type">Owner</span> owner;
-    <span class="annotation">@javax</span>.jdo.annotations.Column(allowsNull = <span class="string"><span class="delimiter">&quot;</span><span class="content">false</span><span class="delimiter">&quot;</span></span>)
+    <span class="annotation">@javax</span>.jdo.annotations.Column(allowsNull = <span class="string"><span class="delimiter">"</span><span class="content">false</span><span class="delimiter">"</span></span>)
     <span class="directive">public</span> <span class="predefined-type">Owner</span> getOwner() { <span class="keyword">return</span> owner; }
     <span class="directive">public</span> <span class="type">void</span> setOwner(<span class="directive">final</span> <span class="predefined-type">Owner</span> owner) { <span class="local-variable">this</span>.owner = owner; }
     <span class="directive">public</span> <span class="predefined-type">Collection</span>&lt;<span class="predefined-type">Owner</span>&gt; autoCompleteOwner(<span class="directive">final</span> <span class="annotation">@MinLength</span>(<span class="integer">1</span>) <span class="predefined-type">String</span> name) {
         <span class="keyword">return</span> owners.findByName(name);
     }
     ...
-}</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Also updated fixture data to set up a number of <code>Owner`s, and associate each `Pet</code> with an <code>Owner</code>. Also add unit tests and integration tests for <code>Owner</code>/<code>Owners</code> and updated for <code>Pet</code>/<code>Pets</code>.</p>
-</div>
-<div class="paragraph">
-<p>When running the app, notice the new <code>Owners</code> menu:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/tutorials/pet-clinic/060-01-owners-menu.png"><img src="images/tutorials/pet-clinic/060-01-owners-menu.png" alt="060 01 owners menu" width="600px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>which when invoked returns all <code>Owner</code> objects:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/tutorials/pet-clinic/060-02-owners-list.png"><img src="images/tutorials/pet-clinic/060-02-owners-list.png" alt="060 02 owners list" width="600px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>Each <code>Pet</code> also indicates its corresponding <code>Owner</code>:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/tutorials/pet-clinic/060-03-pets-list.png"><img src="images/tutorials/pet-clinic/060-03-pets-list.png" alt="060 03 pets list" width="600px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>And, on editing a <code>Pet</code>, a new <code>Owner</code> can be specified using the autoComplete:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/tutorials/pet-clinic/060-04-pet-owner-autoComplete.png"><img src="images/tutorials/pet-clinic/060-04-pet-owner-autoComplete.png" alt="060 04 pet owner autoComplete" width="600px"></a>
-</div>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_tg_tutorials_pet-clinic-extended">3. Pet Clinic (Extended)</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>An extended version of the <a href="#_tg_tutorials_pet-clinic">pet clinic</a> can be found on <a href="https://github.com/johandoornenbal/tutorial_code/blob/master/AsciiDoc/1_petclinic_introduction.adoc">this github repo</a>.  It was written by Johan Doornenbal.</p>
-</div>
-<div class="paragraph">
-<p>This version also includes a <a href="https://github.com/johandoornenbal/petclinic_mynewcode">sample solution</a>, also as a github repo.</p>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_tg_tutorials_stop-scaffolding-start-coding">4. Stop scaffolding, start coding</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>This is a half-day tutorial on developing domain-driven apps using Apache Isis.  Actually, you could probably spend a full day working through this tutorial if you wanted to, so pick and choose the bits that look interesting.  It was originally written by Dan Haywood.</p>
-</div>
-<div class="paragraph">
-<p>There&#8217;s a bit of overlap with the <a href="#_tg_tutorials_pet-clinic">Pet Clinic</a> tutorial initially, but it then sets off on its own.</p>
-</div>
-<div class="sect2">
-<h3 id="_prerequisites_2">4.1. Prerequisites</h3>
-<div class="paragraph">
-<p>You&#8217;ll need:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Java 7 JDK</p>
-</li>
-<li>
-<p><a href="http://maven.apache.org/">Maven</a> 3.2.x</p>
-</li>
-<li>
-<p>an IDE, such as <a href="http://www.eclipse.org/">Eclipse</a> or <a href="https://www.jetbrains.com/idea/">IntelliJ IDEA</a>.</p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_run_the_archetype_2">4.2. Run the archetype</h3>
-<div class="paragraph">
-<p>Run the simpleapp archetype to build an empty Isis application:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">mvn archetype:generate  \
+}</code></pre> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Also updated fixture data to set up a number of <code>Owner`s, and associate each `Pet</code> with an <code>Owner</code>. Also add unit tests and integration tests for <code>Owner</code>/<code>Owners</code> and updated for <code>Pet</code>/<code>Pets</code>.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>When running the app, notice the new <code>Owners</code> menu:</p> 
+        </div> 
+        <div class="imageblock"> 
+         <div class="content"> 
+          <a class="image" href="images/tutorials/pet-clinic/060-01-owners-menu.png"><img src="images/tutorials/pet-clinic/060-01-owners-menu.png" alt="060 01 owners menu" width="600px"></a> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>which when invoked returns all <code>Owner</code> objects:</p> 
+        </div> 
+        <div class="imageblock"> 
+         <div class="content"> 
+          <a class="image" href="images/tutorials/pet-clinic/060-02-owners-list.png"><img src="images/tutorials/pet-clinic/060-02-owners-list.png" alt="060 02 owners list" width="600px"></a> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Each <code>Pet</code> also indicates its corresponding <code>Owner</code>:</p> 
+        </div> 
+        <div class="imageblock"> 
+         <div class="content"> 
+          <a class="image" href="images/tutorials/pet-clinic/060-03-pets-list.png"><img src="images/tutorials/pet-clinic/060-03-pets-list.png" alt="060 03 pets list" width="600px"></a> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>And, on editing a <code>Pet</code>, a new <code>Owner</code> can be specified using the autoComplete:</p> 
+        </div> 
+        <div class="imageblock"> 
+         <div class="content"> 
+          <a class="image" href="images/tutorials/pet-clinic/060-04-pet-owner-autoComplete.png"><img src="images/tutorials/pet-clinic/060-04-pet-owner-autoComplete.png" alt="060 04 pet owner autoComplete" width="600px"></a> 
+         </div> 
+        </div> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_tg_tutorials_pet-clinic-extended">3. Pet Clinic (Extended)</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_tg_tutorials_pet-clinic-extended.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>An extended version of the <a href="#_tg_tutorials_pet-clinic">pet clinic</a> can be found on <a href="https://github.com/johandoornenb

<TRUNCATED>

[24/44] isis-site git commit: ISIS-1594: provide an 'edit' button

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/guides/tg.pdf
----------------------------------------------------------------------
diff --git a/content/guides/tg.pdf b/content/guides/tg.pdf
index faa9305..b634b26 100644
--- a/content/guides/tg.pdf
+++ b/content/guides/tg.pdf
@@ -4,16 +4,16 @@
 << /Title (Tutorials)
 /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:20170219155203+00'00')
-/ModDate (D:20170219155203+00'00')
+/CreationDate (D:20170307234228+00'00')
+/ModDate (D:20170307234228+00'00')
 >>
 endobj
 2 0 obj
 << /Type /Catalog
 /Pages 3 0 R
 /Names 16 0 R
-/Outlines 490 0 R
-/PageLabels 546 0 R
+/Outlines 489 0 R
+/PageLabels 545 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 38
-/Kids [7 0 R 10 0 R 12 0 R 14 0 R 23 0 R 35 0 R 43 0 R 52 0 R 58 0 R 63 0 R 72 0 R 76 0 R 80 0 R 83 0 R 89 0 R 94 0 R 98 0 R 104 0 R 108 0 R 111 0 R 117 0 R 122 0 R 128 0 R 141 0 R 149 0 R 153 0 R 160 0 R 171 0 R 188 0 R 215 0 R 239 0 R 260 0 R 309 0 R 320 0 R 335 0 R 347 0 R 364 0 R 374 0 R]
+/Kids [7 0 R 10 0 R 12 0 R 14 0 R 23 0 R 35 0 R 42 0 R 51 0 R 57 0 R 62 0 R 71 0 R 75 0 R 79 0 R 82 0 R 88 0 R 93 0 R 97 0 R 103 0 R 107 0 R 110 0 R 116 0 R 121 0 R 127 0 R 140 0 R 148 0 R 152 0 R 159 0 R 170 0 R 187 0 R 214 0 R 238 0 R 259 0 R 308 0 R 319 0 R 334 0 R 346 0 R 363 0 R 373 0 R]
 >>
 endobj
 4 0 obj
@@ -78,13 +78,13 @@ endobj
 endobj
 8 0 obj
 << /Type /Font
-/BaseFont /AAAACQ+NotoSerif
+/BaseFont /AAAACI+NotoSerif
 /Subtype /TrueType
-/FontDescriptor 548 0 R
+/FontDescriptor 547 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 550 0 R
-/ToUnicode 549 0 R
+/Widths 549 0 R
+/ToUnicode 548 0 R
 >>
 endobj
 9 0 obj
@@ -1673,7 +1673,7 @@ endobj
 /F3.0 30 0 R
 >>
 >>
-/Annots [380 0 R 381 0 R 382 0 R 383 0 R 384 0 R 385 0 R 386 0 R 387 0 R 388 0 R 389 0 R 390 0 R 391 0 R 392 0 R 393 0 R 394 0 R 395 0 R 396 0 R 397 0 R 398 0 R 399 0 R 400 0 R 401 0 R 402 0 R 403 0 R 404 0 R 405 0 R 406 0 R 407 0 R 408 0 R 409 0 R 410 0 R 411 0 R 412 0 R 413 0 R 414 0 R 415 0 R 416 0 R 417 0 R 418 0 R 419 0 R 420 0 R 421 0 R 422 0 R 423 0 R 424 0 R 425 0 R 426 0 R 427 0 R 428 0 R 429 0 R 430 0 R 431 0 R 432 0 R 433 0 R 434 0 R 435 0 R 436 0 R 437 0 R 438 0 R 439 0 R 440 0 R 441 0 R 442 0 R 443 0 R 444 0 R 445 0 R 446 0 R 447 0 R 448 0 R 449 0 R 450 0 R 451 0 R 452 0 R 453 0 R 454 0 R 455 0 R 456 0 R 457 0 R 458 0 R]
+/Annots [379 0 R 380 0 R 381 0 R 382 0 R 383 0 R 384 0 R 385 0 R 386 0 R 387 0 R 388 0 R 389 0 R 390 0 R 391 0 R 392 0 R 393 0 R 394 0 R 395 0 R 396 0 R 397 0 R 398 0 R 399 0 R 400 0 R 401 0 R 402 0 R 403 0 R 404 0 R 405 0 R 406 0 R 407 0 R 408 0 R 409 0 R 410 0 R 411 0 R 412 0 R 413 0 R 414 0 R 415 0 R 416 0 R 417 0 R 418 0 R 419 0 R 420 0 R 421 0 R 422 0 R 423 0 R 424 0 R 425 0 R 426 0 R 427 0 R 428 0 R 429 0 R 430 0 R 431 0 R 432 0 R 433 0 R 434 0 R 435 0 R 436 0 R 437 0 R 438 0 R 439 0 R 440 0 R 441 0 R 442 0 R 443 0 R 444 0 R 445 0 R 446 0 R 447 0 R 448 0 R 449 0 R 450 0 R 451 0 R 452 0 R 453 0 R 454 0 R 455 0 R 456 0 R 457 0 R]
 >>
 endobj
 11 0 obj
@@ -2296,7 +2296,7 @@ endobj
 /Font << /F1.0 8 0 R
 >>
 >>
-/Annots [459 0 R 460 0 R 461 0 R 462 0 R 463 0 R 464 0 R 465 0 R 466 0 R 467 0 R 468 0 R 469 0 R 470 0 R 471 0 R 472 0 R 473 0 R 474 0 R 475 0 R 476 0 R 477 0 R 478 0 R 479 0 R 480 0 R 481 0 R 482 0 R 483 0 R 484 0 R 485 0 R 486 0 R 487 0 R 488 0 R]
+/Annots [458 0 R 459 0 R 460 0 R 461 0 R 462 0 R 463 0 R 464 0 R 465 0 R 466 0 R 467 0 R 468 0 R 469 0 R 470 0 R 471 0 R 472 0 R 473 0 R 474 0 R 475 0 R 476 0 R 477 0 R 478 0 R 479 0 R 480 0 R 481 0 R 482 0 R 483 0 R 484 0 R 485 0 R 486 0 R 487 0 R]
 >>
 endobj
 13 0 obj
@@ -2577,7 +2577,7 @@ endobj
 /Font << /F2.0 18 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 489 0 R
+/XObject << /Stamp1 488 0 R
 >>
 >>
 /Annots [19 0 R 20 0 R 21 0 R]
@@ -2592,18 +2592,18 @@ endobj
 >>
 endobj
 17 0 obj
-<< /Kids [137 0 R 337 0 R 138 0 R 190 0 R 369 0 R]
+<< /Kids [136 0 R 336 0 R 137 0 R 189 0 R 368 0 R]
 >>
 endobj
 18 0 obj
 << /Type /Font
-/BaseFont /AAAACR+NotoSerif-Bold
+/BaseFont /AAAACJ+NotoSerif-Bold
 /Subtype /TrueType
-/FontDescriptor 552 0 R
+/FontDescriptor 551 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 554 0 R
-/ToUnicode 553 0 R
+/Widths 553 0 R
+/ToUnicode 552 0 R
 >>
 endobj
 19 0 obj
@@ -3142,7 +3142,7 @@ endobj
 /F3.0 30 0 R
 >>
 /XObject << /I1 27 0 R
-/Stamp1 489 0 R
+/Stamp1 488 0 R
 >>
 >>
 /Annots [25 0 R 26 0 R 29 0 R 31 0 R 33 0 R]
@@ -3307,13 +3307,13 @@ endobj
 endobj
 30 0 obj
 << /Type /Font
-/BaseFont /AAAACS+mplus1mn-regular
+/BaseFont /AAAACK+mplus1mn-regular
 /Subtype /TrueType
-/FontDescriptor 556 0 R
+/FontDescriptor 555 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 558 0 R
-/ToUnicode 557 0 R
+/Widths 557 0 R
+/ToUnicode 556 0 R
 >>
 endobj
 31 0 obj
@@ -3342,7 +3342,7 @@ endobj
 >>
 endobj
 34 0 obj
-<< /Length 16438
+<< /Length 11949
 >>
 stream
 q
@@ -3611,18 +3611,7 @@ Q
 BT
 59.24000000000001 513.0450000000001 Td
 /F3.0 11 Tf
-<6d766e206172636865747970653a67656e65726174652020> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
-
-BT
-191.24 513.0450000000001 Td
-/F3.0 11 Tf
-<5c> Tj
+<6d766e206172636865747970653a67656e657261746520205c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3633,51 +3622,7 @@ ET
 BT
 59.24000000000001 498.3050000000001 Td
 /F3.0 11 Tf
-<ca2020202d4420> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-97.74000000000001 498.3050000000001 Td
-/F3.0 11 Tf
-<61726368657479706547726f75704964> 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
-185.74 498.3050000000001 Td
-/F3.0 11 Tf
-<3d> 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
-191.24 498.3050000000001 Td
-/F3.0 11 Tf
-<6f72672e6170616368652e697369732e61726368657479706520> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
-
-BT
-334.24 498.3050000000001 Td
-/F3.0 11 Tf
-<5c> Tj
+<ca2020202d442061726368657479706547726f757049643d6f72672e6170616368652e697369732e617263686574797065205c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3688,51 +3633,7 @@ ET
 BT
 59.24000000000001 483.5650000000001 Td
 /F3.0 11 Tf
-<ca2020202d4420> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-97.74000000000001 483.5650000000001 Td
-/F3.0 11 Tf
-<61726368657479706541727469666163744964> 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
-202.24 483.5650000000001 Td
-/F3.0 11 Tf
-<3d> 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.74 483.5650000000001 Td
-/F3.0 11 Tf
-<73696d706c656170702d61726368657479706520> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
-
-BT
-317.74 483.5650000000001 Td
-/F3.0 11 Tf
-<5c> Tj
+<ca2020202d4420617263686574797065417274696661637449643d73696d706c656170702d617263686574797065205c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3743,51 +3644,7 @@ ET
 BT
 59.24000000000001 468.8250000000001 Td
 /F3.0 11 Tf
-<ca2020202d4420> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-97.74000000000001 468.8250000000001 Td
-/F3.0 11 Tf
-<61726368657479706556657273696f6e> 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
-185.74 468.8250000000001 Td
-/F3.0 11 Tf
-<3d> 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
-191.24 468.8250000000001 Td
-/F3.0 11 Tf
-<312e31332e3120> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
-
-BT
-229.74 468.8250000000001 Td
-/F3.0 11 Tf
-<5c> Tj
+<ca2020202d442061726368657479706556657273696f6e3d312e31332e31205c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3798,51 +3655,7 @@ ET
 BT
 59.24000000000001 454.0850000000001 Td
 /F3.0 11 Tf
-<ca2020202d4420> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-97.74000000000001 454.0850000000001 Td
-/F3.0 11 Tf
-<67726f75704964> 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
-136.24 454.0850000000001 Td
-/F3.0 11 Tf
-<3d> 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
-141.74 454.0850000000001 Td
-/F3.0 11 Tf
-<636f6d2e6d79636f6d70616e7920> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
-
-BT
-218.74 454.0850000000001 Td
-/F3.0 11 Tf
-<5c> Tj
+<ca2020202d442067726f757049643d636f6d2e6d79636f6d70616e79205c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3853,51 +3666,7 @@ ET
 BT
 59.24000000000001 439.34500000000014 Td
 /F3.0 11 Tf
-<ca2020202d4420> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-97.74000000000001 439.34500000000014 Td
-/F3.0 11 Tf
-<61727469666163744964> 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
-152.74 439.34500000000014 Td
-/F3.0 11 Tf
-<3d> 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
-158.24 439.34500000000014 Td
-/F3.0 11 Tf
-<706574636c696e696320> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
-
-BT
-213.24 439.34500000000014 Td
-/F3.0 11 Tf
-<5c> Tj
+<ca2020202d4420617274696661637449643d706574636c696e6963205c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3908,51 +3677,7 @@ ET
 BT
 59.24000000000001 424.60500000000013 Td
 /F3.0 11 Tf
-<ca2020202d4420> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-97.74000000000001 424.60500000000013 Td
-/F3.0 11 Tf
-<76657273696f6e> 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
-136.24 424.60500000000013 Td
-/F3.0 11 Tf
-<3d> 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
-141.74 424.60500000000013 Td
-/F3.0 11 Tf
-<312e302d534e415053484f5420> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
-
-BT
-213.24 424.60500000000013 Td
-/F3.0 11 Tf
-<5c> Tj
+<ca2020202d442076657273696f6e3d312e302d534e415053484f54205c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3963,51 +3688,7 @@ ET
 BT
 59.24000000000001 409.8650000000001 Td
 /F3.0 11 Tf
-<ca2020202d4420> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-97.74000000000001 409.8650000000001 Td
-/F3.0 11 Tf
-<6172636865747970655265706f7369746f7279> 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
-202.24 409.8650000000001 Td
-/F3.0 11 Tf
-<3d> 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.74 409.8650000000001 Td
-/F3.0 11 Tf
-<687474703a2f2f7265706f7369746f72792d6573746174696f2e666f7267652e636c6f7564626565732e636f6d2f736e617073686f742f20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
-
-BT
-515.74 409.8650000000001 Td
-/F3.0 11 Tf
-<5c> Tj
+<ca2020202d44206172636865747970655265706f7369746f72793d687474703a2f2f7265706f7369746f72792d6573746174696f2e666f7267652e636c6f7564626565732e636f6d2f736e617073686f742f205c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4152,29 +3833,7 @@ Q
 BT
 59.24000000000001 251.26500000000013 Td
 /F3.0 11 Tf
-<6d7620706574636c696e69632f> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
-
-BT
-130.74 251.26500000000013 Td
-/F5.0 11 Tf
-<2a> 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
-136.24 251.26500000000013 Td
-/F3.0 11 Tf
-<202e> Tj
+<6d7620706574636c696e69632f2a202e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4295,9 +3954,8 @@ endobj
 /F2.0 18 0 R
 /F4.1 39 0 R
 /F3.0 30 0 R
-/F5.0 40 0 R
 >>
-/XObject << /Stamp1 489 0 R
+/XObject << /Stamp1 488 0 R
 >>
 >>
 /Annots [36 0 R 37 0 R]
@@ -4330,30 +3988,19 @@ endobj
 endobj
 39 0 obj
 << /Type /Font
-/BaseFont /AAAACT+FontAwesome
+/BaseFont /AAAACL+FontAwesome
 /Subtype /TrueType
-/FontDescriptor 560 0 R
+/FontDescriptor 559 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 562 0 R
-/ToUnicode 561 0 R
+/Widths 561 0 R
+/ToUnicode 560 0 R
 >>
 endobj
 40 0 obj
-<< /Type /Font
-/BaseFont /AAAACU+mplus1mn-bold
-/Subtype /TrueType
-/FontDescriptor 564 0 R
-/FirstChar 32
-/LastChar 255
-/Widths 566 0 R
-/ToUnicode 565 0 R
->>
-endobj
-41 0 obj
 [35 0 R /XYZ 0 210.61000000000013 null]
 endobj
-42 0 obj
+41 0 obj
 << /Length 4484
 >>
 stream
@@ -4599,24 +4246,24 @@ Q
 
 endstream
 endobj
-43 0 obj
+42 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 42 0 R
+/Contents 41 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F3.0 30 0 R
 /F1.0 8 0 R
 /F2.0 18 0 R
 >>
-/XObject << /I2 48 0 R
-/Stamp1 489 0 R
+/XObject << /I2 47 0 R
+/Stamp1 488 0 R
 >>
 >>
-/Annots [44 0 R 45 0 R 47 0 R 49 0 R]
+/Annots [43 0 R 44 0 R 46 0 R 48 0 R]
 >>
 endobj
-44 0 obj
+43 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -4627,7 +4274,7 @@ endobj
 /Type /Annot
 >>
 endobj
-45 0 obj
+44 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -4638,10 +4285,10 @@ endobj
 /Type /Annot
 >>
 endobj
-46 0 obj
-[43 0 R /XYZ 0 610.33 null]
+45 0 obj
+[42 0 R /XYZ 0 610.33 null]
 endobj
-47 0 obj
+46 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -4652,7 +4299,7 @@ endobj
 /Type /Annot
 >>
 endobj
-48 0 obj
+47 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 651
@@ -4714,7 +4361,7 @@ I7?\u03e7
 \ufffd\ufffd�\ufffdR[\ufffd:Q> \ufffdrW\ufffd\ufffd\u0798.\ufffd\ufffd\ufffd\ufffdA\ufffd\u0313B:�\ufffd\ufffd@\ufffdX\ufffd6\ufffd9\ufffdK\ufffd\ufffd>\ufffd~\ufffdi\ufffd\ufffd\ufffdzf4?\ufffdI\ufffdx\u3c41\ufffd\ufffdl\ufffd I\ufffd\ufffd\ufffd\ufffdm\ufffd\ufffd\ufffd\ufffd\ufffd
i\ufffd\*\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdHq\ufffd}\ufffd\ufffdL\ufffdL\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u0253_^\ufffd]=\ufffdq\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdW\ufffdJ;\ufffd'\ufffd\ufffd-\ufffd\ufffdys\ufffd\ufffd\u0507\ufffd}w\ufffd|\ufffdY\ufffd\ufffd<\ufffd\ufffd3<:\ufffd\ufffd\ufffd\ufffd/Q\ufffd\ufffdH\ufffd\ufffd\ufffdD\ufffd\ufffdZ\ufffdv\ufffd\ufffd\ufffd\ufffd$\ufffd7W\ufffdy\ufffdh%\ufffd'\ufffd\ufffd\ufffdO\ufffdsn\ufffd|\ufffd\ufffd\y\ufffd\ufffd\ufffdeO\ufffd\u04bd\ufffd\u024f\ufffd\ufffd\u0441\ufffd3\u0253'J\ufffd\ufffd\ufffd\ufffd\\ufffd\ufffd\ufffdO\ufffd]\ufffd.\ufffdo\8{\ufffdt@\ufffd\ufffd\ufffd\ufffd\ufffdG\ufffd8\ufffd\ufffd,\ufffdy"Igxt\ufffdH\ufffd7\ufffdo)\ufffdu\ufffd\ufffd\ufffd\ufffd\ufffdsS\ufffd\u04adS\ufffd\u4553\u03a5m\u3daf\ufffdLO\ufffd.v\ufffd\ufffdl\ufffd(\ufffdz\ufffd=\ufffd?2~{\ufffd\ufffd\ufffd/\ufffd\ufffd\ufffd\ufffd\ufffd}\ufffd\ufffd\ufffdJg\ufffdT\ufffd\ufffd <"\ufffd\ufffd\ufffd\ufffd]\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdr\ufffd\ufffd\u033c\ufffd=\ufffd;9rx\u3f03WT:<\ufffdI\ufffdx\ufffd6\ufffd//\u075e\ufffd\ufffddtw\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdo\ufffd,\ufffd.\ufffd+mB\ufffd\ufffd\u0471\ufffd\ufffd\ufffd\ufffd\ufffdK3\ufffdi\ufffdX:\ufffd)\ufffdHJ\ufffd\u0359\ufffd\ufffd\ufffd\ufffd\ufffd\U00085271\ufffd\ufffd7\ufffd\ufffd\ufffd);V\ufffd\ufffd4\ufffd\ufffd\ufffd\u04b9t\ufffd\ufffd\u0149W\ufffd\ufffd\ufffd\ufffd=W\ufffd&8]\ufffd<\ufffduq\u67c5\ufffd\ufffd
 /JG\ufffd\ufffd\ufffd\ufffd3\ufffd\u073ct>\ufffd\ufffd\ufffd\u01fd\ufffd\ufffdb\ufffd\ufffd\ufffd\ufffdHg\ufffd\ufffdD:)\ufffd\ufffd\ufffd\u0153\ufffd(mB\ufffd\u05dd\ufffdV<\ufffd\ufffdo\ufffdL\ufffd\\ufffd\ufffd\ufffd	\ufffdr\ufffd\ufffd@\ufffdG-\ufffdm\ufffd&\ufffd\ufffd}\ufffdm\ufffd\ufffd\ufffd\ufffd3?'\ufffd\ufffdx|\ufffd+\ufffdxrIg E\u0343X:\ufffdIg E\u0343X:\ufffdIg E\u0343X:\ufffdIg E\u0343X:\ufffdIg E\u0343X:\ufffdIg E\u0343X:\ufffdIg \ufffd/\ufffd\ufffd\ufffd\ufffd\ufffd]\u0373x\ufffdIV\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd[?8p\ufffd\ufffd|\ufffd$\ufffdJ\ufffdV\ufffdO\ufffd\ufffd"\ufffd\ufffd\ufffd\ufffd\ufffd%	\u04d5\\u03d5\ufffd}\ufffd\u05d9
\ufffd\u03bf\ufffdM"u\ufffd\ufffdseI_\ufffd\ufffd\ufffd\ufffd4X.\ufffdH\ufffd\ufffd\ufffd/\ufffd\ufffd\ufffd'\ufffd\ufffd&Y\ufffd\7W$\ufffd\ufffd\ufffdpk\ufffdsy\ufffd$\ufffd\ufffd\ufffd\ufffd\ufffdt\ufffd\ufffd!\ufffdB\ufffd3\ufffdHg\ufffd\ufffd"\ufffd D:@\ufffdt\ufffd\ufffd!\ufffdB\ufffd3\ufffdHg\ufffd\ufffd"\ufffd D:@\ufffdt\ufffd\ufffd!\ufffdB\ufffd3\ufffdHg\ufffd\ufffd"\ufffd D:@\ufffdt\ufffd\ufffd!\ufffdB\ufffd3\ufffdHg\ufffd\ufffd"\ufffd D:@\ufffdt\ufffd\ufffd!\ufffdB\ufffd3\ufffdHg\ufffd\ufffd"\ufffd D:@\ufffdt\ufffd\ufffd!\ufffdB\ufffd3\ufffdHg\ufffd\ufffd"\ufffd D:@\ufffdt\ufffd\ufffd!\ufffdB\ufffd3\ufffdHg\ufffd\ufffd"\ufffd D:@\ufffdt\ufffd\ufffd!\ufffdB\ufffd3\ufffdHg\ufffd\ufffd"\ufffd D:@\ufffdt\ufffd\ufffd!
 B\ufffd3\ufffdHg\ufffd\ufffd"\ufffd D:@\ufffdt\ufffd\ufffd!\ufffdB\ufffd3\ufffdHg\ufffd\ufffd"\ufffd D:@\ufffdt\ufffd\ufffd!\ufffdB\ufffd3\ufffdHg\ufffd\ufffd"\ufffd D:@\ufffdt\ufffd\ufffd!\ufffdB\ufffd3\ufffdHg\ufffd\ufffd"\ufffd D:@\ufffdt\ufffd\ufffd!\ufffdB\ufffd3\ufffdHg\ufffd\ufffd"\ufffd D:@\ufffdt\ufffd\ufffd!\ufffdB\ufffd3\ufffdHg\ufffd\ufffd"\ufffd D:@\ufffdt\ufffd\ufffd!\ufffdB\ufffd3\ufffdHg\ufffd\ufffd"\ufffd D:@\ufffdt\ufffd\ufffd!\ufffdB\ufffd3\ufffdHg\ufffd\ufffd"\ufffd D:@\ufffdt\ufffd\ufffd!\ufffdB\ufffd3\ufffdHg\ufffd\ufffd"\ufffd D:@\ufffdt\ufffd\ufffd!\ufffdB\ufffd3\ufffdHgy\ufffdt>\ufffd\ufffd\ufffd\ufffd\ufffd_\ufffd\ufffd5)\ufffd\ufffd$\ufffdC\ufffd|\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd6\ufffdc\ufffd1fMM\ufffd\ufffdI'IJ\u7d8e\ufffd&\ufffd&\ufffd\ufffd\ufffdc\ufffd1\ufffdc\u031a\ufffd$\ufffd\ufffdN\ufffd8\ufffd\ufffd\ufffdc\ufffd1\u0198E#\ufffd\ufffd1\ufffdc\ufffd	\ufffdt6\ufffdc\ufffd1&4\ufffd\ufffdc\ufffd1\u0198\ufffdHgc\ufffd1\ufffdcB3\ufffd\ufffd\ufffdc\ufffd1\u0198\ufffd\ufffd	R\ufffd\ufffd
 endstream
 endobj
-49 0 obj
+48 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -4725,7 +4372,7 @@ endobj
 /Type /Annot
 >>
 endobj
-50 0 obj
+49 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 651
@@ -4882,7 +4529,7 @@ r/
 \ufffd\ufffd\ufffd\ufffddsS`J\ufffdMzN\u04a2s2\ufffda\ufffd\ufffd3\ufffd(;\ufffd=\ufffd\ufffd\ufffdj\ufffd\ufffd&\ufffd\ufffd\ufffd\ufffd\ufffdP\ufffdX\ufffd\ufffd\ufffd\u052co'"S\ufffdL\ufffd\u5967\ufffdf\ufffd}al^\ufffd0v\ufffd\ufffd\ufffd\ufffd^\ufffd\ufffdj\ufffdr-\ufffdM\ufffd\ufffd\ufffd\ufffdZ\ufffd\ufffd\ufffd\u06fd\ufffd\ufffdv\ufffdEgq\ufffd\ufffd\ufffd\ufffd\ufffdq\ufffd\ufffdf\ufffd\ufffd\ufffdb\ufffd\ufffd\ufffd)\ufffd\ufffd\ufffdW\ufffd\ufffd\ufffduqx\ufffd\ufffdG/\ufffd\ufffd\ufffd's\ufffd:\ufffd\ufffd\ufffd\ufffd\ufffdg[t\u05aa\ufffdm\ufffdJ.�HR\ufffd9_J\ufffdKP\ufffd\ufffd\ufffd_ZZ{f\ufffd\ufffd\ufffd^\ufffdJ(1\ufffdc\ufffd#;\ufffd\ufffdo	\ufffd\u056fj\ufffd\ufffd'u\ufffd\ufffd\ufffd<=p\ufffd\\ufffdZ\ufffd\ufffd\ufffd;\ufffd\ufffdt\ufffdWBqy-i\ufffd\ufffd_\ufffd.\ufffd%\ufffd1\ufffdq\ufffdh_W\ufffd\ufffd
\ufffd\ufffd\ufffdz\ufffd+\ufffd,':cka^g\ufffd\ufffd6be\ufffd:\ufffd\ufffd\ufffd\ufffd\ufffd~Y*2\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdP\ufffd\ufffdS\ufffdEr\ufffd\ufffd\ufffd\ufffd\ufffdC\ufffd\ufffd\ufffd9\ufffd\uadcb\ufffd\u798a]re\ufffd\ufffd\ufffd9,\ufffd.v\ufffd\ufffd\ufffd\u04e3\ufffdG\ufffd\ufffdR,Iu\ufffd\ufffd\ufffdz\ufffd\ufffd\ufffd\ufffdGk\ufffd\ufffdv\ufffd\ufffd\ufffdp\ufffd\ufffdT\ufffd\ufffd\ufffdXB\ufffd-\ufffd\ufffd*\ufffd2SaH\ufffd\ufffd5\ufffdBf\ufffd*-RO\ufffdM\ufffdM\ufffd\ufffd7i\ufffd3i\u0195\ufffd\ufffd\ufffd\ufffd\u04fd\u02d7"\ufffd\ufffdBd\ufffd\ufffddS\ufffdyyK`6\ufffd\ufffd
\i9\ufffd\ufffd^\ufffd_TK\ufffd\ufffd\ufffd'\ufffdNg\ufffd\ufffd\ufffd\ufffdQKO4)\ufffd|\ufffd\u020e\ufffd\ufffdy\ufffd\ufffd\ufffd\ufffd\ufffdw]\ufffd\ufffd\ufffdG;~s'\ufffdd\ufffd\ufffd\ufffd\ufffd@t\ufffd\ufffd\ufffdG\ufffd\ufffdKEg\ufffd:\u0692\u0660*\ufffd\ufffd
 "\ufffd.f^\ufffd\ufffdn\ufffdFr
\ufffd\u040eG\ufffd\ufffd"*\ufffd~V"\ufffd\ufffd6]<\ufffd\ufffd1@\ufffd~L+/\ufffd^\ufffd\ufffdNK[{\ufffdo\ufffdQ=Dgl-Dg\ufffd\ufffd6bYl\ufffd+:\ufffdV\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdv\ufffd*\ufffd\ufffd\\ufffd\ufffd>\ufffd/\ufffd)\ufffd\ufffd\ufffd\ufffd\u02b2,\ufffd\ufffd\ufffd}\ufffd4\ufffd\ufffd\u0775\ufffd\ufffd%\ufffd\ufffd{\ufffd\ufffd\ufffd\ufffd\ufffdj\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdsD\ufffd\ufffd\u05abac\ufffdER-:\ufffd\ufffd\ufffdo\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u04de@d:!\ufffdL\ufffd\ufffd\ufffd7y\ufffd\ufffd?\ufffdG\ufffd\ufffdK\ufffd\u014aJ\ufffd h\ufffd\ufffd,\ufffd\ufffd\ufffd\ufffd\ufffd+\ufffd\ufffdn\ufffdX\ufffd>\ufffd\u0621\ufffdy\ufffd\ufffdG\ufffd\ufffdp.\ufffd\ufffd
\u0630E\u71b3\ufffd3rE2\ufffd':WU\ufffd&-\ufffdQ\ufffd\ufffd3C\ufffd\\ufffd.\ufffd\ufffd}\ufffd\ufffd\ufffd\ufffd\ufffdY\ufffdY\u06d4\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdpz&:ck!:S\ufffd+Gt\ufffd1`C\ufffd>rH\ufffd\ufffd\ue1cdM\ufffd\ufffd\ufffd\u0295\ufffd\ufffd$5$c\ufffdo\ufffd\ufffd-WW|\ufffd\u06b7\ufffd\u02df\ufffd\u01efvk?\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u0638-:\u0730]\ufffd\ufffdg\u7ff8RYY\ufffd8\ufffd1l\ufffd\ufffd\ufffd
1H#\ufffd\u04d4^rE\ufffd\ufffd{a\ufffd\ufffd\ufffd\ufffd.N\ufffdEn\ufffdD\ufffd7\ufffd\ufffd?\ufffd\ufffdl4\ufffd\ufffd\ufffd)\u03d1\ufffdN\ufffd\ufffd,N\ufffd\ufffdQ\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd{\ufffd\ufffdg\ufffd!F\ufffdJ-op\ufffd\ufffd\ufffd\ufffd/:D\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdbb\ufffdJ\ufffdWg \ufffd\ufffd\ufffdr<\ufffd;<\ufffd\ufffdt\ufffd\ufffd\ufffdq)b|\ufffdK\ufffd\u0479\ufffd>=\ufffdd\ufffd\ufffd\ufffd\ufffd\\ufffd\u03ea\ufffd\ufffd\ufffd-w\ufffd-\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd
 \ufffd\ufffd \ufffd\ufffdK\ufffd\ufffd\ufffd\\ufffdX\ufffd\ufffd=b\ufffd\ufffdS#\ufffdz\ufffd\ufffd\ufffd}\ufffd>l}L\ufffdiS\ufffd\ufffdz\u0719\ufffdG\ufffd\ufffd\ufffdeCc0\ufffd[/xJEg\ufffd\ufffd\ufffd\ufffd\ufffdB\ufffd\ufffd+\ufffd\ufffd/H\ufffd\u072c+\ufffd\ufffd\ufffd\ufffd\ufffdZ\ufffd\ufffdEm\ufffd\ufffd\ufffd\ufffdn\ufffd\ufffd\ufffd5z\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u02af\ufffd\u079fZ\ufffd\ufffd\ufffd\ufffd{\ufffd}\u027b{\ufffd\ufffd?>\ufffd\ufffd\ufffd\ufffd_\ufffd\ufffdp\ufffd\ufffd\ufffd�\ufffd\u07eb\ufffd\ufffd\ufffdm\ufffd\ufffd\ufffd\ufffd\ufffd\u057f\ufffd\ufffd\ufffd\ufffd\u05ea?2\ufffd\ufffdX\ufffd6\ufffd\ufffd\ufffdl\ufffd4\ufffdD\ufffd(\u01ef\ufffd	\ufffd\ufffd>\ufffdk\ufffd\ufffd8#\ufffd9~>Fge\ufffdj\ufffd\ufffd\u0326z+\ufffd\u0579\ufffd3\u02cf\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd:\ufffd|\ufffd\ufffd�@Kf\ufffd\ufffdS\ufffd}l\ufffd
\ufffd/\ufffdu\ufffd\ufffd:\ufffd\ufffd\ufffd!\ufffd\ufffdvM,NMw\u0445.\ufffd\ufffd~K\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd3\ufffd\ufffd\u0122\ufffd \ufffd\ufffd\ufffd\ufffd!\ufffdQ\u07e6iLs*:)\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffde\ufffd\ufffdS\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd9W,n\ufffdNG\ufffdj\ufffd\ufffd\ufffd\ufffdl\ufffd\ufffd\\ufffdYH\ufffd\ufffd0N\ufffd\ufffd\uc431\ufffdx\ufffd\ufffdlsz\ufffd\ufffds\u030e\ufffdE\ufffd\ufffd\ufffd\ufffdD\ufffd^RWm\ufffd\ufffd}\ufffdJ\ufffd\ufffd\ufffd\u0461S+\ufffdCt\ufffd\ufffdBt\ufffd(\ufffdz\ufffds\ufffd\ufffd\ufffd\ufffdW\ufffdHYj\ufffd\ufffdH\ufffd\ufffdm\ufffdZ\ufffd?\ufffd\ufffd\ufffdG\ufffd\ufffd\ufffdg\ufffdy\ufffdj\ufffd\ufffd":ck!:SE\ufffd~\ufffd\ufffd\u07e8x\ufffd`\ufffd":\ufffdp9v\ufffd\ufffd@5:\ufffd\ufffd\ufffd\u03b5\ufffd\u03b5\ufffd\ufffd\ufffd\ufffdO\ufffd\ufffd}\ufffd)\ufffd
 ZF\ufffd@_\ufffd\ufffd\ufffd\ufffdK\ufffdI\ufffd\ufffdbtN$\ufffd\ufffd\ufffd\ufffd\ufffdO\ufffd\ufffd(\ufffd\ufffd\ufffdU\ufffdetn\ufffd\ufffdGFF\ufffd\u9c01W@%:k\u05e4ve\ufffd\ufffd\ufffd\u36bf?)\ufffd\ufffd(\ufffdZW\ufffd\ufffd\u0479H\ufffd\ufffd@_\ufffd \ufffd\ufffdh\ufffd$\ufffd\ufffd\ufffd(\ufffd\ufffd\ufffd\ufffdZ\ufffd\ufffdLQEQEQ\ufffd\ufffd\ufffdEQEQ\ufffdTDg\ufffd\ufffd(\ufffd\ufffd(\ufffdR*\ufffd3EQEQE)\u0459\ufffd(\ufffd\ufffd(\ufffd\ufffd\ufffd\ufffd\ufffdLQEQEQJEt\ufffd(\ufffd\ufffd(\ufffd\ufffd(\ufffd":SEQEQ\ufffdR\ufffd)\ufffd\ufffd(\ufffd\ufffd(J\ufffd\ufffd\ufffdEQEQ\ufffdTDg\ufffd\ufffd(\ufffd\ufffd(\ufffdR*\ufffd3EQEQE)\u0459\ufffd(\ufffd\ufffd(\ufffd\ufffd\ufffdjy\ufffd\ufffd\ufffd\ufffd\ufffd\u053f\ufffd\ufffd\ufffd\ufffd-I\ufffdZ$V\ufffd\ufffdW\ufffd\ufffdoZ\ufffd\u059e\ufffd\ufffdm\ufffd\ufffd(\ufffd\ufffd(\ufffd\ufffdR\ufffd\ufffd`-k\ufffdX):_\ufffd\ufffdW[U\ufffd\ufffds(\ufffd\ufffd(\ufffd\ufffd(jK\ufffd\ufffd\ufffd0\ufffdEb\ufffd\ufffdLQEQEQ\ufffd\ufffd\ufffd\ufffdEQEQ\ufffdTDg\ufffd\ufffd(\ufffd\ufffd(\ufffdR*\ufffd3EQEQE)\u0459\ufffd(\ufffd\ufffd(\ufffd\ufffd\ufffd\u0288\ufffdEQEQE-Y\ufffd\ufffd\ufffd<
 endstream
 endobj
-51 0 obj
+50 0 obj
 << /Length 1487
 >>
 stream
@@ -4989,24 +4636,24 @@ Q
 
 endstream
 endobj
-52 0 obj
+51 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 51 0 R
+/Contents 50 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/XObject << /I3 50 0 R
-/I4 54 0 R
-/Stamp1 489 0 R
+/XObject << /I3 49 0 R
+/I4 53 0 R
+/Stamp1 488 0 R
 >>
 /Font << /F1.0 8 0 R
 /F3.0 30 0 R
 >>
 >>
-/Annots [53 0 R 55 0 R]
+/Annots [52 0 R 54 0 R]
 >>
 endobj
-53 0 obj
+52 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -5017,7 +4664,7 @@ endobj
 /Type /Annot
 >>
 endobj
-54 0 obj
+53 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 651
@@ -5162,7 +4809,7 @@ W
 \ufffdt\ufffd$I\ufffd\ufffd*LgI\ufffd$I\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd
 endstream
 endobj
-55 0 obj
+54 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -5173,7 +4820,7 @@ endobj
 /Type /Annot
 >>
 endobj
-56 0 obj
+55 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 651
@@ -5341,7 +4988,7 @@ Er
 Z\ufffd\ufffd}\ufffdY\ufffd\ufffd\u0728/\ufffd\ufffd\ufffd\u0657H\ufffd/\ufffd_\ufffd\ufffdH\ufffdk\ufffd\ufffd.Q\ufffd}\ufffdjfI\ufffd\ufffdd\ufffdWf?P\ufffd>\ufffdd\ufffd\ufffd\ufffd\ufffdk`%z\ufffd8\ufffdkS\ufffd^\ufffd\ufffdY\ufffd\u056d\ufffdG\ufffd\ufffdUW\ufffd\ufffd\ufffdDg\ufffd\ufffdRY\ufffds\ufffd\ufffdZ:?|\ufffdTY\ufffd\ufffd\ufffdk\ufffdz\ufffdX|\ufffd\ufffd\ufffd\ufffdS\ufffd\ufffd{\ufffdO\ufffd\ufffd;\ufffd\ufffd\ufffd\ufffd;\ufffd=\ufffd\ufffd/\ufffdN\ufffdI\ufffd\ufffd\ufffd\ufffd~&3\ufffd\ufffdt\ufffdN5\ufffd\ufffd\ufffd\ufffd\ufffd0~\ufffd\u05fe\ufffdQ_-\ufffd_\ufffdrFlH{\ufffd\ufffd\ufffd\ufffd\ufffdVgt\ufffd\ufffd\ufffd\ufffd\ufffd~\ufffd\ufffd_\ufffd\ufffd\u0792\ufffd\ufffd@v\ufffdE\ufffd.\ufffd?Yr\ufffd\ufffd,%\ufffd\ufffd\ufffd#Zl\ufffds\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd-\ufffd\ufffd
\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd88\ufffdY\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd	\ufffdX\ufffd\ufffd\ufffd\u07a1\ufffd')S\ufffdL\ufffd\u0555WG\ufffd\u05cd}kfM\ufffd06jF\ufffd\/fu{W\ufffd\ufffdq-\ufffd-\ufffd\ufffd7\u05b7w9C\ufffd5:\ufffdc\ufffd\ufffd\ufffdEg\ufffdN\ufffd\ufffd|\ufffd\ufffdG}\ufffdY\ufffd\ufffdb\ufffd\ufffdc\ufffdAho-2\ufffdA\u047cF\ufffd\ufffd\ufffdw\\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdo\ufffdSu\ufffd1\ufffd\ufffd\ufffd\ufffd\ufffd~\u04f3\ufffd\ufffdp8\ufffd\ufffd\ufffd\ufffdT\ufffdOA]WhL\ufffdi\ufffd
/\ufffd\ufffd,\\ufffdn,\ufffd2l,#;\ufffd\ufffdw\ufffd\ufffd\u05f5FR\u059d\ufffdl\ufffdu^\ufffdV\ufffd_-\ufffd\ufffde\ufffd\ufffd8t\ufffdwciy-i\ufffdXo\ufffdn\ufffdd\ufffd)\ufffdq\ufffdhoW\ufffd\ufffd\ufffd\ufffd\u07c3
/n\ufffd\ufffd\ufffd\u8323\ufffdy\ufffd)\ufffd:\ufffd\ufffd\ufffd\ufffdA\u01fbo\ufffd\ufffd\ufffd*E\ufffd=\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd
 \ufffd"\ufffd\ufffd\ufffd\ufffdi�wN6y\ufffd[^\ufffd\ufffd\ufffd5'\ufffd\ufffd\u01b7\ufffdz\ufffdcwq\ufffd\ufffd\ufffd\ufffd\ufffd\\ufffd\u0676\ufffd\ufffdL<bv\ufffd\ufffd\ufffd\ufffd{z\ufffd\ufffd\ufffd_~\ufffd\ufffdX_v\ufffd\ufffdm\ufffds\ufffd=\ufffd>\ufffd\ufffd\ufffdGK\ufffd2\ufffd\u02beL3\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdN\ufffd\ufffdKc~\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdk\ufffd3k\u0195\ufffd\ufffd\ufffd\ufffd�\ufffd\ufffd;\ufffdLv=99|\ufffd\ufffd\ufffd\ufffdxWd%\ufffdY\ufffd\ufffd\ufffd\ufffdj~q\ufffd\ufffd+\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd+\ufffd\ufffd\ufffd\ufffd!\ufffd{\ufffd5\ufffd\ufffdqY>kdG\ufffd\ufffd|\ufffd\ufffd\ufffd\ufffdw\ufffd<\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd#\ufffd\ufffd\ufffdv:\ufffdKDg\ufffd)\ufffd<\ufffd5\u03cc\u038ee\ufffdGV\ufffdb\ufffd\ufffd\ufffdE\ufffd\ufffd\u021f\ufffd\u0110u%n6\ufffd\ufffdho]\u0101\ufffd\ufffd+\ufffd\ufffd[.\ufffd|{\ufffdh\u05cfe\ufffd\ufffd\ufffd\ufffdtu\ufffd\ufffd6\ufffdCt\ufffd\ufffdBt\ufffd(\ufffd0\ufffdm\ufffd\ufffd^n\ufffd\ufffd'\ufffd\ufffd\ufffd\ufffd_\ufffd\ufffd\ufffd\ufffdo\ufffd\ufffd|\ufffd\ufffd\ufffd\ufffd}\ufffd\ufffdL\ufffd\ufffd\ufffd\ufffd\ufffde\u013fx\ufffd\ufffdm\ufffd\ufffdgO\ufffd\ufffdn\ufffdM\ufffd\ufffd/\ufffd\u03f6\ufffdh<+\ufffd\ufffd#o\ufffd\ufffdot\ufffd\ufffd-\ufffd\ufffd\ufffd1\ufffd"\ufffd\ufffd#\ufffdd\ufffdu\ufffd\ufffd8\ufffd|5I.e\ufffd	\ufffd\ufffd\ufffd\ufffd~\ufffd\ufffdd\ufffdq\u04fd\ufffdV\ufffd\ufffd\ufffdw5:\ufffdu\ufffd/^\ufffdL\ufffd\ufffd\ufffd\ufffd\ufffd:\ufffd\ufffd\u04ff\ufffd\ufffdn\ufffd\ufffdl8\ufffds\ufffd\ufffd\ufffd\ufffde9\ufffd"\ufffd-\ufffd\ufffd\ufffdC\ufffd\ufffd(\ufffd\ufffd\ufffd\ufffdn\ufffd.\ufffd[B\ufffd\ufffd<\ufffd\ufffdY[\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdR
 :=\ufffdq\ufffd\ufffd)\ufffd:\ufffd\ufffd\ufffd]l\ufffd\ufffd\ufffd\ufffd\ufffdG<\ufffd\ufffd^[{\ufffd\ufffdS\ufffdr\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd_\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u03b7O\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdoh\ufffd\ufffd\ufffd\u01b3\ufffd\ufffdb\ufffd\ufffd\ufffdA\ufffdk\ufffd\ufffd'_\ufffdo\ufffdfV<>\ufffd\ufffd\ufffdQVz\ufffd\ufffd\ufffd\ufffdn\ufffd=rW\ufffd\ufffd{a\ufffd\ufffd\ufffd-n,E\ufffde~\ufffd\ufffd\ufffd\ufffd\ufffd?\ufffd[lt\ufffdz\ufffdU\ufffdd\ufffd\ufffd\ufffd\ufffdacl\ufffd/\ufffd\ufffd\\ufffd\ufffd\ufffd\ufffd>\ufffd\ufffdH]\ufffd\ufffd\ufffdk\ufffdO\ufffd\ufffdCt\ufffd\ufffd9\ufffdW\ufffd62Sws_z#)}\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdl\ufffd\ufffd\ufffdm\ufffd\u019d\ufffd\ufffdC<b\ufffd\u038d-\ufffd&'^\ufffd~bM\u0275\ufffd\ufffdo\ufffd\ufffd\ufffd\ufffd\ufffd[\ufffd\ufffd\ufffd+\ufffd\ufffd|\ufffd>1HK\u7771PO\ufffd[,\ufffdB\ufffd\u02b0X\ufffd\ufffd\ufffdT\ufffd^g\ufffd\ufffd\ufffd\ufffd\ufffd[\ufffd#G\u0694u\ufffd\ufffd\ufffd#\ufffd},\ufffd\ufffd\ufffd@c0Z|\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdx%\ufffd\ufffdz\ufffd\ufffd\ufffd\ufffd)\ufffd\ufffdu%\ufffd3\ufffdG\u0459\ufffd\ufffd\ufffdXn\u0479\ufffd6A\ufffd\ufffd\ufffdn\ufffdg\ufffd\ufffd\ufffd\u0347\ufffdo\ufffd\ufffdw\u0305\u07ef}\u3933/\ufffd\ufffd\ufffd~\ufffd\ufffdgO\ufffd\|\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdsg\ufffdv\ufffd\ufffd\ufffdW\ufffdrD\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd&\ufffd\ufffdf>\ufffd\ufffd\ufffd\ufffd-72\ufffd\ufffdM\ufffd5\ufffd\ufffd\ufffdL.Q\ufffd\ufffd\u0120\ufffd\ufffda}I\ufffdc\ufffd\ufffdF\u02c8\ufffd\ufffd\ufffd\ufffdk\ufffd\ufffd\ufffd\ufffd\ufffd^\ufffd\ufffd\u050a\ufffd[\ufffdw\ufffd\u03ac\ufffdh\ufffd(\ufffd\ufffd\ufffdu\ufffd%\ufffd[\ufffd"]\ufffd\ufffd
 \ufffd_1\ufffdc\ufffdo@|\ufffdQ\ufffdC\ufffd\ufffd"\ufffd]\ufffd\ufffd\ufffd?\ufffd\ufffd0g\ufffdE\ufffd\ufffd\ufffd\u037c\ufffd-0\ufffd(\ufffd,'\ufffdsz\ufffd\ufffd\ufffdO\ufffd\ufffd\ufffd6}\ufffd\ufffd1\ufffdft\ufffd\ufffdx\ufffd\ufffd\ufffdWk\ufffd\ufffd\ufffd\ufffd\ufffdy\ufffd\ufffd<)}\ufffdn\ufffd\u0627\ufffd8k\ufffd\ufffdhb\ufffdHtn	L\ufffd\ufffdc'\ufffd\ufffd\ufffd>a\ufffd<\ufffd\ufffd\u0791\u06eeu\ufffdsY\ufffd\ufffd/\ufffd\ufffd1\ufffd%\ufffdl,\ufffd\ufffdw\\ufffd\ufffd\ufffd\ufffd8qe[#s\ufffd\ufffd8Z\ufffd\ufffdEQ/\ufffd^\ufffdC\ufffd\ufffd\ufffdW\ufffdHYj\ufffd\ufffd1?v[\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdH\ufffd\ufffd\ufffd\ufffd3\ufffd"C5f\ufffdq\ufffd\ufffd)\ufffd\ufffdv\ufffdN\ufffd\u04e6x\ufffd`\ufffd":\ufffd<\ufffd\ufffd\ufffdjt>\ufffdo\ufffd\ufffd_tn\ufffd.\ufffd\ufffd?Ze\ufffd\ufffd\ufffdb\ufffdgt\ufffd\ufffd>\ufffd\ufffd\ufffdx\ufffd9	pP\ufffd\u0399LF\ufffd>\ufffd\ufffd\ufffdIQEQ\u0501\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdSSSs:l`\ufffdDg\ufffd\u052e\u032eK\ufffd\ufffdO\ufffd\ufffd(\ufffd\ufffdT\ufffdgt.\ufffd\ufffd92\ufffdp8H\ufffdk\ufffd\ufffdLQEQTa\ufffdst\ufffd(\ufffd\ufffd(\ufffd\ufffd\ufffd\ufffdRDg\ufffd\ufffd(\ufffd\ufffd(\ufffdR*\ufffd3EQEQE)\u0459\ufffd(\ufffd\ufffd(\ufffd\ufffd\ufffd\ufffd\ufffdLQEQEQJEt\ufffd(\ufffd\ufffd(\ufffd\ufffd(\ufffd":SEQEQ\ufffdR\ufffd)\ufffd\ufffd(\ufffd\ufffd(J\ufffd\ufffd\ufffdEQEQ\ufffdTDg\ufffd\ufffd(\ufffd\ufffd(\ufffdR*\ufffd3EQEQE)\u0459\ufffd(\ufffd\ufffd(\ufffd\ufffd\ufffd\ufffd\ufffdLQEQEQJ\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd?\ufffd\ufffd\ufffdG\ufffd\ufffd\ufffdH\ufffd\ufffd\ufffd\ufffd\ufffd?j)[\ufffd-nSEQEQ\u0511*-kaX\ufffd\ufffdJ\ufffdy\ufffd
 \ufffdmQ-hk\ufffdCQEQEQG\ufffd\ufffd\ufffd\ufffda-+Eg\ufffd\ufffd(\ufffd\ufffd(\ufffd\ufffdEt\ufffd(\ufffd\ufffd(\ufffd\ufffd(\ufffd":SEQEQ\ufffdR\ufffd)\ufffd\ufffd(\ufffd\ufffd(J\ufffd\ufffd\ufffdEQEQ\ufffdTFt\ufffd(\ufffd\ufffd(\ufffd\ufffd(j\ufffd\ufffd\ufffd\ufffd~b
 endstream
 endobj
-57 0 obj
+56 0 obj
 << /Length 1853
 >>
 stream
@@ -5471,23 +5118,23 @@ Q
 
 endstream
 endobj
-58 0 obj
+57 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 57 0 R
+/Contents 56 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/XObject << /I5 56 0 R
-/I6 60 0 R
-/Stamp1 489 0 R
+/XObject << /I5 55 0 R
+/I6 59 0 R
+/Stamp1 488 0 R
 >>
 /Font << /F1.0 8 0 R
 >>
 >>
-/Annots [59 0 R 61 0 R]
+/Annots [58 0 R 60 0 R]
 >>
 endobj
-59 0 obj
+58 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -5498,7 +5145,7 @@ endobj
 /Type /Annot
 >>
 endobj
-60 0 obj
+59 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 651
@@ -5567,7 +5214,7 @@ v:g
 \u04f9\ufffd@mj\uc5aehhK\ufffd\ufffdX\ufffd\ufffd\ufffd>\ufffd\ufffd&l\ufffd\ufffdz|\ufffd\u2c63\ufffd7\ufffd\ufffdl[\ufffd\ufffd|\u950a\ufffd\ufffd\ufffd4\ufffd\ufffd\ufffd\ufffd}\ufffd\ufffd[Z\ufffdwl\ufffd?=\ufffd>\ufffd\ufffd\ufffdvN\ufffd\u032b\ufffd\ufffd+j\ufffd\ufffd\ufffd\ufffdl\ufffd\ufffd\ufffd;W\ufffd\u43aa\ufffd\ufffdd\ufffd\ufffd\ufffdp\ufffdW\ufffdm:\ufffdng\ufffd\ufffd\ufffd';\ufffdcr\ufffd\ufffd\ufffdt\ufffdV\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdS\ufffd\ufffd\ufffdR7oB\ufffd>\ufffd\\ufffdg:\ufffd\ufffd\ufffd\ufffdy\ufffd\ufffdF_\ufffdq\ufffds\ufffdt\ufffd\ufffdib_\ufffd\ufffd\ufffdS_\ufffd\ufffd_\u02b3\ufffdckj\ufffd\ufffdOZnjIng\ufffd\u02ec\ufffd\ufffdzhS\ufffde\ufffd/Z\ufffdg\ufffd\ufffdWly\u0741\ufffd;\ufffd\ufffd\u066f:\ufffd_6:y\ufffd\ufffd\ufffdX\ufffd9X\u01e7n\ufffd\ufffd\ufffdG\u04cf\ufffd\ufffd!Z\ufffdSO\ufffd^\ufffd\ufffd\ufffd\ufffd@\ua8e4?\ufffd\ufffdJ\ufffd\ufffd\ufffd\\ufffd<\ufffd\ufffd\ufffd\ufffd\ufffdMg\ufffd\ufffd\ufffdY\ufffdP\ufffd\u0331\u03b3f\ufffdM\ufffd\ufffdkR\ufffdrz\ufffd\ufffd\ufffd\ufffd\ufffd@j4\ufffd\ufffd\ufffd\ufffdc/\u026dwN\ufffd(\ufffd:\ufffd\ufffds\u014d\ufffd\ufffd\ufffdx\ufffdt\ufffd'\ufffdu\ufffd\ufffd\ufffdI%\ufffd9\ufffd\ufffdi\ufffd/K\ufffd\ufffd\ufffd\ufffdql\ufffd\ufffd\ufffd\ufffd\ufffd&UM\ufffdP\4\ufffd\ufffd\u04abb\ufffd\ufffd\ufffdO[\u04fb',\ufffd\ufffd`M\ufffd\ufffd\ufffd9\ufffdR\ufffd\ufffd\\ufffd\u07acc�>X\ufffd8\ufffd\ufffd\ufffd\ufffd\ufffdw\ufffd\u04f3\ufffd\ufffd`\ufffd\ufffd3\u03bc\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdx\ufffdG\ufffd\ufffd(\ufffd>\ufffd\ufffd\ufffdP{\ub85dukk\ufffd^\ufffd/eMmsX\ufffd\ufffd7\ufffd\ufffd\ufffd';\ufffd]\ufffd8\ufffd\ufffd\ufffdljnO\ufffd\ufffd\ufffd[;\ufffdc\ufffdty\ufffd\ufffd\ufffdt\ufffd
#o\ufffd1\ufffdO\u039cs
 [}y\u1e47\ufffd|\ufffd\ufffd \ufffd\ufffd\ufffduN\ufffd\u02c4smM*\ufffd9\ufffdS3\ufffd\ufffd\ufffdn\ufffd\ufffd\ufffdW\ufffd\uf00dp{\ufffdS\ufffd\ufffd'\ufffd=\ufffd^\ufffd\ufffd,\ufffdz\ufffd=7 <~\ufffd.\u0736s}\ufffd\u0769Y\ufffdd]\ufffd9\ufffd\ufffd1\ufffd^LgIC\ufffd\ufffd\ufffdH\ufffd7\ufffd\ufffdQ<\ufffdr\u04bf__6\ufffd\ufffd\ufffdc\ufffd)\ufffd9a\ufffd\ufffd%\ufffd\u02cc\ufffd\ufffd\ufffd3Nw\ufffd \ufffdk\ufffd\ufffdi\ufffdd\ufffdu\ufffd\ufffd\ufffd9\ufffd\ufffdwu\ufffdYY:jBej@\ufffd\ufffd\ufffd@0[\ufffd�y\ufffds\ufffd\ufffd\ufffd;:\ufffd\ufffdh\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd7\ufffd\ufffd\ufffdq\ufffd\ufffd\ufffd\u0527W\ufffd5lM2\ufffdu\ufffd\ufffd\ufffdR\ufffd\ufffd\u07f8z\ufffd9\ufffdE\ufffdJ\ufffd\ufffd`\ufffd\ufffd\ufffdu:\ufffdY\ufffd~\ufffd\ufffd\ufffd\ufffd{\ufffd\ufffdP\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdt\ufffdF\ufffdt._^\ufffd\ufffd%}E{{7\ufffdylqm\ufffdY\ufffd\ufffd\ufffd\ufffd[\ufffdU\ufffd\ufffd\ufffd=N\ufffd\ufffd\u06acOT\ufffd\ufffd\ufffdtWu\ufffd\ufffd\ufffd\ufffdnN\ufffd(=\ufffdg\u04d9\ufffd\ufffdt\ufffd4\ufffd3\ufffd\ufffd\ufffd\ufffd~\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd1\u04e7U\u033c\ufffd\ufffd	\ufffd\ufffd\ufffd\ufffd\u065d\ufffdd\\ufffd\ufffd\ufffd\ufffd\ufffd3\ufffd\ufffdo\ufffd^=\ufffd\ufffdq\ufffd\u04f7]u}8\ufffd	\ufffd\ufffdO]y\ufffdt\ufffdU~u\ufffd\ufffd\ufffd\ufffd]\u0779\ufffdSxT\ufffd\ufffd8l\ufffd\ufffd\ufffd6Ri\ufffdT\ufffd9gm\ufffd\ufffd\ufffd\ufffdU\ufffdd\ufffd.\ufffdmn;X\ufffd\ufffdhq\ufffd\ufffd\ufffdk\ufffd3k\ufffd\ufffd\ufffd\ufffdu\ufffd\ufffd\u0305K\ufffd\ufffd\u03b3\u025e\ufffd\ufffd\u04b6oc\ufffdQ\ufffd+\ufffd/<\ufffdq3\ufffd:/^\ufffd\ufffd\u0471\ufffd:\ufffd/_\ufffd,\ufffdO\ufffd\ufffdD\ufffd<|A\ufffd\ufffdO6\ufffd\ufffd6\ufffd\ufffd
 \ufffdqJ\u0741\ufffd\ufffd\ufffdqu\ufffd\ufffd\ufffd8\ufffd\ufffd\ufffd\ufffd|l\ufffdi\ufffdx\ufffd\ufffd:\ufffd\ufffd\ufffd<\ufffd4s\ufffd\u0268kG\ufffd\ufffd^\ufffd7'\ufffdU\ufffd\ufffd:s\ufffd\ufffd\ufffd\ufffd\ufffd)\ufffd\ufffd\ufffdT\ufffdp\ufffdAJ\ufffd\ufffd\ufffd\ufffd.)\ufffd7\ufffd�=\ufffd)u\ufffd\ufffd'\ufffd{\ufffd9<78\ufffd%\ufffd5\ufffd\u461c\ufffd6E\u056bW,>\ufffd\ufffdG\ufffd\ufffdc\ufffd\ufffd\ufffdDu\ufffdQ\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd4\ufffdS\ufffd\ufffdz~\ufffd\ufffd\ufffd\ufffd\ufffdkf=A\ufffd\ufffd\ufffdD\ufffd\ufffdtfx1\ufffd%
\ufffd\ufffdM\ufffd.?&\ufffd:3\ufffd\ufffd\ufffd\ufffd's\ufffd\ufffd\ufffdTM\ufffd\ufffd\ufffd\ufffd\u07f8\ufffd\ufffd\ufffd\ufffd3n\ufffd\ufffd\ufffd\ufffd\u05d2GM\ufffd=\ufffd1\ufffdY\ufffd\ufffd\u07d2z\ufffd\ufffd\ufffd\ufffd\ufffd9s*+g\ufffd5\ufffd{r\ufffd\ufffd\ufffd\ufffd\ufffdW\ufffd~M^\ufffd\ufffd:\ufffd\ufffdF\ufffdd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdg\ufffdr\ufffd\ufffddP\ufffd\u0790\ufffd\ufffd&\ufffd1\ufffdO\u035a\ufffd[R\ufffd\ufffdy\ufffd\ufffd\ufffdC\ufffd\ufffdpu�\ufffdW+W\ufffd{9s\ufffd�?\ufffd\ufffd\ufffd\ufffd\ufffd]\ufffdu\ufffd\ufffdm\ufffd\ufffd\ufffd\ufffd=u5g\u039f\ufffdd\ufffd\u03f1%?\ufffdx\ufffd\ufffd\ufffdux\ufffdoI=\ufffdH\ufffdnO\u06fe=?E\ufffd}M\ufffdO\ufffdu\ufffd@\u06caM\ufffd\ufffd\ufffd
Z\ufffd\ufffdiKd\ufffd\ufffd\ufffd\ufffdDNK\ufffd3\ufffd\ufffd\ufffd\ufffd\ufffdr\ufffd\ufffd\ufffd\ufffdp\ufffd\ufffd\ufffdw\u076b\ufffd\\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdE3\ufffd\ufffd\ufffd\ufffd\ue93ejG\ufffd\ufffd\ufffd>\ufffd\ufffdt.]\ufffdp\ufffd\ufffd\u0609\ufffd;X\ufffd|[\u01d5=\ufffde\ufffd\ufffd\ufffd\ufffd\u037e\ufffd]\ufffds\u0444\u016f\ufffd>\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdz\ufffd\ufffd\ufffdW\ufffd|\ufffdy\u06d3}:2\ufffdtfx1
 %\ufffdBtmIU\ufffd\ufffd}\ufffd\u02d1\ufffd\ufffdm;\ufffd\ufffd\ufffd1
\ufffd\ufffd{\ufffd#\ufffdu\ufffd\ufffd\ufffd\u57f6vs\ufffd\ufffd\ufffd\ufffdtfx1\ufffd%\ufffd\ufffdU2-\ufffd{\ufffdt>\ufffd&^\ufffd\ufffd\ufffd\ufffd\ufffdy\ufffd\ufffd\ufffdt\ufffd\ufffdbK\ufffd\ufffd\ufffd\ufffd*\ufffd\u064bl \ufffds\u0756\ufffd\ufffd\ufffd\ufffd.\ufffdN\ufffd\ufffd\u04f9\ufffd\ufffd5<>\ufffd\ufffd$IT
\ufffdt^\ufffd\ufffd3


\ufffd\ufffd\ufffd.\ufffd\ufffd\ufffd\ufffd\ufffdY\ufffd\ufffd\ufffd\ufffdS\ufffd$
\ufffdr:\ufffd\ufffds\u0756\ufffd>\ufffd\ufffd$<&\ufffdfI\ufffd\u0535\ufffd\u0392$I\ufffdP\ufffdt\ufffd$I\ufffd\ufffd2\ufffd%I\ufffd\ufffd\ufffdLgI\ufffd$)*\ufffdY\ufffd$I\ufffd\ufffdt\ufffd$I\ufffd\ufffd2\ufffd%I\ufffd\ufffd\ufffdLgI\ufffd$)*\ufffdY\ufffd$I\ufffd\ufffdt\ufffd$I\ufffd\ufffd2\ufffd%I\ufffd\ufffd\ufffdLgI\ufffd$)*\ufffdY\ufffd$I\ufffd\ufffdw\ufffd\ufffd\ufffd7\ufffd>\ufffd\ufffd\ufffd>\ufffda)\ufffd\ufffd0\ufffd\ufffd\ufffd\ufffd\ufffd_?Vvx\ufffd0\ufffd%I\ufffd\ufffdaU\ufffd\ufffda\ufffdI5\ufffd\ufffd\ufffd\ufffd\ufffdah\ufffd\ufffd\ufffd$I\ufffd\ufffdUa\ufffd1&q\ufffdt\ufffd$I\ufffd\ufffd\ufffd\ufffd,I\ufffd$Ee:K\ufffd$IQ\ufffd\u0392$IRT\ufffd\ufffd$I\ufffdU\ufffdt\ufffd$I\ufffdt\ufffd\ufffd?\ufffd\ufffdw
 endstream
 endobj
-61 0 obj
+60 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -5578,8 +5225,8 @@ endobj
 /Type /Annot
 >>
 endobj
-62 0 obj
-<< /Length 5795
+61 0 obj
+<< /Length 5190
 >>
 stream
 q
@@ -5699,40 +5346,7 @@ Q
 BT
 59.24 644.6150000000001 Td
 /F3.0 11 Tf
-<2d44697369732e706572736973746f722e646174616e75636c6575732e696e7374616c6c2d6669787475726573> 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
-306.73999999999995 644.6150000000001 Td
-/F3.0 11 Tf
-<3d> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.200 0.533 scn
-0.000 0.200 0.533 SCN
-
-BT
-312.23999999999995 644.6150000000001 Td
-/F3.0 11 Tf
-<74727565> 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
-334.24 644.6150000000001 Td
-/F3.0 11 Tf
-<202d44697369732e6669787475726573> Tj
+<2d44697369732e706572736973746f722e646174616e75636c6575732e696e7374616c6c2d66697874757265733d74727565> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5743,18 +5357,7 @@ ET
 BT
 59.24 629.8750000000001 Td
 /F3.0 11 Tf
-<3d> 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
-64.74000000000001 629.8750000000001 Td
-/F3.0 11 Tf
-<666978747572652e73696d706c652e7363656e6172696f2e53696d706c654f626a6563747346697874757265> Tj
+<2d44697369732e66697874757265733d666978747572652e73696d706c652e7363656e6172696f2e53696d706c654f626a6563747346697874757265> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5889,28 +5492,28 @@ Q
 
 endstream
 endobj
-63 0 obj
+62 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 62 0 R
+/Contents 61 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F2.0 18 0 R
 /F3.0 30 0 R
 >>
-/XObject << /I7 66 0 R
-/I8 68 0 R
-/Stamp1 489 0 R
+/XObject << /I7 65 0 R
+/I8 67 0 R
+/Stamp1 488 0 R
 >>
 >>
-/Annots [65 0 R 67 0 R 69 0 R]
+/Annots [64 0 R 66 0 R 68 0 R]
 >>
 endobj
-64 0 obj
-[63 0 R /XYZ 0 778.86 null]
+63 0 obj
+[62 0 R /XYZ 0 778.86 null]
 endobj
-65 0 obj
+64 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -5921,7 +5524,7 @@ endobj
 /Type /Annot
 >>
 endobj
-66 0 obj
+65 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 715
@@ -6162,7 +5765,7 @@ l$^\u057e|0DH)
 -\ufffd\ufffd\ufffdEK�\ufffda\ufffdR\ufffd\ufffdh)@X\ufffdl)""""""\ufffd[\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdH\ufffd\ufffdRDDDDD$\ufffdh)"""""V\ufffd	+Z\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd-EDDDDD�\ufffd""""""a\ufffd\ufffdRDDDDDD\ufffd\ufffd\ufffd\u02a7\ufffdI
 endstream
 endobj
-67 0 obj
+66 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -6173,7 +5776,7 @@ endobj
 /Type /Annot
 >>
 endobj
-68 0 obj
+67 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 184
@@ -6206,7 +5809,7 @@ B
 K\ufffd<\ufffdF\ufffd\ufffd\ufffd*\ufffd\ufffdoL!\ufffd\ufffd\ufffd\ufffdFC\ufffdzXea\ufffd*~\ufffdX\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdo\ufffd\ufffdo\ufffd\ufffd\ufffd\ufffdX\ufffd$\ufffd"\ufffd\ufffd\ufffd
\ufffd
\ufffd\ufffd~y\ufffd\ufffd\ufffd\ufffd\ufffd@\ufffd\ufffdo o\ufffd7\ufffd7\ufffd\ufffd\ufffd
\ufffd
\ufffd\ufffd~y\ufffd\ufffd\ufffd\ufffd\ufffd@\ufffd\ufffdo o\ufffd7\ufffd7\ufffd\ufffd\ufffd
\ufffd
\ufffd\ufffd~y\ufffd\ufffd\ufffd\ufffd\ufffd@\ufffd\ufffdo o\ufffd7\ufffd7\ufffd\ufffd\ufffd
\ufffd
\ufffd\ufffd~y\ufffd\ufffd\ufffd\ufffd\ufffdHL\\ufffd\ufffd\ufffd\ufffd\u057d\ufffd;/e%{\ufffd'\ufffd\ufffdr\ufffd\ufffd\ufffdZ\ufffdy\ufffd~\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd[\ufffd\ufffd\ufffd]\ufffd\ufffd\ufffdFV\ufffd\ufffd:w\ufffd6\ufffd\ufffd\ufffd\ufffd\ufffd/OML\ufffd\ufffd=\ufffd\ufffd\ufffdo\ufffd\\ufffd\ufffds\u71676\ufffd\ufffd\ufffdsY\ufffd#\ufffd^z\ufffd\ufffd\ufffd]\ufffd\ufffd_\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdX\ufffd\ufffd\ufffd\ufffd\u0342\u07b1\ufffdV\ufffd\ufffd\ufffdu$\ufffdE\ufffd\ufffd\ufffdl\ufffd\ufffd\ufffd\ufffd\ufffd}\ufffd\ufffd\ufffdN\ufffd\ufffd\ufffd\ufffd\u0253\ufffd\ufffd\ufffda\u035a5~\ufffd\ufffd\ufffd\ufffdx\ufffd\ufffd\ufffdp\ufffd1x\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd4\ufffd\ufffd\ufffd\ufffdx\ufffd\u04bc\ufffd\ufffd\ufffd\ufffd\u039d%m\ufffdc\ufffd\ufffd\ufffd/\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd/^\u073d{w\ufffdXL\ufffd9\ufffd7.\ufffd\ufffd\ufffd\ufffd:\ufffdI\ufffd\ufffd\ufffde"ZW\ufffdk\ufffd\ufffd:\ufffd7\ufffdW
 \ufffdt\ufffd\u0495L\ufffd\ufffd\u0451\ufffds\ufffdo\\ufffd9n\ufffd\ufffd\ufffdL\ufffd\ufffd\ufffd\ufffd\ufffdf"k\ufffd7\ufffd\ufffd\ufffd\ufffds\ufffdD\ufffd\ufffd&\ufffd\ufffdY\ufffdHO#\ufffd\ufffd\ubbff>\ufffd5\ufffd\ufffd\ufffd\ufffd~sl\ufffd\ufffd\ufffdLD\ufffdj"\ufffd\ufffd\ufffd5\ufffd\ufffd\ufffd4\ufffd\u07d4\ufffd~\ufffd\ufffdo^8~\ufffd\ufffd\ufffd\ufffd.\ufffda\ufffd<w\ufffd\ufffdk\ufffd\ufffdbp\ufffd\ufffdw\ufffdW\u02ef]\ufffd\ufffd\ufffd9\ufffdd\ufffd^\ufffd\ufffd\ufffdoy\ufffdH\ufffd\ufffdh]\ufffd:\ufffdoV\ufffdZ\ufffdm\ufffdp\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd<x>\ufffd~\ufffd\ufffdo\ufffd\ufffd\ufffd\ufffd\u0479\ufffd\ufffd$sz.\ufffd\ufffd\ufffdh\ufffd\ufffd~\ufffd\ufffd\ufffdo\ufffdj\ufffdq\ufffdi]\ufffd:\ufffdo\ufffd\ufffdcl\ufffd\ufffd\ufffdl\ufffd:6\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd~\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdo\ufffd\ufffd\ufffdk\ufffd\ufffd\u0352G\ufffd\ufffds<F\ufffd\ufffd\ufffd\ufffdj\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd~\ufffd\ufffdk\ufffd\ufffd\ufffd\ufffd\u0739-\ufffd4\ufffd\ufffd^\ufffdX\ufffd\ufffd\\ufffda\ufffdE\ufffdID\ufffd\ufffd
@z\ufffd\ufffd7\ufffdU\ufffd9\ufffd\u02b8~cV\ufffd\ufffd:~s6\ufffd\ufffdnm?\ufffd/?\ufffd\ufffd\ufffdy\ufffd\ufffd\ufffd^r\u01a8\ufffd\ufffd~\ufffdP\ufffd4bb6u\ufffd\ufffd\ufffd\ufffd^ \{\ufffd\ufffdF"\ufffd
@z\\ufffdy\ufffd\ufffdM\ufffd\ufffdjj\ufffd6\ufffd\ufffd\ufffdX\ufffd9|Z,\zX\ufffd\ufffd\ufffd?\ufffd\ufffd/\u7d61\ufffd\ufffdK\ufffd\ufffd\ufffd\ufffd~s&\ufffd\u04e7\ufffd}\ufffd\ufffd\u8ee7O\ufffd\ufffd\ufffd\ufffd?\u06be\ufffd(\u05ebu\ufffd\u02ba\ufffd\ufffd\ufffd\ufffdk.c\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd~\ufffdv\ufffd:\ufffd\ufffd\ufffdG\ufffd\ufffd\ufffdo\ufffdSe\ufffd\ufffd\ufffdf\ufffd\
 \ufffd\ufffdT=\ufffdY\ufffdr\ufffd\ufffd(F?]v\ufffdf"\ufffd\ufffdauFu5Y\ufffd\ufffdsT\ufffdok7PWS\ufffd\ufffd\ufffd\ufffd\ufffd~3g\ufffd\ufffd|\ufffdY\ufffd]\ufffd<{|\ufffdm3\ufffd\ufffd\^\ufffdV\ufffd\ufffds\ufffdNm~\ufffd\ufffd\ufffd\ufffdS\ufffd\ufffd\ufffd\ufffd\ufffdzK\ufffd\ufffdW\ufffd\ufffd2*\ufffd\ufffd\ufffdN\ufffd\u0502QR\ufffd6\ufffd =\ufffd\ufffd,82Ws\ufffd\ufffd\ufffd3\ufffd\ufffd_|x\ufffd,\ufffdVt4\ufffd\ufffd?h\ufffd5\ufffd\ufffdE\ufffdZ\ufffdh]\ufffd\ufffd7+V\ufffd8\ufffd\u0253{\ufffd\ufffdRx\ufffd\u7937\ufffd\ufffd\ufffd\ufffd-K\ufffd\ufffd<i\u0531_\ufffdA\ufffdv\ufffd\u0792\ufffdB?\ufffd
@z\ufffd\ufffd7\ufffd\ufffdlT|?\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdX\ufffd\ufffd\ufffd\ufffdQ�\ufffdSU\ufffd18\ufffd\ufffdGAS\ufffd\ufffd\ufffd=mm='\ufffd\ufffd[\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdR0_\u0625z5\ufffdXo@S$\ufffdpOO\ufffd\ufffd\u013d\ufffdP?\ufffd =\ufffd\ufffd\ufffdclw\ufffd\ufffd\ufffdWwL\ufffd\ufffd,\ufffdT\ufffdo\ufffd/_>\ufffd\ufffd^\ufffd\ufffdy\ufffdt\ufffd+\ufffd\ufffdk\ufffdE7\ufffd\ufffd\ufffdCV\ufffdF\ufffd@\ufffdD:v+?\ufffd\ufffd9\ufffdi\u042d~\ufffd\ufffdo\ufffd
\ufffd\ufffdD\ufffd\ufffd\ufffd7\u01f3~\ufffd\ufffdo~30\ufffd\ufffdfa\ufffd9\ufffd5\ufffd\ufffd\ufffd4\ufffd\u07f4\ufffd\ufffdg
\ufffd =\ufffd\ufffd|3w\ufffd\ufffdLD\ufffdj"\ufffd9\ufffd5\ufffd\ufffd\ufffd4\ufffd\ufffd,[\ufffdl(k\ufffd7\ufffd\ufffd\ufffd`\ufffd\ufffd7\ufffd}3\ufffd\ufffd�\ufffd\ufffdU\ufffd\ufffd\ufffd6\ufffdu\ufffd\ufffd7\ufffdY\ufffd\ufffd\ufffd+\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdYzt\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdPnoyq\ufffd\ufffd\ufffd\ufffd.\ufffd;:>\ufffdU\ufffdV:t\ufffdpv\u0635
 kWooo\ufffd\ufffd\ufffdp9t\ufffd\ufffd;\ufffd?\ufffd\ufffd7\ufffd\ufffd\ufffd\ufffd>r\ufffd\ufffd#\ufffd\ufffd&7\ufffd\ufffd<\ufffd\ufffd_z\ufffd\ufffd\ufffd\ufffdW\ufffd\u01f8}\ufffd\ufffdm\u06f6}\ufffdv\ufffd\u0739v\ufffd\u0691\ufffd\ufffdD\ufffd#~\ufffdr\ufffdt\ufffd\ufffd/w\ufffd\ufffdL\ufffd\u0603o\ufffd\ufffdD\ufffdm{q\ufffd\ufffd\ufffd\ufffd=\ufffd\ufffdO\\ufffd1\ufffd\ufffd\ufffd\ufffdb\ufffd\u0611\ufffd\ufffd\ufffdz{{\ufffd;\ufffd\ufffds\ufffdo$O_\ufffd\ufffdK\ufffd\ufffd]\ufffd\ufffdY\ufffd\ufffd\ufffd@\ufffd~\ufffd\ufffdW_\ufffd\ufffd\ufffdf|b\ufffd\ufffd\ufffd_]\ufffd\ufffdx\ufffd\ufffd\ufffd\ufffd\u010e\ufffdKY\ufffd\ufffd\ufffd\ufffdW"Wn\ufffd\ufffd~y\ufffd\ufffd\ufffd\ufffd\ufffd@\ufffd\ufffdo o\ufffd7\ufffd7\ufffd\ufffd\ufffd
\ufffd
\ufffd\ufffdFJ\ufffd!\ufffdB\ufffd\ufffd$\ufffdB!\ufffd\ufffd,\ufffd!\ufffdBH\u0782\ufffdB!$o\ufffdo!\ufffd\ufffd\ufffd\ufffd7\ufffdB\ufffd[\ufffdB!\ufffd\ufffd-\ufffd
!\ufffdB\ufffd\ufffdo!\ufffdB\ufffd\ufffd\ufffd\ufffdf
 endstream
 endobj
-69 0 obj
+68 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -6217,10 +5820,10 @@ endobj
 /Type /Annot
 >>
 endobj
-70 0 obj
-[63 0 R /XYZ 0 153.28781015740657 null]
+69 0 obj
+[62 0 R /XYZ 0 153.28781015740657 null]
 endobj
-71 0 obj
+70 0 obj
 << /Length 13365
 >>
 stream
@@ -7034,29 +6637,29 @@ Q
 
 endstream
 endobj
-72 0 obj
+71 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 71 0 R
+/Contents 70 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F3.0 30 0 R
 /F2.0 18 0 R
 /F4.1 39 0 R
 >>
-/XObject << /Stamp1 489 0 R
+/XObject << /Stamp1 488 0 R
 >>
 >>
 >>
 endobj
+72 0 obj
+[71 0 R /XYZ 0 607.6500000000002 null]
+endobj
 73 0 obj
-[72 0 R /XYZ 0 607.6500000000002 null]
+[71 0 R /XYZ 0 188.43000000000046 null]
 endobj
 74 0 obj
-[72 0 R /XYZ 0 188.43000000000046 null]
-endobj
-75 0 obj
 << /Length 20123
 >>
 stream
@@ -8316,30 +7919,30 @@ Q
 
 endstream
 endobj
-76 0 obj
+75 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 75 0 R
+/Contents 74 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F2.0 18 0 R
 /F4.1 39 0 R
 /F3.0 30 0 R
 >>
-/XObject << /Stamp1 489 0 R
+/XObject << /Stamp1 488 0 R
 >>
 >>
 >>
 endobj
+76 0 obj
+[75 0 R /XYZ 0 778.86 null]
+endobj
 77 0 obj
-[76 0 R /XYZ 0 778.86 null]
+[75 0 R /XYZ 0 553.9600000000002 null]
 endobj
 78 0 obj
-[76 0 R /XYZ 0 553.9600000000002 null]
-endobj
-79 0 obj
-<< /Length 33071
+<< /Length 34939
 >>
 stream
 q
@@ -8989,8 +8592,8 @@ f
 h
 S
 Q
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 59.24000000000001 497.7050000000003 Td
@@ -9011,8 +8614,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 97.74000000000001 497.7050000000003 Td
@@ -9033,8 +8636,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 119.74000000000001 497.7050000000003 Td
@@ -9055,8 +8658,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 185.74 497.7050000000003 Td
@@ -9121,8 +8724,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 433.24 497.7050000000003 Td
@@ -9165,8 +8768,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 59.24000000000001 482.9650000000003 Td
@@ -9187,8 +8790,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 97.74000000000001 482.9650000000003 Td
@@ -9209,8 +8812,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 119.74000000000001 482.9650000000003 Td
@@ -9231,8 +8834,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 185.74 482.9650000000003 Td
@@ -9330,8 +8933,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 185.74 468.2250000000003 Td
@@ -9352,8 +8955,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 207.74 468.2250000000003 Td
@@ -9374,8 +8977,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 273.74 468.2250000000003 Td
@@ -9396,8 +8999,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 383.74 468.2250000000003 Td
@@ -9451,13 +9054,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 147.24 453.4850000000003 Td
 /F3.0 11 Tf
-<22696422> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+152.74 453.4850000000003 Td
+/F3.0 11 Tf
+<6964> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+163.74 453.4850000000003 Td
+/F3.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9473,8 +9098,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 59.24000000000001 438.7450000000003 Td
@@ -9495,8 +9120,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 97.74000000000001 438.7450000000003 Td
@@ -9517,8 +9142,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 119.74000000000001 438.7450000000003 Td
@@ -9539,8 +9164,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 185.74 438.7450000000003 Td
@@ -9638,8 +9263,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 240.74 424.00500000000034 Td
@@ -9693,13 +9318,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 141.74 409.2650000000003 Td
 /F3.0 11 Tf
-<2276657273696f6e22> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+147.24 409.2650000000003 Td
+/F3.0 11 Tf
+<76657273696f6e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+185.74 409.2650000000003 Td
+/F3.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9715,8 +9362,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 59.24000000000001 394.5250000000003 Td
@@ -9737,8 +9384,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 97.74000000000001 394.5250000000003 Td
@@ -9759,8 +9406,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 119.74000000000001 394.5250000000003 Td
@@ -9781,8 +9428,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 185.74 394.5250000000003 Td
@@ -9825,13 +9472,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 251.74 394.5250000000003 Td
 /F3.0 11 Tf
-<225065745f6e616d655f554e5122> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+257.24 394.5250000000003 Td
+/F3.0 11 Tf
+<5065745f6e616d655f554e51> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+323.24 394.5250000000003 Td
+/F3.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9913,13 +9582,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 400.24 394.5250000000003 Td
 /F3.0 11 Tf
-<226e616d6522> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+405.74 394.5250000000003 Td
+/F3.0 11 Tf
+<6e616d65> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+427.74 394.5250000000003 Td
+/F3.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9930,7 +9621,18 @@ ET
 BT
 433.24 394.5250000000003 Td
 /F3.0 11 Tf
-<7d29> Tj
+<7d> 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
+438.74 394.5250000000003 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9957,8 +9659,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 59.24000000000001 379.7850000000003 Td
@@ -9979,13 +9681,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 125.24000000000001 379.7850000000003 Td
 /F3.0 11 Tf
-<2250455422> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+130.74 379.7850000000003 Td
+/F3.0 11 Tf
+<504554> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+147.24 379.7850000000003 Td
+/F3.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -10023,8 +9747,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 59.24000000000001 365.0450000000003 Td
@@ -10056,12 +9780,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24000000000001 350.3050000000003 Td
-/F5.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -10078,12 +9802,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 350.3050000000003 Td
-/F5.0 11 Tf
+/F3.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -10100,12 +9824,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 350.3050000000003 Td
-/F5.0 11 Tf
+/F3.0 11 Tf
 <506574> Tj
 ET
 
@@ -10122,12 +9846,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 152.74 350.3050000000003 Td
-/F5.0 11 Tf
+/F3.0 11 Tf
 <696d706c656d656e7473> Tj
 ET
 
@@ -10144,8 +9868,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 213.24 350.3050000000003 Td
@@ -10227,7 +9951,29 @@ ET
 BT
 81.24000000000001 335.5650000000003 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+86.74000000000001 335.5650000000003 Td
+/F3.0 11 Tf
+<2e> 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
+92.24000000000001 335.5650000000003 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -10555,35 +10301,34 @@ Q
 
 endstream
 endobj
-80 0 obj
+79 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 79 0 R
+/Contents 78 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F3.0 30 0 R
-/F3.1 81 0 R
-/F5.0 40 0 R
+/F3.1 80 0 R
 >>
-/XObject << /Stamp1 489 0 R
+/XObject << /Stamp1 488 0 R
 >>
 >>
 >>
 endobj
-81 0 obj
+80 0 obj
 << /Type /Font
-/BaseFont /AAAACV+mplus1mn-regular
+/BaseFont /AAAACM+mplus1mn-regular
 /Subtype /TrueType
-/FontDescriptor 568 0 R
+/FontDescriptor 563 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 570 0 R
-/ToUnicode 569 0 R
+/Widths 565 0 R
+/ToUnicode 564 0 R
 >>
 endobj
-82 0 obj
-<< /Length 10811
+81 0 obj
+<< /Length 11381
 >>
 stream
 q
@@ -10724,7 +10469,7 @@ ET
 
 BT
 441.1783888888889 774.146 Td
-/F6.0 10.5 Tf
+/F5.0 10.5 Tf
 <c9> Tj
 ET
 
@@ -10778,7 +10523,7 @@ ET
 
 BT
 293.8066666666667 761.201 Td
-/F6.0 10.5 Tf
+/F5.0 10.5 Tf
 <c9> Tj
 ET
 
@@ -10855,8 +10600,8 @@ f
 h
 S
 Q
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 59.24000000000001 692.376 Td
@@ -10943,8 +10688,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 251.74 692.376 Td
@@ -10965,8 +10710,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 59.24000000000001 677.636 Td
@@ -11031,13 +10776,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 240.74 677.636 Td
 /F3.0 11 Tf
-<22313022> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+246.24 677.636 Td
+/F3.0 11 Tf
+<3130> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+257.24 677.636 Td
+/F3.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -11053,12 +10820,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24000000000001 662.896 Td
-/F5.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -11075,12 +10842,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 662.896 Td
-/F5.0 11 Tf
+/F3.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -11097,12 +10864,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 662.896 Td
-/F5.0 11 Tf
+/F3.0 11 Tf
 <50657473> Tj
 ET
 
@@ -11147,7 +10914,29 @@ ET
 BT
 81.24000000000001 648.1560000000001 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+86.74000000000001 648.1560000000001 Td
+/F3.0 11 Tf
+<2e> 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
+92.24000000000001 648.1560000000001 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -11333,37 +11122,36 @@ Q
 
 endstream
 endobj
-83 0 obj
+82 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 82 0 R
+/Contents 81 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F4.1 39 0 R
 /F1.0 8 0 R
 /F3.0 30 0 R
-/F6.0 84 0 R
-/F5.0 40 0 R
+/F5.0 83 0 R
 >>
-/XObject << /I9 85 0 R
-/Stamp1 489 0 R
+/XObject << /I9 84 0 R
+/Stamp1 488 0 R
 >>
 >>
-/Annots [86 0 R]
+/Annots [85 0 R]
 >>
 endobj
-84 0 obj
+83 0 obj
 << /Type /Font
-/BaseFont /AAAACW+mplus-1p-regular
+/BaseFont /AAAACN+mplus-1p-regular
 /Subtype /TrueType
-/FontDescriptor 572 0 R
+/FontDescriptor 567 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 574 0 R
-/ToUnicode 573 0 R
+/Widths 569 0 R
+/ToUnicode 568 0 R
 >>
 endobj
-85 0 obj
+84 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 715
@@ -11619,7 +11407,7 @@ _
 )\ufffd\ufffd\ufffd\ufffdEJ\ufffd"\ufffdq\ufffdR\ufffd\ufffdH)@\\ufffdL)J)\ufffd\ufffdRJ)\ufffd|5qJQJ)\ufffd\ufffdRJ\ufffd\ufffdKJQJ)\ufffd\ufffdRJ\ufffdUR\ufffdRJ)\ufffd\ufffdR*\ufffd\ufffdR\ufffdRJ)\ufffd\ufffdRq\ufffd\ufffd\ufffd\ufffdRJ)\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdRJ)\ufffdT\%\ufffd(\ufffd\ufffdRJ)\ufffd\ufffd^JQJ)\ufffd\ufffdRJ\ufffdx\ufffd\ufffd\ufffd\ufffd
 endstream
 endobj
-86 0 obj
+85 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -11630,7 +11418,7 @@ endobj
 /Type /Annot
 >>
 endobj
-87 0 obj
+86 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 651
@@ -11710,7 +11498,7 @@ W	
 [<\ufffdT8\ufffd\u07c0\ufffdW\ufffd\n0|\ufffdn\ufffd\ufffd=\ufffdZ\ufffd\ufffd\ufffd<\ufffd\u0179\ufffd\ufffd\u0392$I;hel\ufffd#\ufffd\v\u0753\ufffdnx\ufffd\ufffd\ufffd{\ufffd\ufffd&\ufffd\ufffd�\ufffd\ufffd\ufffd|\ufffd\ufffd:\ufffd\ufffd\ufffd\ufffd\ufffd`
\ufffd\ufffd\u754f\ufffd\ufffd\ufffdSg\ufffds~\ufffd\ufffd\ufffd\ufffd\u0725}\ufffd\ufffda4?\u0677o(\ufffd�\ufffde{\ufffd\ufffd\ufffdW4}\ufffd\u067c\ufffdO==\ufffd\ufffd{=\ufffd\ufffd\ufffdA\ufffd[\ufffd\ufffd1\ufffdgf\ufffdi\ufffdp\ufffdkZ]\ufffdn$\ufffd(\ufffdW<\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u056b.\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdW\ufffd\ufffd\ufffdU,\ufffd\ufffd\ufffd\u01cd\ufffd\ufffd\ufffdU\ufffd�\ufffd\ufffd\ufffd\ufffd\ufffd/\ufffd\u04f9\ufffd\ufffdK.y\ufffd\ufffd*\ufffdU?*\ufffdj\ufffdW\ufffd\ufffd\ufffd\ufffd\ufffdR\ufffdz\ufffd'\ufffdN\ufffd>c\ufffd\ufffd#\ufffd\ufffd\ufffd\u019b#S\ufffd5\ufffd\ufffd?g\u039c\ufffd\ufffd\ufffd\ufffd\ufffd,I\ufffd\ufffd\ufffd\ufffd\ufffdAV\ufffd\ufffd\ufffd~\ufffd\ufffd\ufffd\ufffd\ufffdu\ufffd\ufffd{PJ{\ufffd\ufffd\ufffd\ufffdd\ufffd\ufffd9\ufffd\ufffd\ufffd%7r#\ufffd~ub\ufffd\ufffd\ufffdW7\ufffd\ufffd\ufffd{\ufffd\ufffd\ufffd\u5c09�a%\ufffd\ufffd\ufffd\\ufffdoN\ufffdo\ufffdn8\ufffd\ufffdkZe\ufffd\ufffd`\ufffdb\ufffd\ufffd\ufffd{\ufffd\ufffdaU\ufffd|\u02eda\ufffd\ufffd\ufffdK\u05fbo\ufffd\ufffd)\ufffd\u030f\ufffd\u06d3W\ufffd-1\ufffd\ufffd\ufffd\ufffd\ufffdq_=\ufffd\ufffdF\ufffd\ufffd\ufffd`\ufffd@\ufffd:&\ufffdW^}m\u0252\ufffd\ufffd\ufffd\ufffd[\ufffd!\u0719\ufffd\ufffdo\ufffd\ufffd]\ufffd-\ufffd\\ufffdj\ufffd�c\u01fe_\ufffd\ufffd?~9y\ufffd~\ufffd\ufffd\ufffd\u046bV\ufffdz\ufffd\ufffdW\ufffd\ufffdjJ\ufffdo\ufffds\u05ac\ufffd\ufffdL\ufffdz\u04a9\ufffd\ufffd\u0392$I;bd\ufffd{\ufffd\ufffd
\ufffd\ufffd\ufffd~
 \ufffd\ufffd\ufffd\ufffd\ufffd\ufffd^\ufffd\ufffd\ufffd\ufffd\ufffdvy9\\ufffd\ufffda\ufffdq^\ufffds7\ufffd\ufffd)\ufffd\ufffd\ufffdD\ufffdk\ufffd5\ufffd\ufffd\ufffd/\ufffd\u07f0\ufffd\ufffd\u063d\ufffd\ufffd+2_M\ufffd_\ufffd\ufffd\ufffd&\u06f4\ufffdt\ufffd\ufffdf\ufffd\ufffd`i\ufffd\ufffdg\ufffd3~\ufffd\ufffd\ufffd\ufffdg$\ufffd1\ufffdx5\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u03dd;7\ufffduLJ}5\ufffd\ufffd+\ufffd\u03bb\ufffd\ufffd\u023e\ufffd\ufffd\ufffda\ufffd>\ufffd_a\ufffdO\ufffd6\ufffd\ufffdo\ufffd	7\ufffd\ufffdf\ufffd\u05a0\ufffd,I\ufffd\ufffd\ufffd\ufffd\ufffdAvP\ufffd\ufffd;\ufffd\ufffd\ufffd\ufffd\ufffdmt\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdX\ufffd\ufffd\ufffde?\ufffd\ufffd\ufffd\u02ef\ufffd\ufffd\ufffd\ufffd\u0268\ufffd|m\ufffd?_rY\ufffd\ufffdy\ufffd\ufffd\ufffd=70\ufffd\u0770>3_M\ufffdIs\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd/\ufffdm\ufffd	\ufffd+\ufffd~\u026b	&f\u0318\ufffd\ufffd1c2_\ufffd\ufffd?J\ufffd\\ufffdly\ufffd?\ufffd\u022b	\ufffd\ufffd\ufffd1\\ufffd\ufffd\ufffd\ufffd\ufffd\u1483\ufffd\ufffd\ufffd\ufffd1\ufffd\ufffd\ufffdn6\ufffd%I\ufffd\ufffd]\ufffdw\ufffdm\ufffd\ufffdxm\ufffd
\ufffd\u060e\ufffd&X\ufffd/\ufffd\ufffd+\ufffd\ufffdj\ufffdeW\ufffdMgI\ufffd\ufffd\ufffd\ufffd2\ufffd\u02e8\ufffd?<\ufffd
3\ufffd%I\ufffd\ufffdQ\ufffd}\ufffdi33\ufffd%I\ufffd\ufffdQ\ufffd}\ufffdi33\ufffd%I\ufffd\ufffdQ\ufffd}\ufffdi33\ufffd%I\ufffd\ufffdQ\ufffd}\ufffdi3\ufffd~\ufffdy\ufffd\ufffd\ufffd\ufffdh\ufffd\ufffd`\ufffd\ufffdp\ufffd\ufffdQ\ufffdy\ufffdk\ufffd\ufffd\ufffd\ufffd\ufffd$I\ufffd\ufffdKfp\ufffdaGM\ufffd!\ufffdz,\4\ufffdpI\ufffd$i\ufffd*\ufffd\ufffd0\ufffd\ufffd$\ufffd\ufffd\u0392$I\ufffdJd:K\ufffd$IQ\ufffd\u0392$IRT\ufffd\ufffd$I\ufffd\ufffd\ufffd,I\ufffd$E\ufffdv:K\ufffd$I\ufffd\ufffd\ufffd?
 GP\ufffd
 endstream
 endobj
-88 0 obj
+87 0 obj
 << /Length 7268
 >>
 stream
@@ -12145,14 +11933,14 @@ Q
 
 endstream
 endobj
-89 0 obj
+88 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 88 0 R
+/Contents 87 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/XObject << /I10 87 0 R
-/Stamp1 489 0 R
+/XObject << /I10 86 0 R
+/Stamp1 488 0 R
 >>
 /Font << /F2.0 18 0 R
 /F4.1 39 0 R
@@ -12160,10 +11948,10 @@ endobj
 /F1.0 8 0 R
 >>
 >>
-/Annots [90 0 R]
+/Annots [89 0 R]
 >>
 endobj
-90 0 obj
+89 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -12174,10 +11962,10 @@ endobj
 /Type /Annot
 >>
 endobj
-91 0 obj
-[89 0 R /XYZ 0 488.0966805845511 null]
+90 0 obj
+[88 0 R /XYZ 0 488.0966805845511 null]
 endobj
-92 0 obj
+91 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 715
@@ -12377,8 +12165,8 @@ R\u0289o%
 )\ufffdK\ufffd)E)\ufffd\ufffdRJ)\ufffd\ufffd\ufffdR\ufffdRJ)\ufffd\ufffdR\ufffd\ufffd\ufffdR\ufffdRJ)\ufffd\ufffdRq\ufffd\ufffd\ufffd\ufffdRJ)\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdRJ)\ufffdT\%\ufffd(\ufffd\ufffdRJ)\ufffd\ufffd*)E)\ufffd\ufffdRJ)WI)J)\ufffd\ufffdRJ\ufffd\ufffd\ufffd\ufffdR\ufffdRJ)\ufffd\ufffdR*\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd
 endstream
 endobj
-93 0 obj
-<< /Length 20152
+92 0 obj
+<< /Length 21193
 >>
 stream
 q
@@ -12575,12 +12363,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24000000000001 333.53222891566264 Td
-/F5.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -12597,12 +12385,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 333.53222891566264 Td
-/F5.0 11 Tf
+/F3.0 11 Tf
 <656e756d> Tj
 ET
 
@@ -12877,12 +12665,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24000000000001 168.5722289156626 Td
-/F5.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -12899,12 +12687,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 168.5722289156626 Td
-/F5.0 11 Tf
+/F3.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -12921,12 +12709,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 168.5722289156626 Td
-/F5.0 11 Tf
+/F3.0 11 Tf
 <506574> Tj
 ET
 
@@ -12971,7 +12759,29 @@ ET
 BT
 81.24000000000001 153.8322289156626 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+86.74000000000001 153.8322289156626 Td
+/F3.0 11 Tf
+<2e> 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
+92.24000000000001 153.8322289156626 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -12987,12 +12797,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 81.24000000000001 139.09222891566262 Td
-/F5.0 11 Tf
+/F3.0 11 Tf
 <70726976617465> Tj
 ET
 
@@ -13064,8 +12874,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 124.35222891566261 Td
@@ -13086,8 +12896,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 119.74000000000001 124.35222891566261 Td
@@ -13108,8 +12918,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 141.74 124.35222891566261 Td
@@ -13130,8 +12940,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 207.74 124.35222891566261 Td
@@ -13196,13 +13006,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 317.74 124.35222891566261 Td
 /F3.0 11 Tf
-<2266616c736522> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+323.24 124.35222891566261 Td
+/F3.0 11 Tf
+<66616c7365> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+350.74 124.35222891566261 Td
+/F3.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -13229,12 +13061,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 109.61222891566261 Td
-/F5.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -13290,7 +13122,18 @@ ET
 BT
 235.24 109.61222891566261 Td
 /F3.0 11 Tf
-<2829> Tj
+<28> 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
+240.74 109.61222891566261 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -13328,12 +13171,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 262.74 109.61222891566261 Td
-/F5.0 11 Tf
+/F3.0 11 Tf
 <72657475726e> Tj
 ET
 
@@ -13405,12 +13248,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 94.87222891566262 Td
-/F5.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -13427,12 +13270,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 94.87222891566262 Td
-/F5.0 11 Tf
+/F3.0 11 Tf
 <766f6964> Tj
 ET
 
@@ -13471,12 +13314,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 207.74 94.87222891566262 Td
-/F5.0 11 Tf
+/F3.0 11 Tf
 <66696e616c> Tj
 ET
 
@@ -13570,12 +13413,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 361.74 94.87222891566262 Td
-/F5.0 11 Tf
+/F3.0 11 Tf
 <74686973> Tj
 ET
 
@@ -13592,8 +13435,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 389.24 94.87222891566262 Td
@@ -13697,7 +13540,29 @@ ET
 BT
 81.24000000000001 80.13222891566262 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+86.74000000000001 80.13222891566262 Td
+/F3.0 11 Tf
+<2e> 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
+92.24000000000001 80.13222891566262 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -13737,26 +13602,25 @@ Q
 
 endstream
 endobj
-94 0 obj
+93 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 93 0 R
+/Contents 92 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/XObject << /I11 92 0 R
-/Stamp1 489 0 R
+/XObject << /I11 91 0 R
+/Stamp1 488 0 R
 >>
 /Font << /F2.0 18 0 R
 /F3.0 30 0 R
 /F4.1 39 0 R
 /F1.0 8 0 R
-/F5.0 40 0 R
 >>
 >>
-/Annots [95 0 R]
+/Annots [94 0 R]
 >>
 endobj
-95 0 obj
+94 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -13767,11 +13631,11 @@ endobj
 /Type /Annot
 >>
 endobj
-96 0 obj
-[94 0 R /XYZ 0 495.69722891566266 null]
+95 0 obj
+[93 0 R /XYZ 0 495.69722891566266 null]
 endobj
-97 0 obj
-<< /Length 10212
+96 0 obj
+<< /Length 11534
 >>
 stream
 q
@@ -13923,12 +13787,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24000000000001 600.1650000000001 Td
-/F5.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -13945,12 +13809,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 600.1650000000001 Td
-/F5.0 11 Tf
+/F3.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -13967,12 +13831,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 600.1650000000001 Td
-/F5.0 11 Tf
+/F3.0 11 Tf
 <506574> Tj
 ET
 
@@ -14017,7 +13881,29 @@ ET
 BT
 81.24000000000001 585.4250000000001 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+86.74000000000001 585.4250000000001 Td
+/F3.0 11 Tf
+<2e> 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
+92.24000000000001 585.4250000000001 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -14033,12 +13919,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 81.24000000000001 570.6850000000002 Td
-/F5.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -14055,8 +13941,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 570.6850000000002 Td
@@ -14094,7 +13980,18 @@ ET
 BT
 202.24 570.6850000000002 Td
 /F3.0 11 Tf
-<2829> Tj
+<28> 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.74 570.6850000000002 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -14132,12 +14029,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 103.24000000000001 555.9450000000002 Td
-/F5.0 11 Tf
+/F3.0 11 Tf
 <72657475726e> Tj
 ET
 
@@ -14171,13 +14068,35 @@ ET
 BT
 196.74 555.9450000000002 Td
 /F3.0 11 Tf
-<28292e> Tj
+<28> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+202.24 555.9450000000002 Td
+/F3.0 11 Tf
+<29> 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.74 555.9450000000002 Td
+/F3.0 11 Tf
+<2e> 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.24 555.9450000000002 Td
@@ -14193,7 +14112,29 @@ ET
 BT
 235.24 555.9450000000002 Td
 /F3.0 11 Tf
-<28293b> Tj
+<28> 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
+240.74 555.9450000000002 Td
+/F3.0 11 Tf
+<29> 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
+246.24 555.9450000000002 Td
+/F3.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -14237,7 +14178,29 @@ ET
 BT
 81.24000000000001 526.4650000000001 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+86.74000000000001 526.4650000000001 Td
+/F3.0 11 Tf
+<2e> 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
+92.24000000000001 526.4650000000001 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -14403,29 +14366,28 @@ Q
 
 endstream
 endobj
-98 0 obj
+97 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 97 0 R
+/Contents 96 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F2.0 18 0 R
 /F4.1 39 0 R
 /F3.0 30 0 R
-/F5.0 40 0 R
 >>
-/XObject << /I12 100 0 R
-/Stamp1 489 0 R
+/XObject << /I12 99 0 R
+/Stamp1 488 0 R
 >>
 >>
-/Annots [101 0 R]
+/Annots [100 0 R]
 >>
 endobj
-99 0 obj
-[98 0 R /XYZ 0 778.11 null]
+98 0 obj
+[97 0 R /XYZ 0 778.11 null]
 endobj
-100 0 obj
+99 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 651
@@ -14524,7 +14486,7 @@ Q
 OS\ufffdK\ufffd"\ufffd\ufffd\ufffd?\ufffd\ufffd\ufffdkR\ufffd\ufffdOS\ufffd/\ufffd\ufffd\ufffd>1g\ufffd\ufffd\ufffd<n[6\ufffd/\ufffd\ufffd%\ufffd\ufffd\ufffdWUf\u05b6\ufffdj\ufffd\ufffds\u05bca%s\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdM\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdD:''
\ufffdx\ufffd\ufffd\ufffd\ufffdG\ufffd\ufffd\ufffd7S@G_\ufffdi\ufffd]\ufffd\ufffdQ\ufffd\ufffd\ufffd\ufffd{Q\ufffd1\ufffd\ufffd\ufffd\ufffd\ufffd\u0317+\ufffd0\ufffdx\u0100L\ufffdM\ufffdq}z\ufffdx\ufffd\u05ca'\ufffd\ufffdz\ufffd1\ufffd\ufffd\ufffd7\ufffd\ufffdPt\ufffdE\ufffd!\ufffdI\ufffd\ufffd_\ufffd0\ufffd\ufffd\ufffd\ufffd!7f\ufffd\ufffd\ufffdC&\ufffd\ufffd\ufffdw\ufffd\ufffd4\ufffd\ufffd\ufffd<a\u0530\ufffd3+\ufffd\ufffd\ufffd\ufffd
N\ufffd\ufffd\ufffd1\ufffd\ufffd\ufffdk\u03fe\ufffd|\ufffd\ufffdo\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u5d69\ufffdWfB$\ufffdSg$\ufffd\ufffd]\ufffdvw\u0674t\ufffd\ufffd\ufffd\ufffd\ufffd	\ufffdg\ufffd\ufffdgF\ufffd\ufffd8s\ufffd\ufffdP\ufffd\ufffd\ufffd\ufffd9eq((53\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd'c\ufffd\ufffd?\ufffdn\ufffd\ufffd\u04cd\ufffdn\u02d3}O\ufffds\ufffd\ufffdV\ufffd\ufffd\ufffd2'\ufffd\ufffd\ufffd\ufffdt\ufffd?\ufffdE\ufffd\ufffd\u0369\u0399\ufffd\ufffd2\ufffd\ufffd\ufffd3\u035d\ufffdD\ufffd\u026b\ufffd\ufffd\ufffd\ufffdz\ufffd\ufffd\ufffd\ufffd\u06e0:\ufffd\ufffdpU\ufffd\ufffd\ufffdk\ufffd\u068a\ufffd3\ufffdCmU\u6384\ufffd<EMW\ufffd}[>\ufffd\ufffd\U000155dd\ufffdh`\ufffd\ufffd\ufffd\ufffd\ufffd]W\ufffd\ufffd\ufffd\ufffd\ufffdm\ufffdD\ufffd\ufffd\ufffd\u06bd\ufffdf\ufffd\u07cf\\ufffd7\ufffd\u06bf*=,{\ufffd\ufffd.\ufffdL\ufffd\ufffddEmx\ufffd\ufffd\u058f\ufffd9\ufffd)y\ufffdd\ufffd\ufffd\ufffd\ufffd
]\ufffd\ufffd\ufffd\ufffd[jS+\ufffd\ufffd\ufffdxI\ufffd|\u0539\ufffdb\ufffd^B\ufffd\ufffd\u075c\ufffdb\ufffd\ufffdo
 \ufffd\ufffd"}\ufffdE\u0165a\ufffd+\ufffd\ufffd\ufffd}j\ufffd\ufffdWV\ufffd6\ufffdG\ufffd)3f-^\ufffd\ufffd\ufffdv\ufffd:Ms/\ufffd&9\ufffdTg\ufffd\ufffdJ\ufffd\ufffd'MU4\ufffdg\ufffd.\ufffd\ufffd&\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd=z
19\ufffdt{<q\ufffd\ufffd\ufffdGOq\ufffdEIm
\ufffd:]\ufffd'\ufffd\ufffda\ufffd\ufffd\u04e5<o\ufffd\u0165\ufffdLL\ufffd\ufffd\ufffd\ufffd\ufffdMle\ufffdFz\ufffd\ufffd*\ufffd\ufffd\u06a2[\ufffdGf\ufffd\ufffd3fr}\ufffd\ufffdK\ufffdoO$\ufffd3\ufffdx>\ufffdv\ufffd\ufffd\ufffdCM\ufffdou\ufffd{\ufffdz\ufffd-{=\ufffd\ufffd4\ufffd/:\ufffdE\ufffd-g_\ufffd\ufffd\u031cu\ufffd5\u0316\ufffd\ufffdjq\u03b5NT\ufffdt	;\\ufffd\ufffd\ufffd'.\ufffd\ufffd\ufffdt\ufffd:\ufffdi\ufffd\ufffd\ufffd\ufffd\u07a9\ufffd\ufffd\ufffdsQ(m\ufffd5<\ufffd\ufffd\ufffdp\ufffd?&\ufffd\u06ed\ufffd\ufffdb:E\ufffdw\ufffd4\ufffd\ufffdeW\ufffd\ufffd=\ufffd\ufffdU\u05ce\ufffdy}\ufffd\u04abr\u03f6q\ufffd\ufffd3\ufffd\ufffdZu>1`#=g\u0793~b\ufffd\ufffd\ufffd\ufffd\ufffd3/\ufffd\ufffdK\ufffd\ufffdi\ufc59\uaf2co\ufffdK\ufffd\ufffd\ufffd\ufffdmf	'\ufffd\ufffd\ufffd\ufffd[\ufffd\ufffd\ufffd\ufffd&\ufffd\ufffd\ufffd#zs\ufffd\ufffdm\ufffd=\ufffd\ufffd\ufffdiu\ufffd\ufffduN\ufffd?\ufffd\ufffd_\ufffd\ufffdo\ufffd\ufffd\ufffdLC\ufffd~\u0504t\ufffd
\ufffd\ufffd\ufffd\ufffd\ufffdt\ufffd
\ufffd73\ufffd"OzDG^N\ufffdx\ufffd	\ufffd\ufffd\ufffd\ufffdyZ\ufffd\ufffd1\u0758\ufffdcH\ufffd.\ufffdu\ufffd\ufffdO\u13a7\ufffd_\ufffd\ufffdO\ufffd\ufffd
\ufffdm\ufffdq\ufffd\ufffd\ufffdeU\ufffdj\ufffd\ufffdgnT\ufffd4\ufffd\ufffd
p\u03f3u\ufffd	%r\ufffdY\u0474%+\u04b7Rw\ufffd\ufffd\ufffd\ufffd\ufffd}{\ufffd\\ufffd.\ufffd\ufffd\ufffd\ufffd\ufffd|\ufffd\ufffd\ufffd�?\ufffd\ufffda9\ufffd\ufffd|�\ufffdN>!]s\ufffd
 \u06a1gt[\ufffdqruN\ufffdZ\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd4W\ufffd3w\ufffd\ufffd\ufffd\ufffd\ufffd}\ufffd2cx"^-U\ufffd\ufffd\ufffd\ufffd%\ufffdV\ufffd\ufffd\ufffd'\ufffd@\ufffd7'Zn\u03ea3t\ufffdY\ufffds\ufffdtun\ufffds\u03fe\ufffd<`\ufffd\ufffd\ufffd\9\ufffd8\ufffd4L\ufffd\ufffd\ufffd\ufffd\ufffdA\ufffdF;\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd^\ufffd\u057cyz+>\ufffd\ufffd\ufffd\ufffd\ufffd
\ufffd\ufffdC\ufffd\ufffd\ufffd\ufffdA_+>1;&3K\ufffd\ufffd\ufffd\ufffd\u0275/)3\ufffd\ufffd*S\ufffd\ufffd\ufffd;\u04a7_8\ufffd\ufffd\ufffd\ufffd4\ufffd\ufffd\ufffd\ufffd5\ufffd Z\ufc4b\u0293#\u058dk\ufffd\ufffd)s7%\ufffd3;\ufffdE\ufffdp\ufffd\ufffd\u05d5?\ufffd6G\ufffd\ufffd\ufffdvnE\ufffdfrG\ufffd\ufffd\ufffd_sg\ufffd9\ufffd|L\ufffd\ufffd\ufffdf\ufffdK\ufffd\ufffd\ufffd\u07b7\ufffd\ufffd\u0399;\ufffd\ufffd\ufffd\ufffd\u07b9\ufffd\ufffdxI\ufffdR\ufffd\ufffdYBk\ufffd9s\ufffd\ufffd\ufffd\ufffd\ufffd:\ufffd\ufffd,\ufffd9i\ufffd:7=\ufffd9}Q\ufffd\ufffdO\ufffd\ufffd>\u061c\\ufffdx\u0704q
\ufffdC\ufffd0\ufffd\ufffdf.\ufffd\ufffd\u05e0+o\ufffd{pX�q\ufffd$\ufffd+n\ufffd\ufffdn\ufffd\ufffd\ufffd\ufffdC\ufffd\ufffd\ufffd/\ufffdz\ufffd\ufffd'6Q\ufffd\ufffd9\ufffd\ufffd\ufffd9\ufffd}\ufffd+\ufffd\ufffd'\ufffd\ufffd\ufffd\ufffd\u0327'\ufffdP/f\ufffds\ufffd'\ufffd)'M,zb{*\ufffd\ufffd\ufffdY\ufffd7-\ufffd\u05bc\ufffd\ufffd.3\ufffd\ufffdC/J3#\ufffd\ufffd^\ufffd\ufffd\ufffd.\u04e5Nl:e\ufffd\ufffduONi\ufffd:\ufffd,\ufffd\ufffd\ufffd\ufffda\ufffdtz\ufffd\ufffdKG\ufffd\ufffdz\ufffd\ufffd\ufffd\ufffdU\ufffd*\ufffd1|~yM2\ufffd\ufffd\ufffd!
\ufffd\ufffd\ufffd4\ufffd\ufffd\ufffd}\ufffdz\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffde\ufffd{{63\u05b9\ufffd\ufffd-\ufffdsTg\ufffdk/w0\ufffd:\ufffdg\ufffd?\ufffd
 \ufffd\u065b\ufffd~\ufffd\u054d\ufffd.75\u05b9\ufffd_s_=\ufffdL\ufffdffq\ufffd\ufffd\ufffd\u018f\ufffdS\ufffdz\ufffd\ufffd\ufffd3\ufffd\ufffd\u03a1\ufffd\ufffdV\ufffd\ufffd<\ufffdVVl\ufffd:\ufffdGHg\ufffde><\ufffd\ufffdK\ufffdv\ufffd\ufffd\ufffd\ufffd\ufffdrwsc\u011b^Bk\ufffd9\ufffdq\u03da\ufffd\ufffd3OM\ufffds\ufffd.\ufffd6\ufffd\ufffdLTg\ufffd4\ufffd\ufffdH\u7919\ufffd|\ufffd6&\ufffd|\ufffd\ufffd\ufffd\ufffdlL\ufffd\u0546#\u0119R;h`�\ufffd3lL.7vP\ufffdZ\ufffd!\ufffda\ufffdxT\u0470K/\ufffd\ufffd\ufffd\u0334I\ufffd\ufffd\u055e\ufffd\ufffd\ufffdW\ufffd\ufffd&\ufffd\ufffd4a\ufffd\ufffd\ufffds1^z\ufffd\ufffd	\ufffd\ufffd-\ufffdc\ufffdg\ufffd\ufffd>&\ufffd\u013fAI\ufffd3\u07bfzF\ufffdJ\ufffd^\ufffd{\ufffd\ufffd\u0311\u0211
\ufffdMHO)\ufffd\ufffd\ufffdR\u7baal8\ufffdF\ufffd\ufffd\ufffd3\ufffd7S\ufffd\ufffd\ufffd\u0171\ufffd\ufffd\ufffd\ufffd<Q\ufffdg\ufffdV\u050f	\ufffdk8;G\ufffd:\ufffdN!{\ufffd\ufffdH\ufffd\ufffd\ufffd-e
\u0389\ufffd=\ufffd\ufffd\u1286\ufffd\ufffd\ufffd0\ufffd?V\ufffd\u05dfb\ufa99\ufffd\ufffd?\ufffd\ufffdng\ufffd\ufffd5\ufffdIu\ufffd\ufffdM\ufffd\ufffd3\ufffd\ufffd\u071919F`\ufffd\ufffdT\ufffd[\ufffd^\ufffd\ufffdg\ufffd\ufffdX\ufffd\ufffd\ufffd\ufffd\ufffd\u034d\ufffd\ufffd/\ufffd\ufffd\ufffd\ufffd`j\ufffd\ufffd;ZyI\ufffd\V\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd4{\ufffd\ufffd\ufffd%\ufffdZ\ufffd\U000df6b2\ufffd*\ufffd\ufffdFu\ufffdN\ufffd:\ufffd\ufffd\ufffd\u4caffN\ufffd\u0446\ufffdl\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\s\ufffdw:\ufffd\ufffd\u024a\ufffdP\ufffd\ufffd3?\ufffd\ufffdV\ufffd\ufffd
\ufffdO\ufffdGu\ufffdN\ufffd:\ufffd\ufffdi\ufffd\ufffd[&\ufffdo\ufffd\ufffd\u0385\ufffdnT\ufffd{\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd
\ufffd\ufffdQ\ufffd\ufffd\u04e8\ufffd""\ufffd\ufffd\ufffd\ufffd\ufffd\u0167
 \ufffdK6\ufffdR\ufffdKW\ufffd\ufffd\ufffd\ufffdk\ufffd;@7rJ\u0579\ufffd\ufffd6\ufffd\ufffdt\ufffd&CDD\ufffdlN\ufffdT\ufffd\ufffd{x\u04e6M\ufffd\ufffd_M\ufffdB_\ufffd�F\ufffd\ufffd2\ufffd{\ufffd\ufffd\ufffd9\ufffdS(\u0579G\ufffd=\ufffd\ufffd^\ufffdh$\ufffdj\ufffd\ufffd"""\ufffd\ufffd\ufffd\ufffd"""""\ufffd\ufffdYDDDD$*\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdHTTg\ufffd\ufffd\ufffd\ufffd"""""QQ\ufffdEDDDD\ufffd\ufffd:\ufffd\ufffd\ufffd\ufffd\ufffdDEu\ufffd\ufffd\ufffd,""""\ufffdYDDDD$*\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdHTTg\ufffd\ufffd\ufffd\ufffd"""""QQ\ufffdEDDDD\ufffd\ufffd:\ufffd\ufffd\ufffd\ufffd\ufffdDEu\ufffd\ufffd\ufffd,""""\ufffdS\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd~x\ufffdN8+\ufffd2*qTu^\ufffd\ufffd\ufffd\ufffd\ufffd\uad88\ufffd\ufffd\ufffd\ufffdY\ufffdP\ufffdC\ufffd8\ufffd:/y\ufffd\ufffda\ufffdP\ufffd\ufffduDDDDD\u03aa\ufffd\ufffdp\ufffd\ufffdQ\ufffdYDDDDD\ufffd:\ufffd\ufffd\ufffd\ufffd\ufffdDEu\ufffd\ufffd\ufffd,""""\ufffdYDDDD$*\ufffd\ufffdYDDDDDZ\ufffd\ufffd.&\ufffd
 endstream
 endobj
-101 0 obj
+100 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -14535,7 +14497,7 @@ endobj
 /Type /Annot
 >>
 endobj
-102 0 obj
+101 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 651
@@ -14609,8 +14571,8 @@ Fu
 \ufffd#CDDd<')\ufffdy\ufffd
\ufffd544\ufffdr0r5\ufffd&~uO\ufffd\ufffdYv\ufffd
\ufffd\ufffd!""2\ufffd\ufffd\ufffd\ufffd\\ufffdn\ufffd\ufffd\ufffdy\ufffd'<5\ufffdf\ufffd\ufffd'A\ufffdYDDDD$\ufffdQ\ufffdEDDDDbEu\ufffd\ufffdYDDDD$VTg\ufffdXQ\ufffdEDDDDbEu\ufffd\ufffdYDDDD$VTg\ufffdXQ\ufffdEDDDDbEu\ufffd\ufffdYDDDD$VTg\ufffdXQ\ufffdEDDDDbEu\ufffd\ufffdYDDDD$VTg\ufffdXZu\ufffd\ufffdC\ufffd\ufffd\ufffd\ufffd\ufffd=\ufffdR(�\u01ea\ufffd~\ufffd\ufffd\u0432\ufffdB\ufffdW	58\ufffd\ufffdP\ufffdcU\ufffdM\ufffd\ufffd~\ufffd5\ufffdp\ufffdq\ufffdP\ufffdC\ufffd8Vu\ufffd\ufffd\ufffd\ufffd"""""\ufffd\ufffd:\ufffd\ufffd\ufffd\ufffd\ufffd\u010a\ufffd,""""+\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdH\ufffd\ufffdTg9n\ufffd\ufffd\ufffd\ufffd\ufffd
 endstream
 endobj
-103 0 obj
-<< /Length 14878
+102 0 obj
+<< /Length 17364
 >>
 stream
 q
@@ -14833,13 +14795,35 @@ Q
 BT
 59.24000000000001 310.15168058455106 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+64.74000000000001 310.15168058455106 Td
+/F3.0 11 Tf
+<2e> 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
+70.24000000000001 310.15168058455106 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 59.24000000000001 295.41168058455105 Td
@@ -14860,8 +14844,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 97.74000000000001 295.41168058455105 Td
@@ -14882,8 +14866,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 119.74000000000001 295.41168058455105 Td
@@ -14904,8 +14888,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 185.74 295.41168058455105 Td
@@ -14959,8 +14943,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 103.24000000000001 280.67168058455104 Td
@@ -14981,8 +14965,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 141.74 280.67168058455104 Td
@@ -15003,8 +14987,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 163.74 280.67168058455104 Td
@@ -15025,8 +15009,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 229.74 280.67168058455104 Td
@@ -15102,13 +15086,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 185.74 265.93168058455103 Td
 /F3.0 11 Tf
-<2266696e6442794e616d6522> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+191.24 265.93168058455103 Td
+/F3.0 11 Tf
+<66696e6442794e616d65> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+246.24 265.93168058455103 Td
+/F3.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -15179,13 +15185,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 323.24 265.93168058455103 Td
 /F3.0 11 Tf
-<224a444f514c22> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+328.74 265.93168058455103 Td
+/F3.0 11 Tf
+<4a444f514c> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+356.24 265.93168058455103 Td
+/F3.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -15256,13 +15284,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 191.24 251.19168058455102 Td
 /F3.0 11 Tf
-<2253454c4543542022> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+196.74 251.19168058455102 Td
+/F3.0 11 Tf
+<53454c45435420> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+235.24 251.19168058455102 Td
+/F3.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -15300,13 +15350,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 202.24 236.45168058455104 Td
 /F3.0 11 Tf
-<2246524f4d20646f6d2e6f776e6572732e4f776e65722022> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+207.74 236.45168058455104 Td
+/F3.0 11 Tf
+<46524f4d20646f6d2e6f776e6572732e4f776e657220> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+328.74 236.45168058455104 Td
+/F3.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -15344,13 +15416,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 202.24 221.71168058455106 Td
 /F3.0 11 Tf
-<225748455245206e616d652e6d617463686573283a6e616d652922> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+207.74 221.71168058455106 Td
+/F3.0 11 Tf
+<5748455245206e616d652e6d617463686573283a6e616d6529> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+345.24 221.71168058455106 Td
+/F3.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -15372,17 +15466,28 @@ ET
 BT
 59.24000000000001 206.97168058455105 Td
 /F3.0 11 Tf
-<7d29> Tj
+<7d> 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
+64.74000000000001 206.97168058455105 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24000000000001 192.23168058455104 Td
-/F5.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -15399,12 +15504,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 192.23168058455104 Td
-/F5.0 11 Tf
+/F3.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -15421,12 +15526,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 192.23168058455104 Td
-/F5.0 11 Tf
+/F3.0 11 Tf
 <4f776e6572> Tj
 ET
 
@@ -15449,7 +15554,29 @@ ET
 BT
 163.74 192.23168058455104 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+169.24 192.23168058455104 Td
+/F3.0 11 Tf
+<2e> 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
+174.74 192.23168058455104 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -15493,7 +15620,29 @@ ET
 BT
 81.24000000000001 177.49168058455106 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+86.74000000000001 177.49168058455106 Td
+/F3.0 11 Tf
+<2e> 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
+92.24000000000001 177.49168058455106 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -15536,7 +15685,7 @@ ET
 
 BT
 127.81950000000002 124.87268058455106 Td
-/F6.0 10.5 Tf
+/F5.0 10.5 Tf
 <c9> Tj
 ET
 
@@ -15610,27 +15759,26 @@ Q
 
 endstream
 endobj
-104 0 obj
+103 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 103 0 R
+/Contents 102 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/XObject << /I13 102 0 R
-/Stamp1 489 0 R
+/XObject << /I13 101 0 R
+/Stamp1 488 0 R
 >>
 /Font << /F2.0 18 0 R
 /F3.0 30 0 R
 /F4.1 39 0 R
 /F1.0 8 0 R
-/F5.0 40 0 R
-/F6.0 84 0 R
+/F5.0 83 0 R
 >>
 >>
-/Annots [105 0 R]
+/Annots [104 0 R]
 >>
 endobj
-105 0 obj
+104 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -15641,11 +15789,11 @@ endobj
 /Type /Annot
 >>
 endobj
-106 0 obj
-[104 0 R /XYZ 0 488.0966805845511 null]
+105 0 obj
+[103 0 R /XYZ 0 488.0966805845511 null]
 endobj
-107 0 obj
-<< /Length 36870
+106 0 obj
+<< /Length 40584
 >>
 stream
 q
@@ -15679,13 +15827,13 @@ h
 S
 Q
 /DeviceRGB cs
-0.000 0.533 0.000 scn
+0.000 0.400 0.600 scn
 /DeviceRGB CS
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 SCN
 
 BT
 59.24 783.0649999999999 Td
-/F5.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -15702,12 +15850,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 783.0649999999999 Td
-/F5.0 11 Tf
+/F3.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -15724,12 +15872,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 783.0649999999999 Td
-/F5.0 11 Tf
+/F3.0 11 Tf
 <4f776e657273> Tj
 ET
 
@@ -15774,7 +15922,29 @@ ET
 BT
 81.24000000000001 768.3249999999999 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+86.74000000000001 768.3249999999999 Td
+/F3.0 11 Tf
+<2e> 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
+92.24000000000001 768.3249999999999 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -15790,12 +15960,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 81.24000000000001 753.585 Td
-/F5.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -15812,8 +15982,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 753.585 Td
@@ -15834,8 +16004,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 147.24 753.585 Td
@@ -15900,8 +16070,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 125.24000000000001 738.845 Td
@@ -15966,13 +16136,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 262.74 738.845 Td
 /F3.0 11 Tf
-<224e616d6522> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+268.24 738.845 Td
+/F3.0 11 Tf
+<4e616d65> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+290.24 738.845 Td
+/F3.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -15999,12 +16191,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 125.24000000000001 724.105 Td
-/F5.0 11 Tf
+/F3.0 11 Tf
 <66696e616c> Tj
 ET
 
@@ -16021,8 +16213,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 158.24 724.105 Td
@@ -16098,12 +16290,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 103.24000000000001 709.365 Td
-/F5.0 11 Tf
+/F3.0 11 Tf
 <66696e616c> Tj
 ET
 
@@ -16120,8 +16312,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 136.24 709.365 Td
@@ -16186,8 +16378,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 229.74 709.365 Td
@@ -16208,8 +16400,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 268.24 709.365 Td
@@ -16230,13 +16422,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 306.74 709.365 Td
 /F3.0 11 Tf
-<222e2a25732e2a22> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+312.24 709.365 Td
+/F3.0 11 Tf
+<2e2a25732e2a> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+345.24 709.365 Td
+/F3.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16280,7 +16494,18 @@ ET
 BT
 383.74 709.365 Td
 /F3.0 11 Tf
-<293b> Tj
+<29> 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
+389.24 709.365 Td
+/F3.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16296,12 +16521,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 103.24000000000001 694.625 Td
-/F5.0 11 Tf
+/F3.0 11 Tf
 <66696e616c> Tj
 ET
 
@@ -16318,8 +16543,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 136.24 694.625 Td
@@ -16340,8 +16565,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 163.74 694.625 Td
@@ -16439,8 +16664,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 306.74 694.625 Td
@@ -16472,12 +16697,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 147.24 679.885 Td
-/F5.0 11 Tf
+/F3.0 11 Tf
 <6e6577> Tj
 ET
 
@@ -16511,7 +16736,7 @@ ET
 BT
 235.24 679.885 Td
 /F3.0 11 Tf
-<3c3e28> Tj
+<3c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16520,9 +16745,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24 665.145 Td
+240.74 679.885 Td
 /F3.0 11 Tf
-<ca2020202020202020202020202020202020202020202020> Tj
+<3e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16531,6 +16756,28 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
+246.24 679.885 Td
+/F3.0 11 Tf
+<28> 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
+59.24 665.145 Td
+/F3.0 11 Tf
+<ca2020202020202020202020202020202020202020202020> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
+
+BT
 191.24 665.145 Td
 /F3.0 11 Tf
 <4f776e6572> Tj
@@ -16549,8 +16796,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 224.24 665.145 Td
@@ -16582,13 +16829,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 191.24 650.405 Td
 /F3.0 11 Tf
-<2266696e6442794e616d6522> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+196.74 650.405 Td
+/F3.0 11 Tf
+<66696e6442794e616d65> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+251.74 650.405 Td
+/F3.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16615,13 +16884,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 191.24 635.665 Td
 /F3.0 11 Tf
-<226e616d6522> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+196.74 635.665 Td
+/F3.0 11 Tf
+<6e616d65> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+218.74 635.665 Td
+/F3.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16665,7 +16956,29 @@ ET
 BT
 273.74 635.665 Td
 /F3.0 11 Tf
-<29293b> Tj
+<29> 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
+279.24 635.665 Td
+/F3.0 11 Tf
+<29> 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
+284.74 635.665 Td
+/F3.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16681,12 +16994,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 103.24000000000001 620.925 Td
-/F5.0 11 Tf
+/F3.0 11 Tf
 <72657475726e> Tj
 ET
 
@@ -16764,7 +17077,29 @@ ET
 BT
 81.24000000000001 591.4449999999999 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+86.74000000000001 591.4449999999999 Td
+/F3.0 11 Tf
+<2e> 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
+92.24000000000001 591.4449999999999 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16923,12 +17258,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24 484.40500000000003 Td
-/F5.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -16945,12 +17280,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 484.40500000000003 Td
-/F5.0 11 Tf
+/F3.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -16967,12 +17302,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 484.40500000000003 Td
-/F5.0 11 Tf
+/F3.0 11 Tf
 <506574> Tj
 ET
 
@@ -16995,7 +17330,29 @@ ET
 BT
 152.74 484.40500000000003 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+158.24 484.40500000000003 Td
+/F3.0 11 Tf
+<2e> 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
+163.74 484.40500000000003 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17039,7 +17396,29 @@ ET
 BT
 81.24000000000001 469.665 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+86.74000000000001 469.665 Td
+/F3.0 11 Tf
+<2e> 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
+92.24000000000001 469.665 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17055,12 +17434,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 81.24000000000001 454.925 Td
-/F5.0 11 Tf
+/F3.0 11 Tf
 <70726976617465> Tj
 ET
 
@@ -17077,8 +17456,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 125.24000000000001 454.925 Td
@@ -17132,8 +17511,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 440.185 Td
@@ -17154,8 +17533,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 119.74000000000001 440.185 Td
@@ -17176,8 +17555,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 141.74 440.185 Td
@@ -17198,8 +17577,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 207.74 440.185 Td
@@ -17264,13 +17643,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 317.74 440.185 Td
 /F3.0 11 Tf
-<2266616c736522> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+323.24 440.185 Td
+/F3.0 11 Tf
+<66616c7365> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+350.74 440.185 Td
+/F3.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17297,12 +17698,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 425.445 Td
-/F5.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -17319,8 +17720,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 425.445 Td
@@ -17358,7 +17759,18 @@ ET
 BT
 196.74 425.445 Td
 /F3.0 11 Tf
-<2829> Tj
+<28> 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
+202.24 425.445 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17396,12 +17808,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 224.24 425.445 Td
-/F5.0 11 Tf
+/F3.0 11 Tf
 <72657475726e> Tj
 ET
 
@@ -17473,12 +17885,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 410.70500000000004 Td
-/F5.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -17495,12 +17907,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 410.70500000000004 Td
-/F5.0 11 Tf
+/F3.0 11 Tf
 <766f6964> Tj
 ET
 
@@ -17539,12 +17951,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 196.74 410.70500000000004 Td
-/F5.0 11 Tf
+/F3.0 11 Tf
 <66696e616c> Tj
 ET
 
@@ -17561,8 +17973,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 229.74 410.70500000000004 Td
@@ -17638,12 +18050,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 312.24 410.70500000000004 Td
-/F5.0 11 Tf
+/F3.0 11 Tf
 <74686973> Tj
 ET
 
@@ -17660,8 +18072,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 339.74 410.70500000000004 Td
@@ -17759,12 +18171,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 395.96500000000003 Td
-/F5.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -17781,8 +18193,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 395.96500000000003 Td
@@ -17803,8 +18215,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 180.24 395.96500000000003 Td
@@ -17858,12 +18270,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 317.74 395.96500000000003 Td
-/F5.0 11 Tf
+/F3.0 11 Tf
 <66696e616c> Tj
 ET
 
@@ -17880,8 +18292,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 350.74 395.96500000000003 Td
@@ -17902,12 +18314,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.000 0.867 scn
-0.000 0.000 0.867 SCN
+1.000 0.400 0.000 scn
+1.000 0.400 0.000 SCN
 
 BT
 411.24 395.96500000000003 Td
-/F5.0 11 Tf
+/F3.0 11 Tf
 <31> Tj
 ET
 
@@ -17935,8 +18347,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 427.74 395.96500000000003 Td
@@ -18012,12 +18424,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 103.24000000000001 381.225 Td
-/F5.0 11 Tf
+/F3.0 11 Tf
 <72657475726e> Tj
 ET
 
@@ -18056,8 +18468,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 180.24 381.225 Td
@@ -18095,7 +18507,18 @@ ET
 BT
 262.74 381.225 Td
 /F3.0 11 Tf
-<293b> Tj
+<29> 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
+268.24 381.225 Td
+/F3.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -18139,7 +18562,29 @@ ET
 BT
 81.24000000000001 351.745 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+86.74000000000001 351.745 Td
+/F3.0 11 Tf
+<2e> 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
+92.24000000000001 351.745 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -18386,22 +18831,21 @@ Q
 
 endstream
 endobj
-108 0 obj
+107 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 107 0 R
+/Contents 106 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F5.0 40 0 R
-/F3.0 30 0 R
+/Font << /F3.0 30 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 489 0 R
+/XObject << /Stamp1 488 0 R
 >>
 >>
 >>
 endobj
-109 0 obj
+108 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 651
@@ -18587,7 +19031,7 @@ c5$
 `[\ufffd\u0230\ufffd\u0136\u0539\ufffd\ufffd\ufffd\ufffdb\ufffd\ufffd\ufffd&\ufffdB!d[E\ufffd`E\ufffd%\ufffd\ufffd\ufffd}\ufffd\ufffd+\ufffd*\ufffd\ufffd\ufffd\ufffdB!\ufffd\ufffdmE\ufffdV\ufffd\u0616:B!\ufffdBLA\ufffd	!\ufffdB\ufffd\u0519B!\ufffd[A\ufffd	!\ufffdB\ufffd\u0519B!\ufffd[\ufffd\u0519B!\ufffd\ufffd5\ufffd=A\ufffd
 endstream
 endobj
-110 0 obj
+109 0 obj
 << /Length 1765
 >>
 stream
@@ -18716,24 +19160,24 @@ Q
 
 endstream
 endobj
-111 0 obj
+110 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 110 0 R
+/Contents 109 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/XObject << /I14 109 0 R
-/I15 113 0 R
-/Stamp1 489 0 R
+/XObject << /I14 108 0 R
+/I15 112 0 R
+/Stamp1 488 0 R
 >>
 /Font << /F1.0 8 0 R
 /F3.0 30 0 R
 >>
 >>
-/Annots [112 0 R 114 0 R]
+/Annots [111 0 R 113 0 R]
 >>
 endobj
-112 0 obj
+111 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -18744,7 +19188,7 @@ endobj
 /Type /Annot
 >>
 endobj
-113 0 obj
+112 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 651
@@ -18825,7 +19269,7 @@ J\u04faBe
 \ufffdc,\ufffdt\ufffd\ufffd\ufffdlX\u0476q\u07b0\ufffd#l\ufffd\ufffd\u0736\ufffd\u56f1u[M\ufffd\ufffdzD\ufffdm\ufffdg\ufffd.\ufffd\u042f\ufffd.\ufffd\u32fe\ufffd\ufffd\ufffd\ufffd+\ufffd\ufffd\ufffdj\ufffd�\ufffd\ufffdm#0\ufffd\ufffdW\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdy\ufffd\ufffd#Wl^\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdh-\ufffd\ufffd`\ufffd\ufffd\ufffd\ufffd\ufffd7w\ufffd\ufffd\ufffdX\ufffd\ufffd\u5b65\ufffdw\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdw\u034aC*\ufffd\ufffdFu\ufffd\ufffd:\ufffd\u0211\ufffd\u072f\ufffd\u044d\ufffd\ufffd\ufffdQ\ufffd\ufffd\ufffd\ufffdvJ.\ufffd\ufffdw{\ufffd\ufffd\ufffd\ufffdS\ufffd\ufffdCAfL*\ufffd8i\ufffd\ufffdm\ufffd\ufffd<=\ufffdz\ufffd\ufffd,"G\ufffds\ufffd\ufffd\\ufffd\ufffd[\ufffd:\ufffd\ufffd\ufffd\ufffd<x\u049dK\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd=Fu\ufffd\ufffd|1;]z\ufffd\ufffd\ufffdo)\ufffdD\ufffd\ufffdK\ufffd-oii\ufffd;@9\ufffd\ufffd\ufffd\ufffd\ufffdO\ufffd\ufffd\ufffd!""R\ufffd9Q\ufffd\ufffd;\ufffd[\ufffd~}\ufffd\ufffdcWS\ufffdD\ufffd^\ufffd\ufffdO\ufffdi\u07fb\ufffd\ufffd\ufffdd\ufffd\ufffd\ufffd\ufffdrN\ufffd\ufffd<\ufffd\u041e\ufffd.[\ufffd<\ufffdN<5\ufffdf\ufffd\ufffd	T\ufffdEDDDDN\ufffd\ufffd"""""IQ\ufffdEDDDD\ufffd\ufffd:\ufffd\ufffd\ufffd\ufffd\ufffd$EuI\ufffd\ufffd,""""\ufffd\ufffdYDDDD$)\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdHRTg\ufffd\ufffd\ufffd\ufffd"""""IQ\ufffdEDDDD\ufffd\ufffd:\ufffd\ufffd\ufffd\ufffd\ufffd$EuI\ufffd\ufffd,""""\ufffd\ufffdYDDDD$)\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdHRTg\ufffd\ufffd^u\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd[^\ufffd\ufffde8*qRu\ufffd\ufffd\ufffdO\ufffde\ufffd\ufffdn\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdT\ufffdG\ufffdJ\ufffdT\ufffd\ufffd\ufffd\ufffd
 \ufffd5\ufffdv\GDDDD\ufffd\ufffd58\ufffdpT\ufffd\ufffd,"""""eQ\ufffdEDDDD\ufffd\ufffd:\ufffd\ufffd\ufffd\ufffd\ufffd$EuI\ufffd\ufffd,""""\ufffd\ufffd\ufffd\ufffd,"""""]\ufffd\ufffd&N\ufffd^
 endstream
 endobj
-114 0 obj
+113 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -18836,7 +19280,7 @@ endobj
 /Type /Annot
 >>
 endobj
-115 0 obj
+114 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 651
@@ -18969,7 +19413,7 @@ U
 r\\u0579\ufffd\ufffd!\ufffdv_d\ufffd\ufffd\ufffd\ufffd\ufffd)\ufffd\ufffd<\ufffd'\ufffd\ufffdZ\ufffd*\ufffd\ufffdSWS\ufffd\ufffd\ufffdW\ufffd04\ufffdu\ufffdO\ufffd}\ufffd!""r&\ufffd\\ufffds\ufffdl{^\ufffdp\ufffdr\ufffdHz\ufffd\ufffd\ufffdH\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdH9Gu\ufffd\ufffd\ufffd,""""\ufffdYDDDD$*\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdHTTg\ufffd\ufffd\ufffd\ufffd"""""QQ\ufffdEDDDD\ufffd\ufffd:\ufffd\ufffd\ufffd\ufffd\ufffdDEu\ufffd\ufffd\ufffd,""""\ufffdYDDDD$*\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdHTTg\ufffd\ufffd\ufffd\ufffd"""""QQ\ufffdEDDDD\ufffd\ufffd:\ufffd\ufffd\ufffd\ufffd\ufffdD\ufffd\ufffd\ufffd\ufffdo^z\u49ff\ufffd{\ufffd\ufffdB\ufffd8\ufffd:O{\ufffd\ufffde\ufffd\ufffd\ufffd-""""rF%\ufffd\ufffdP\ufffdC%\ufffd\ufffd\ufffd3^\ufffde\ufffd5\ufffdp\ufffd3*\ufffd\ufffd2*qTu\ufffd\ufffd\ufffd\ufffd"""""QQ\ufffdEDDDD\ufffd\ufffd:\ufffd\ufffd\ufffd\ufffd\ufffdDEu\ufffdJcu\ufffdc\ufffd\ufffd\ufffd\ufffds
 endstream
 endobj
-116 0 obj
+115 0 obj
 << /Length 1219
 >>
 stream
@@ -19065,24 +19509,24 @@ Q
 
 endstream
 endobj
-117 0 obj
+116 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 116 0 R
+/Contents 115 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/XObject << /I16 115 0 R
-/I17 119 0 R
-/Stamp1 489 0 R
+/XObject << /I16 114 0 R
+/I17 118 0 R
+/Stamp1 488 0 R
 >>
 /Font << /F1.0 8 0 R
 /F3.0 30 0 R
 >>
 >>
-/Annots [118 0 R 120 0 R]
+/Annots [117 0 R 119 0 R]
 >>
 endobj
-118 0 obj
+117 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -19093,7 +19537,7 @@ endobj
 /Type /Annot
 >>
 endobj
-119 0 obj
+118 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 651
@@ -19187,7 +19631,7 @@ n
 \ufffd@\ufffd\ufffdk\ufffd\ufffd\ufffd\ufffdn\ufffd\ufffdi\ufffdt\ufffd,\ufffdj4\ufffd\ufffd\ufffd\ufffd=4[J\ufffdz\ufffd\ufffd&\ufffd\ufffd\ufffd\ufffdA\ufffd/\ufffd<u\ufffd\ufffd\ufffd\ufffdR\ufffd\ufffd\ufffd/S\ufffd\u9dc9O\ufffd\ufffd\ufffdo\ufffd+7n\ufffd#Y\ufffd\ufffd\ufffdi=W^\ufffde\ufffd\ufffd4\u1b61\ufffd\ufffdp}\ufffd\ufffd\ufffd\u03e43D\ufffd\ufffdE

<TRUNCATED>

[23/44] isis-site git commit: ISIS-1594: provide an 'edit' button

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/guides/ugbtb.html
----------------------------------------------------------------------
diff --git a/content/guides/ugbtb.html b/content/guides/ugbtb.html
index 78fc56c..112cd91 100644
--- a/content/guides/ugbtb.html
+++ b/content/guides/ugbtb.html
@@ -1,12 +1,10 @@
 <!doctype html>
 <html class="no-js" lang="en">
-<head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-
-    <title>Beyond the Basics</title>
-
-    <!--
+ <head> 
+  <meta charset="utf-8"> 
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"> 
+  <title>Beyond the Basics</title> 
+  <!--
         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
@@ -23,31 +21,21 @@
         KIND, either express or implied.  See the License for the
         specific language governing permissions and limitations
         under the License.
-    -->
-
-    <!-- No caching headers -->
-    <meta http-equiv="cache-control" content="no-cache" />
-    <meta http-equiv="pragma" content="no-cache" />
-    <meta http-equiv="expires" content="-1" />
-
-
-    <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
-    <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet" />
-    <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script>
-    <link href="../css/asciidoctor/colony.css" rel="stylesheet">
-    <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-
-
-
-    <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
-    <!--[if lt IE 9]>
+    --> 
+  <!-- No caching headers --> 
+  <meta http-equiv="cache-control" content="no-cache"> 
+  <meta http-equiv="pragma" content="no-cache"> 
+  <meta http-equiv="expires" content="-1"> 
+  <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line --> 
+  <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet"> 
+  <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script> 
+  <link href="../css/asciidoctor/colony.css" rel="stylesheet"> 
+  <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet"> 
+  <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet"> 
+  <!--[if lt IE 9]>
       <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
-    <![endif]-->
-
-
-
-    <style type="text/css">
+    <![endif]--> 
+  <style type="text/css">
         pre code {
             background-color: inherit;
             border-style: none;
@@ -192,9 +180,8 @@ table.CodeRay td.code>pre{padding:0}
         color:#fff;
         font-size: 1.1em;
     }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         @media only screen and (min-width: 40.063em) {
           .top-bar {
             .contain-to-grid .top-bar {
@@ -205,9 +192,8 @@ table.CodeRay td.code>pre{padding:0}
         .row {
             max-width: 80rem;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .extended-quote,
         .extended-quote-first {
             margin-left: 40px;
@@ -231,9 +217,8 @@ table.CodeRay td.code>pre{padding:0}
             text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
         }
         
-    </style>
-
-    <style>
+    </style> 
+  <style>
         body {
           position: relative;
         }
@@ -255,6 +240,7 @@ table.CodeRay td.code>pre{padding:0}
 
         div#doc-content {
             margin-top: 30px;
+            padding-top: 30px;
         }
 
         div.documentation-page table.frame-all {
@@ -286,9 +272,8 @@ table.CodeRay td.code>pre{padding:0}
             min-height: 2000px;
         }
 
-    </style>
-
-    <style>
+    </style> 
+  <style>
 
         @media only screen and (min-width: 768px) {
           #toc.toc2 ul ul { margin-left: -10px; }
@@ -316,15 +301,13 @@ table.CodeRay td.code>pre{padding:0}
         body div#toc2 li.tocify-item.active a {
             color: red;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         footer {
             margin-top: 1000px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* overriding colony.css stylesheet */
         .literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
            /*padding: 1.25em 1.5625em 1.125em 1.5625em;*/
@@ -372,9 +355,8 @@ table.CodeRay td.code>pre{padding:0}
         .imageblock img {
             margin-bottom: 10px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* from http://ben.balter.com/2014/03/13/pages-anchor-links/ */
         .header-link {
           position: absolute;
@@ -395,9 +377,8 @@ table.CodeRay td.code>pre{padding:0}
         h6:hover .header-link {
           opacity: 1;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .top-bar
         {
             -webkit-transition-duration: .5s;
@@ -425,548 +406,467 @@ table.CodeRay td.code>pre{padding:0}
             -webkit-transition-property: -webkit-transform;
             transition-property: transform;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         #doc-content a.guide {
             color: white;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
+        .tocify {
+            margin-top: 80px;
+        }
+    </style> 
+  <style>
         .tocify {
             margin-top: 80px;
         }
-    </style>
-
-
-</script>
-
-</head>
-<body>
-
-<<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
-    <div class="github-fork-ribbon">
-        <a href="https://github.com/apache/isis#fork-destination-box">Fork me on GitHub</a>
-    </div>
-</div>
-
-
-<div class="row">
-
-    <div class="fixed contain-to-grid header">
-        <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
-            <ul class="title-area">
-                <li class="name">
-                    <h1>
-                        <a href="/index.html">Apache Isis&trade;</a>
-                    </h1>
-                </li>
-                <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
-                <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
-            </ul>
-
-            <section class="top-bar-section">
-                <ul class="right">
-
-                    <li class="has-form">
-                       <FORM class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
-                        <div class="row collapse">
-                            <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
-                            <INPUT type="hidden" name="cof" value="FORID:0">
-                            <INPUT class="form-control" name="q" type="text" placeholder="Search">
-                        </div>
-                    </FORM>
-                     </li>
-
-                </ul>
-
-                <!-- Left Nav Section -->
-                <ul class="left">
-
-                    <li><a href="/documentation.html">Documentation</a></li>
-                    <li><a href="/downloads.html">Downloads</a></li>
-                    <li><a href="/help.html">Help</a></li>
-                    <li><a href="/asf.html">@ASF</a></li>
-
-                </ul>
-
-            </section>
-        </nav>
-    </div>
-</div>
-
-<div class="row">
-
-    <div id="doc-content-left" class="large-9 medium-9 columns">
-
-
-        <div id="doc-content">
-          <div class="sect1">
-<h2 id="_ugbtb">1. Beyond the Basics</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>This guide provides <a href="#_ugbtb_other-techniques">more advanced</a> guidance on writing maintainable larger
-applications.</p>
-</div>
-<div class="paragraph">
-<p>Later chapters discuss how to <a href="#_ugbtb_deployment">deploy</a> your app, and discuss other ways in which you can <a href="#">extend</a> or adapt the framework itself to your particular needs.</p>
-</div>
-<div class="sect2">
-<h3 id="_other_guides">1.1. Other Guides</h3>
-<div class="paragraph">
-<p>Apache Isis documentation is broken out into a number of user, reference and "supporting procedures" guides.</p>
-</div>
-<div class="paragraph">
-<p>The user guides available are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="ugfun.html">Fundamentals</a></p>
-</li>
-<li>
-<p><a href="ugvw.html">Wicket viewer</a></p>
-</li>
-<li>
-<p><a href="ugvro.html">Restful Objects viewer</a></p>
-</li>
-<li>
-<p><a href="ugdno.html">DataNucleus object store</a></p>
-</li>
-<li>
-<p><a href="ugsec.html">Security</a></p>
-</li>
-<li>
-<p><a href="ugtst.html">Testing</a></p>
-</li>
-<li>
-<p><a href="#">Beyond the Basics</a> (this guide)</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The reference guides are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="rgant.html">Annotations</a></p>
-</li>
-<li>
-<p><a href="rgsvc.html">Domain Services</a></p>
-</li>
-<li>
-<p><a href="rgcfg.html">Configuration Properties</a></p>
-</li>
-<li>
-<p><a href="rgcms.html">Classes, Methods and Schema</a></p>
-</li>
-<li>
-<p><a href="rgmvn.html">Apache Isis Maven plugin</a></p>
-</li>
-<li>
-<p><a href="rgfis.html">Framework Internal Services</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The remaining guides are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="dg.html">Developers' Guide</a> (how to set up a development environment
-for Apache Isis and contribute back to the project)</p>
-</li>
-<li>
-<p><a href="cgcom.html">Committers' Guide</a> (release procedures and related practices)</p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_ugbtb_view-models">2. View Models</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>View models are a type of domain object (with state, behaviour etc) but where the state is <em>not</em> persisted into the
- JDO/DataNucleus-managed database, but is instead converted to/from a string memento, and held by the calling client.
-This opens up a number of more advanced use cases.</p>
-</div>
-<div class="paragraph">
-<p>In this topic we&#8217;ll explore those use cases, and learn the programming model and conventions to use view models in your application.</p>
-</div>
-<div class="sect2">
-<h3 id="_ugbtb_view-models_use-cases">2.1. Use Cases</h3>
-<div class="paragraph">
-<p>When developing an Apache Isis application you will most likely start off with the persistent domain entities:
-<code>Customer</code>, <code>Order</code>, <code>Product</code>, and so on.  For some applications this may well suffice.  However, if the application
-needs to integrate with other systems, or if the application needs to support reasonably complex business processes, then you may need to look beyond just domain entities.  This section explores these use cases.</p>
-</div>
-<div class="sect3">
-<h4 id="_ugbtb_view-models_use-cases_externally-managed-entities">2.1.1. Externally-managed entities</h4>
-<div class="paragraph">
-<p>Sometimes the entities that make up your application are persisted not in the local JDO/DataNucleus database
-but reside in some other system, for example accessible only through a SOAP web service.  Logically that data
-might still be considered a domain entity and we might want to associate behaviour with it, however it cannot be
-modelled as a domain entity if only because JDO/DataNucleus doesn&#8217;t know about the entity nor how to retrieve or
-update it.</p>
-</div>
-<div class="paragraph">
-<p>There are a couple of ways around this: we could either replicate the data somehow from the external system into the
- Isis-managed database (in which case it is once again just another domain entity), or we could set up a stub/proxy for
- the externally managed entity.  This proxy would hold the reference to the externally-managed domain entity (eg an
- external id), as well as the "smarts" to know how to interact with that entity (by making SOAP web service calls etc).</p>
-</div>
-<div class="paragraph">
-<p>The stub/proxy is a type of view model: a view - if you like - onto the domain entity managed by the external system.</p>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>DataNucleus does in fact define its own <a href="http://www.datanucleus.org/documentation/extensions/store_manager.html">Store Manager</a> extension point, so an alternative architecture would be to implement this interface such that DataNucleus
-could make the calls to the external system; these externally-persisted domain entities would therefore be modelled as regular <code>@PersistenceCapable</code> entities after all.  For entities not persisted externally the implementation would delegate down to the default RDBMS-specific <code>StoreManager</code> provided by DataNucleus itself.</p>
-</div>
-<div class="paragraph">
-<p>An implementation that supported only reading from an external entity ought to be comparatively straight-forward, but
-implementing one that also supported updating external entities would need to carefully consider error conditions if the
-external system is unavailable; distributed transactions are most likely difficult/impossible to implement (and not
-desirable in any case).</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_ugbtb_view-models_use-cases_in-memory-entities">2.1.2. In-memory entities</h4>
-<div class="paragraph">
-<p>As a variation on the above, sometimes there are domain objects that are, conceptually at least entities, but whose
-state is not actually persisted anywhere, merely held in-memory (eg in a hash).</p>
-</div>
-<div class="paragraph">
-<p>A simple example might be read-only configuration data that is read from a config file (eg log4j appender
-definitions) but thereafter is presented in the UI just like any other entity.</p>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_ugbtb_view-models_use-cases_application-layer-view-models">2.1.3. Application-layer view models</h4>
-<div class="paragraph">
-<p>Domain entities (whether locally persisted using JDO/DataNucleus or managed externally) are the bread-and-butter of Apache Isis applications: the focus after all, should be on the business domain concepts and ensuring that they are
-solid.  Generally those domain entities will make sense to the business domain experts: they form the <em>ubiquitous language</em> of the domain.  These domain entities are part of the domain layer.</p>
-</div>
-<div class="paragraph">
-<p>That said, it may not always be practical to expect end-users of the application to interact solely with those domain
-entities.  For example, it may be useful to show a dashboard of the most significant data in the system to a user,
-often pulling in and aggregating information from multiple points of the app.  Obtaining this information by hand (by
- querying the respective services/repositories) would be tedious and slow; far better to have a dashboard do the job for
- the end user.</p>
-</div>
-<div class="paragraph">
-<p>A dashboard object is a model of the most relevant state to the end-user, in other words it is (quite literally) a view
- model.  It is not a persisted entity, instead it belongs to the application layer.</p>
-</div>
-<div class="paragraph">
-<p>A view model need not merely aggregate data; it could also provide actions of its own.  Most likely these actions will
-be queries and will always ultimately just delegate down to the appropriate domain-layer service/repository.  But in
-some cases such view model actions might also modify state of underlying domain entities.</p>
-</div>
-<div class="paragraph">
-<p>Another common use for view models is to help co-ordinate complex business processes; for example to perform a
-quarterly invoicing run, or to upload annual interest rates from an Excel spreadsheet.  In these cases the view model
-might have some state of its own, but in most cases that state does not need to be persisted per se.</p>
-</div>
-<div class="sidebarblock">
-<div class="content">
-<div class="title">Desire Lines</div>
-<div class="paragraph">
-<p>One way to think of application view models is as modelling the "desire line": the commonly-trod path
-that end-users must follow to get from point A to point B as quickly as possible.</p>
-</div>
-<div class="paragraph">
-<p>To explain: there are <a href="http://ask.metafilter.com/62599/Where-the-sidewalk-ends">documented</a>
-<a href="https://sivers.org/walkways">examples</a>
-<a href="http://www.softpanorama.org/People/Wall/larry_wall_articles_and_interviews.shtml">that</a> architects of university
-campus will only add in paths some while after the campus buildings are complete: let the pedestrians figure out the
-routes they want to take.  The name we like best for this idea is "desire lines", though it has also been called
-a "desire path", "paving the path" or "paving the sidewalk".</p>
-</div>
-<div class="paragraph">
-<p>What that means is you should add view models <em>after</em> having built up the domain layer, rather than before.  These view
-models pave that commonly-trod path, automating the steps that the end-user would otherwise have to do by hand.</p>
-</div>
-<div class="paragraph">
-<p>It takes a little practice though, because even when building the domain layer "first", you should still bear in mind
-what the use cases are that those domain entities are trying to support.  You certainly <em>shouldn&#8217;t</em> try to build out a
-domain layer that could support every conceivable use case before starting to think about view models.</p>
-</div>
-<div class="paragraph">
-<p>Instead, you should iterate.  Identify the use case/story/end-user objective that you will deliver value to the
-business.  Then build out the minimum domain entities to support that use case (refining the <a href="ugfun.html#_ugfun_core-concepts_philosophy_domain-driven-design_ubiquitous-language">ubiquitous language</a> as you
-go).  Then, identify if there any view models that could be introduced which would simplify the end-user interactions
-with the system (perhaps automating several related use cases together).</p>
-</div>
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_ugbtb_view-models_use-cases_dtos">2.1.4. DTOs</h4>
-<div class="paragraph">
-<p>DTOs (data transfer objects) are simple classes that (according to <a href="https://en.wikipedia.org/wiki/Data_transfer_object">wikipedia</a>) "carry data between processes".</p>
-</div>
-<div class="paragraph">
-<p>If those two processes are parts of the same overall application (the same team builds and deploys both server and
-client) then there&#8217;s generally no need to define a DTO; just access the entities using Apache Isis'
-<a href="ugvro.html">RestfulObjects viewer</a>.</p>
-</div>
-<div class="paragraph">
-<p>On the other hand, if the client consuming the DTO is a different application&#8201;&#8212;&#8201;by which we mean developed/deployed by
-a different (possible third-party) team&#8201;&#8212;&#8201;then the DTOs act as a formal contract between the provider and the consumer.
-In such cases, exposing domain entities over <a href="ugvro.html">RestfulObjects</a> would be
-"A Bad Thing"&#8482; because the consumer would in effect have access to implementation details that could then not be
-easily changed by the producer.</p>
-</div>
-<div class="paragraph">
-<p>To support this use case, a view model can be defined such that it can act as a DTO.  This is done by annotating the
-class using JAXB annotations; this allows the consumer to obtain the DTO in XML format along with a corresponding
-XSD schema describing the structure of that XML.  A discussion of how that might be done using an ESB such as
-<a href="http://camel.apache.org">Apache Camel&#8482;</a> follows <a href="#_ugbtb_view-models_use-cases_dtos_consumers">below</a>.</p>
-</div>
-<div class="paragraph">
-<p>In case it&#8217;s not obvious, these DTOs are still usable as "regular" view models; they will render in the <a href="ugvw.html">Wicket viewer</a> just like any other.  In fact (as the <a href="#_ugbtb_view-models_programming-model">programming model</a> section below makes clear), these JAXB-annotated view models are in many regards the most powerful of all the alternative ways of writing view models.</p>
-</div>
-<div class="paragraph">
-<p>It&#8217;s also worth noting that it is also possible to download the XML (or XSD) straight from the UI, useful during development.
-The view model simply needs to implement the <a href="rgcms.html#_rgcms_classes_mixins_Dto"><code>Dto</code></a> marker interface; the
-framework has <a href="rgcms.html#_rgcms_classes_mixins_Dto">mixins</a> that contribute the download actions to the view model.</p>
-</div>
-<div class="sect4">
-<h5 id="_ugbtb_view-models_use-cases_dtos_consumers">DTO Consumers</h5>
-<div class="paragraph">
-<p>The actual consumers of DTOs will generally obtain the XML of the view models either by requesting the XML directly,
-eg using the <a href="ugvro.html">RestfulObjects viewer</a>, or may have the XML sent to them asynchronously using an ESB
-such as Apache Camel.</p>
-</div>
-<div class="paragraph">
-<p>In the former case, the consumer requests the DTO by calling the REST API with the appropriate HTTP <code>Accept</code> header.
-An appropriate implementation of <a href="rgsvc.html#_rgsvc_spi_ContentMappingService"><code>ContentMappingService</code></a> can then be
-used to return the appropriate DTO (as XML).</p>
-</div>
-<div class="paragraph">
-<p>For the latter case, one design is simply for the application to instantiate the view model, then call the
-<a href="rgsvc.html#_rgsvc_api_JaxbService"><code>JaxbService</code></a> to obtain its corresponding XML.  This can then be published onto
-the ESB, for example using an <a href="http://activemq.apache.org">Apache ActiveMQ &#8482;</a> queue.</p>
-</div>
-<div class="paragraph">
-<p>However, rather than try to push all the data that might be needed by any of these external systems in a single XML event
- (which would require anticipating all the requirements, likely a hopeless task), a better design is to publish only
- the fact that something of note has changed - ie, that an action on a domain object has been invoked - and then let the consumers call back to obtain other information if required.  This can once again be done by calling the REST API with
- an appropriate HTTP <code>Accept</code> header.</p>
-</div>
-<div class="admonitionblock tip">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-tip" title="Tip"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>This is an example of the <a href="https://leanpub.com/camel-design-patterns">VETRO pattern</a> (validate, enrich, transform, route, operate).  In our case we focus on the validation (to determine the nature of the inbound message, ie which action was
-invoked), and the enrich (callback to obtain a DTO with additional information required by the consumer).</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>The (non-ASF) <a href="http://github.com/isisaddons/isis-module-publishmq">Isis addons' publishmq</a> module provides an out-of-the-box solution of this design.  It provides an implementation of the <a href="rgsvc.html#_rgsvc_spi_PublishingService"><code>PublishingService</code></a>,
-but which simply publishes instances of <a href="rgcms.html#_rgcms_schema-aim"><code>ActionInvocationMemento</code></a> to an ActiveMQ
-queue.  Camel (or similar) can then be hooked up to consume these events from this queue, and use a processor to
-parse the action memento to determine what has changed on the source system.  Thereafter, a subsequent Camel processor
-can then call back to the source - via the <a href="#ugvro.adoc">Restful Objects viewer</a> - to enrich the message with
-additional details using a DTO.</p>
-</div>
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_ugbtb_view-models_programming-model">2.2. Programming Model</h3>
-<div class="paragraph">
-<p>So much for the theory; how should view models be implemented?  Fundamentally all view models' state is serialized into
-a string memento; this memento is then held by the client (browser) in the form of a URL.  As you might imagine, this
-URL can become quite long, but Apache Isis offers a mechanism (the <a href="rgsvc.html#_rgsvc_spi_UrlEncodingService"><code>UrlEncodingService</code></a>) if it exceeds the maximum length for a URL
-(2083 characters).  Also, of course, this string memento must only contain characters that it is valid for use within
-a URL.</p>
-</div>
-<div class="paragraph">
-<p>While the underlying technique is the same irrespective of use case, the programming model provides various ways of
-defining a view model so that the original intent is not lost.  They are:</p>
-</div>
-<table class="tableblock frame-all grid-all spread">
-<caption class="title">Table 1. View model programming model</caption>
-<colgroup>
-<col style="width: 14.2857%;">
-<col style="width: 57.1428%;">
-<col style="width: 28.5715%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">Use case</th>
-<th class="tableblock halign-left valign-top">Code</th>
-<th class="tableblock halign-left valign-top">Description</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>External entity</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@DomainObject</span>(nature=Nature.EXTERNAL_ENTITY)
-<span class="directive">public</span> <span class="type">class</span> <span class="class">CustomerRecordOnSAP</span> { ... }</code></pre>
-</div>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Annotated with <a href="rgant.html#_rgant-DomainObject_nature"><code>@DomainObject#nature()</code></a> and a nature of <code>EXTERNAL_ENTITY</code>, with memento derived automatically from the properties of the domain object.  Collections are ignored, as are any properties annotated as <a href="rgant.html#_rgant-Property_notPersisted">not persisted</a>.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>In-memory entity</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@DomainObject</span>(nature=Nature.INMEMORY_ENTITY)
-<span class="directive">public</span> <span class="type">class</span> <span class="class">Log4JAppender</span> { ... }</code></pre>
-</div>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>As preceding, but using a nature of <code>INMEMORY_ENTITY</code>.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Application view model</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@DomainObject</span>(nature=Nature.VIEW_MODEL)
-<span class="directive">public</span> <span class="type">class</span> <span class="class">Dashboard</span> { ... }</code></pre>
-</div>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>As preceding, but using a nature of <code>VIEW_MODEL</code>.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Application view model</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@ViewModel</span>
-<span class="directive">public</span> <span class="type">class</span> <span class="class">Dashboard</span> { ... }</code></pre>
-</div>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Annotated with <a href="rgant.html#_rgant-ViewModel"><code>@ViewModel</code></a> annotation (effectively just an alias)' memento is as preceding: from "persisted" properties, collections ignored</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Application view model</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">ExcelUploadManager</span> <span class="directive">implements</span> ViewModel {
+    </style>  
+ </head> 
+ <body> 
+  <div class="row"> 
+   <div class="fixed contain-to-grid header"> 
+    <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem"> 
+     <ul class="title-area"> 
+      <li class="name"> <h1> <a href="/index.html">Apache Isis\u2122</a> </h1> </li> 
+      <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone --> 
+      <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li> 
+     </ul> 
+     <section class="top-bar-section"> 
+      <ul class="right"> 
+       <li class="has-form"> 
+        <form class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse"> 
+         <div class="row collapse"> 
+          <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya"> 
+          <input type="hidden" name="cof" value="FORID:0"> 
+          <input class="form-control" name="q" type="text" placeholder="Search"> 
+         </div> 
+        </form> </li> 
+      </ul> 
+      <!-- Left Nav Section --> 
+      <ul class="left"> 
+       <li><a href="/documentation.html">Documentation</a></li> 
+       <li><a href="/downloads.html">Downloads</a></li> 
+       <li><a href="/help.html">Help</a></li> 
+       <li><a href="/asf.html">@ASF</a></li> 
+      </ul> 
+     </section> 
+    </nav> 
+   </div> 
+  </div> 
+  <div class="row"> 
+   <div id="doc-content-left" class="large-9 medium-9 columns"> 
+    <div id="doc-content">
+     <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/ugbtb.adoc&quot;" style="float: right; font-size: small; padding: 6px;  "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+     <div class="sect1"> 
+      <h2 id="_ugbtb">1. Beyond the Basics</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_ugbtb.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>This guide provides <a href="#_ugbtb_other-techniques">more advanced</a> guidance on writing maintainable larger applications.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>Later chapters discuss how to <a href="#_ugbtb_deployment">deploy</a> your app, and discuss other ways in which you can <a href="#">extend</a> or adapt the framework itself to your particular needs.</p> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_other_guides">1.1. Other Guides</h3> 
+        <div class="paragraph"> 
+         <p>Apache Isis documentation is broken out into a number of user, reference and "supporting procedures" guides.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The user guides available are:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><a href="ugfun.html">Fundamentals</a></p> </li> 
+          <li> <p><a href="ugvw.html">Wicket viewer</a></p> </li> 
+          <li> <p><a href="ugvro.html">Restful Objects viewer</a></p> </li> 
+          <li> <p><a href="ugdno.html">DataNucleus object store</a></p> </li> 
+          <li> <p><a href="ugsec.html">Security</a></p> </li> 
+          <li> <p><a href="ugtst.html">Testing</a></p> </li> 
+          <li> <p><a href="#">Beyond the Basics</a> (this guide)</p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The reference guides are:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><a href="rgant.html">Annotations</a></p> </li> 
+          <li> <p><a href="rgsvc.html">Domain Services</a></p> </li> 
+          <li> <p><a href="rgcfg.html">Configuration Properties</a></p> </li> 
+          <li> <p><a href="rgcms.html">Classes, Methods and Schema</a></p> </li> 
+          <li> <p><a href="rgmvn.html">Apache Isis Maven plugin</a></p> </li> 
+          <li> <p><a href="rgfis.html">Framework Internal Services</a></p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The remaining guides are:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><a href="dg.html">Developers' Guide</a> (how to set up a development environment for Apache Isis and contribute back to the project)</p> </li> 
+          <li> <p><a href="cgcom.html">Committers' Guide</a> (release procedures and related practices)</p> </li> 
+         </ul> 
+        </div> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_ugbtb_view-models">2. View Models</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_ugbtb_view-models.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>View models are a type of domain object (with state, behaviour etc) but where the state is <em>not</em> persisted into the JDO/DataNucleus-managed database, but is instead converted to/from a string memento, and held by the calling client. This opens up a number of more advanced use cases.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>In this topic we\u2019ll explore those use cases, and learn the programming model and conventions to use view models in your application.</p> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_ugbtb_view-models_use-cases">2.1. Use Cases</h3> 
+        <div class="paragraph"> 
+         <p>When developing an Apache Isis application you will most likely start off with the persistent domain entities: <code>Customer</code>, <code>Order</code>, <code>Product</code>, and so on. For some applications this may well suffice. However, if the application needs to integrate with other systems, or if the application needs to support reasonably complex business processes, then you may need to look beyond just domain entities. This section explores these use cases.</p> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_ugbtb_view-models_use-cases_externally-managed-entities">2.1.1. Externally-managed entities</h4> 
+         <div class="paragraph"> 
+          <p>Sometimes the entities that make up your application are persisted not in the local JDO/DataNucleus database but reside in some other system, for example accessible only through a SOAP web service. Logically that data might still be considered a domain entity and we might want to associate behaviour with it, however it cannot be modelled as a domain entity if only because JDO/DataNucleus doesn\u2019t know about the entity nor how to retrieve or update it.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>There are a couple of ways around this: we could either replicate the data somehow from the external system into the Isis-managed database (in which case it is once again just another domain entity), or we could set up a stub/proxy for the externally managed entity. This proxy would hold the reference to the externally-managed domain entity (eg an external id), as well as the "smarts" to know how to interact with that entity (by making SOAP web service calls etc).</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>The stub/proxy is a type of view model: a view - if you like - onto the domain entity managed by the external system.</p> 
+         </div> 
+         <div class="admonitionblock note"> 
+          <table> 
+           <tbody>
+            <tr> 
+             <td class="icon"> <i class="fa icon-note" title="Note"></i> </td> 
+             <td class="content"> 
+              <div class="paragraph"> 
+               <p>DataNucleus does in fact define its own <a href="http://www.datanucleus.org/documentation/extensions/store_manager.html">Store Manager</a> extension point, so an alternative architecture would be to implement this interface such that DataNucleus could make the calls to the external system; these externally-persisted domain entities would therefore be modelled as regular <code>@PersistenceCapable</code> entities after all. For entities not persisted externally the implementation would delegate down to the default RDBMS-specific <code>StoreManager</code> provided by DataNucleus itself.</p> 
+              </div> 
+              <div class="paragraph"> 
+               <p>An implementation that supported only reading from an external entity ought to be comparatively straight-forward, but implementing one that also supported updating external entities would need to carefully consider error conditions if the external system is unavailable; distributed transactions are most likely difficult/impossible to implement (and not desirable in any case).</p> 
+              </div> </td> 
+            </tr> 
+           </tbody>
+          </table> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_ugbtb_view-models_use-cases_in-memory-entities">2.1.2. In-memory entities</h4> 
+         <div class="paragraph"> 
+          <p>As a variation on the above, sometimes there are domain objects that are, conceptually at least entities, but whose state is not actually persisted anywhere, merely held in-memory (eg in a hash).</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>A simple example might be read-only configuration data that is read from a config file (eg log4j appender definitions) but thereafter is presented in the UI just like any other entity.</p> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_ugbtb_view-models_use-cases_application-layer-view-models">2.1.3. Application-layer view models</h4> 
+         <div class="paragraph"> 
+          <p>Domain entities (whether locally persisted using JDO/DataNucleus or managed externally) are the bread-and-butter of Apache Isis applications: the focus after all, should be on the business domain concepts and ensuring that they are solid. Generally those domain entities will make sense to the business domain experts: they form the <em>ubiquitous language</em> of the domain. These domain entities are part of the domain layer.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>That said, it may not always be practical to expect end-users of the application to interact solely with those domain entities. For example, it may be useful to show a dashboard of the most significant data in the system to a user, often pulling in and aggregating information from multiple points of the app. Obtaining this information by hand (by querying the respective services/repositories) would be tedious and slow; far better to have a dashboard do the job for the end user.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>A dashboard object is a model of the most relevant state to the end-user, in other words it is (quite literally) a view model. It is not a persisted entity, instead it belongs to the application layer.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>A view model need not merely aggregate data; it could also provide actions of its own. Most likely these actions will be queries and will always ultimately just delegate down to the appropriate domain-layer service/repository. But in some cases such view model actions might also modify state of underlying domain entities.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>Another common use for view models is to help co-ordinate complex business processes; for example to perform a quarterly invoicing run, or to upload annual interest rates from an Excel spreadsheet. In these cases the view model might have some state of its own, but in most cases that state does not need to be persisted per se.</p> 
+         </div> 
+         <div class="sidebarblock"> 
+          <div class="content"> 
+           <div class="title">
+            Desire Lines
+           </div> 
+           <div class="paragraph"> 
+            <p>One way to think of application view models is as modelling the "desire line": the commonly-trod path that end-users must follow to get from point A to point B as quickly as possible.</p> 
+           </div> 
+           <div class="paragraph"> 
+            <p>To explain: there are <a href="http://ask.metafilter.com/62599/Where-the-sidewalk-ends">documented</a> <a href="https://sivers.org/walkways">examples</a> <a href="http://www.softpanorama.org/People/Wall/larry_wall_articles_and_interviews.shtml">that</a> architects of university campus will only add in paths some while after the campus buildings are complete: let the pedestrians figure out the routes they want to take. The name we like best for this idea is "desire lines", though it has also been called a "desire path", "paving the path" or "paving the sidewalk".</p> 
+           </div> 
+           <div class="paragraph"> 
+            <p>What that means is you should add view models <em>after</em> having built up the domain layer, rather than before. These view models pave that commonly-trod path, automating the steps that the end-user would otherwise have to do by hand.</p> 
+           </div> 
+           <div class="paragraph"> 
+            <p>It takes a little practice though, because even when building the domain layer "first", you should still bear in mind what the use cases are that those domain entities are trying to support. You certainly <em>shouldn\u2019t</em> try to build out a domain layer that could support every conceivable use case before starting to think about view models.</p> 
+           </div> 
+           <div class="paragraph"> 
+            <p>Instead, you should iterate. Identify the use case/story/end-user objective that you will deliver value to the business. Then build out the minimum domain entities to support that use case (refining the <a href="ugfun.html#_ugfun_core-concepts_philosophy_domain-driven-design_ubiquitous-language">ubiquitous language</a> as you go). Then, identify if there any view models that could be introduced which would simplify the end-user interactions with the system (perhaps automating several related use cases together).</p> 
+           </div> 
+          </div> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_ugbtb_view-models_use-cases_dtos">2.1.4. DTOs</h4> 
+         <div class="paragraph"> 
+          <p>DTOs (data transfer objects) are simple classes that (according to <a href="https://en.wikipedia.org/wiki/Data_transfer_object">wikipedia</a>) "carry data between processes".</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>If those two processes are parts of the same overall application (the same team builds and deploys both server and client) then there\u2019s generally no need to define a DTO; just access the entities using Apache Isis' <a href="ugvro.html">RestfulObjects viewer</a>.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>On the other hand, if the client consuming the DTO is a different application\u2009\u2014\u2009by which we mean developed/deployed by a different (possible third-party) team\u2009\u2014\u2009then the DTOs act as a formal contract between the provider and the consumer. In such cases, exposing domain entities over <a href="ugvro.html">RestfulObjects</a> would be "A Bad Thing"\u2122 because the consumer would in effect have access to implementation details that could then not be easily changed by the producer.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>To support this use case, a view model can be defined such that it can act as a DTO. This is done by annotating the class using JAXB annotations; this allows the consumer to obtain the DTO in XML format along with a corresponding XSD schema describing the structure of that XML. A discussion of how that might be done using an ESB such as <a href="http://camel.apache.org">Apache Camel\u2122</a> follows <a href="#_ugbtb_view-models_use-cases_dtos_consumers">below</a>.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>In case it\u2019s not obvious, these DTOs are still usable as "regular" view models; they will render in the <a href="ugvw.html">Wicket viewer</a> just like any other. In fact (as the <a href="#_ugbtb_view-models_programming-model">programming model</a> section below makes clear), these JAXB-annotated view models are in many regards the most powerful of all the alternative ways of writing view models.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>It\u2019s also worth noting that it is also possible to download the XML (or XSD) straight from the UI, useful during development. The view model simply needs to implement the <a href="rgcms.html#_rgcms_classes_mixins_Dto"><code>Dto</code></a> marker interface; the framework has <a href="rgcms.html#_rgcms_classes_mixins_Dto">mixins</a> that contribute the download actions to the view model.</p> 
+         </div> 
+         <div class="sect4"> 
+          <h5 id="_ugbtb_view-models_use-cases_dtos_consumers">DTO Consumers</h5> 
+          <div class="paragraph"> 
+           <p>The actual consumers of DTOs will generally obtain the XML of the view models either by requesting the XML directly, eg using the <a href="ugvro.html">RestfulObjects viewer</a>, or may have the XML sent to them asynchronously using an ESB such as Apache Camel.</p> 
+          </div> 
+          <div class="paragraph"> 
+           <p>In the former case, the consumer requests the DTO by calling the REST API with the appropriate HTTP <code>Accept</code> header. An appropriate implementation of <a href="rgsvc.html#_rgsvc_spi_ContentMappingService"><code>ContentMappingService</code></a> can then be used to return the appropriate DTO (as XML).</p> 
+          </div> 
+          <div class="paragraph"> 
+           <p>For the latter case, one design is simply for the application to instantiate the view model, then call the <a href="rgsvc.html#_rgsvc_api_JaxbService"><code>JaxbService</code></a> to obtain its corresponding XML. This can then be published onto the ESB, for example using an <a href="http://activemq.apache.org">Apache ActiveMQ \u2122</a> queue.</p> 
+          </div> 
+          <div class="paragraph"> 
+           <p>However, rather than try to push all the data that might be needed by any of these external systems in a single XML event (which would require anticipating all the requirements, likely a hopeless task), a better design is to publish only the fact that something of note has changed - ie, that an action on a domain object has been invoked - and then let the consumers call back to obtain other information if required. This can once again be done by calling the REST API with an appropriate HTTP <code>Accept</code> header.</p> 
+          </div> 
+          <div class="admonitionblock tip"> 
+           <table> 
+            <tbody>
+             <tr> 
+              <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td> 
+              <td class="content"> 
+               <div class="paragraph"> 
+                <p>This is an example of the <a href="https://leanpub.com/camel-design-patterns">VETRO pattern</a> (validate, enrich, transform, route, operate). In our case we focus on the validation (to determine the nature of the inbound message, ie which action was invoked), and the enrich (callback to obtain a DTO with additional information required by the consumer).</p> 
+               </div> </td> 
+             </tr> 
+            </tbody>
+           </table> 
+          </div> 
+          <div class="paragraph"> 
+           <p>The (non-ASF) <a href="http://github.com/isisaddons/isis-module-publishmq">Isis addons' publishmq</a> module provides an out-of-the-box solution of this design. It provides an implementation of the <a href="rgsvc.html#_rgsvc_spi_PublishingService"><code>PublishingService</code></a>, but which simply publishes instances of <a href="rgcms.html#_rgcms_schema-aim"><code>ActionInvocationMemento</code></a> to an ActiveMQ queue. Camel (or similar) can then be hooked up to consume these events from this queue, and use a processor to parse the action memento to determine what has changed on the source system. Thereafter, a subsequent Camel processor can then call back to the source - via the <a href="#ugvro.adoc">Restful Objects viewer</a> - to enrich the message with additional details using a DTO.</p> 
+          </div> 
+         </div> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_ugbtb_view-models_programming-model">2.2. Programming Model</h3> 
+        <div class="paragraph"> 
+         <p>So much for the theory; how should view models be implemented? Fundamentally all view models' state is serialized into a string memento; this memento is then held by the client (browser) in the form of a URL. As you might imagine, this URL can become quite long, but Apache Isis offers a mechanism (the <a href="rgsvc.html#_rgsvc_spi_UrlEncodingService"><code>UrlEncodingService</code></a>) if it exceeds the maximum length for a URL (2083 characters). Also, of course, this string memento must only contain characters that it is valid for use within a URL.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>While the underlying technique is the same irrespective of use case, the programming model provides various ways of defining a view model so that the original intent is not lost. They are:</p> 
+        </div> 
+        <table class="tableblock frame-all grid-all spread"> 
+         <caption class="title">
+          Table 1. View model programming model
+         </caption> 
+         <colgroup> 
+          <col style="width: 14.2857%;"> 
+          <col style="width: 57.1428%;"> 
+          <col style="width: 28.5715%;"> 
+         </colgroup> 
+         <thead> 
+          <tr> 
+           <th class="tableblock halign-left valign-top">Use case</th> 
+           <th class="tableblock halign-left valign-top">Code</th> 
+           <th class="tableblock halign-left valign-top">Description</th> 
+          </tr> 
+         </thead> 
+         <tbody> 
+          <tr> 
+           <td class="tableblock halign-left valign-top">
+            <div>
+             <div class="paragraph"> 
+              <p>External entity</p> 
+             </div>
+            </div></td> 
+           <td class="tableblock halign-left valign-top">
+            <div>
+             <div class="listingblock"> 
+              <div class="content"> 
+               <pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@DomainObject</span>(nature=Nature.EXTERNAL_ENTITY)
+<span class="directive">public</span> <span class="type">class</span> <span class="class">CustomerRecordOnSAP</span> { ... }</code></pre> 
+              </div> 
+             </div>
+            </div></td> 
+           <td class="tableblock halign-left valign-top">
+            <div>
+             <div class="paragraph"> 
+              <p>Annotated with <a href="rgant.html#_rgant-DomainObject_nature"><code>@DomainObject#nature()</code></a> and a nature of <code>EXTERNAL_ENTITY</code>, with memento derived automatically from the properties of the domain object. Collections are ignored, as are any properties annotated as <a href="rgant.html#_rgant-Property_notPersisted">not persisted</a>.</p> 
+             </div>
+            </div></td> 
+          </tr> 
+          <tr> 
+           <td class="tableblock halign-left valign-top">
+            <div>
+             <div class="paragraph"> 
+              <p>In-memory entity</p> 
+             </div>
+            </div></td> 
+           <td class="tableblock halign-left valign-top">
+            <div>
+             <div class="listingblock"> 
+              <div class="content"> 
+               <pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@DomainObject</span>(nature=Nature.INMEMORY_ENTITY)
+<span class="directive">public</span> <span class="type">class</span> <span class="class">Log4JAppender</span> { ... }</code></pre> 
+              </div> 
+             </div>
+            </div></td> 
+           <td class="tableblock halign-left valign-top">
+            <div>
+             <div class="paragraph"> 
+              <p>As preceding, but using a nature of <code>INMEMORY_ENTITY</code>.</p> 
+             </div>
+            </div></td> 
+          </tr> 
+          <tr> 
+           <td class="tableblock halign-left valign-top">
+            <div>
+             <div class="paragraph"> 
+              <p>Application view model</p> 
+             </div>
+            </div></td> 
+           <td class="tableblock halign-left valign-top">
+            <div>
+             <div class="listingblock"> 
+              <div class="content"> 
+               <pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@DomainObject</span>(nature=Nature.VIEW_MODEL)
+<span class="directive">public</span> <span class="type">class</span> <span class="class">Dashboard</span> { ... }</code></pre> 
+              </div> 
+             </div>
+            </div></td> 
+           <td class="tableblock halign-left valign-top">
+            <div>
+             <div class="paragraph"> 
+              <p>As preceding, but using a nature of <code>VIEW_MODEL</code>.</p> 
+             </div>
+            </div></td> 
+          </tr> 
+          <tr> 
+           <td class="tableblock halign-left valign-top">
+            <div>
+             <div class="paragraph"> 
+              <p>Application view model</p> 
+             </div>
+            </div></td> 
+           <td class="tableblock halign-left valign-top">
+            <div>
+             <div class="listingblock"> 
+              <div class="content"> 
+               <pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@ViewModel</span>
+<span class="directive">public</span> <span class="type">class</span> <span class="class">Dashboard</span> { ... }</code></pre> 
+              </div> 
+             </div>
+            </div></td> 
+           <td class="tableblock halign-left valign-top">
+            <div>
+             <div class="paragraph"> 
+              <p>Annotated with <a href="rgant.html#_rgant-ViewModel"><code>@ViewModel</code></a> annotation (effectively just an alias)' memento is as preceding: from "persisted" properties, collections ignored</p> 
+             </div>
+            </div></td> 
+          </tr> 
+          <tr> 
+           <td class="tableblock halign-left valign-top">
+            <div>
+             <div class="paragraph"> 
+              <p>Application view model</p> 
+             </div>
+            </div></td> 
+           <td class="tableblock halign-left valign-top">
+            <div>
+             <div class="listingblock"> 
+              <div class="content"> 
+               <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">ExcelUploadManager</span> <span class="directive">implements</span> ViewModel {
   <span class="directive">public</span> <span class="predefined-type">String</span> viewModelMemento() { ... }
   <span class="directive">public</span> <span class="type">void</span> viewModelInit(<span class="predefined-type">String</span> memento) { ... }
-}</code></pre>
-</div>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Implement <a href="rgcms.html#_rgcms_classes_super_ViewModel"><code>ViewModel</code></a> interface.  The memento is as defined by the
-interface&#8217;s methods: the programmer has full control (but also full responsibility) for the string memento.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>DTO</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@XmlRootElement</span>(<span class="string"><span class="delimiter">&quot;</span><span class="content">customer</span><span class="delimiter">&quot;</span></span>)
-<span class="directive">public</span> <span class="type">class</span> <span class="class">CustomerDto</span> { ... }</code></pre>
-</div>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Annotate using JAXB <a href="rgant.html#<em>rgant-XmlRootElement"><code>@XmlRootElement</code></a> annotation.  Memento
-derived automatically by serializing the XML graph as implied by the JAXB annotations.  Note that (unlike <code>@ViewModel</code>
-et al) this state _can</em> include collections.</p>
-</div></div></td>
-</tr>
-</tbody>
-</table>
-<div class="paragraph">
-<p>JAXB-annotated DTOs are discussed in more detail immediately <a href="rg.html#_ugbtb_view-models_jaxb">below</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_ugbtb_view-models_jaxb">2.3. JAXB-annotated DTOs</h3>
-<div class="paragraph">
-<p>As noted in the <a href="#_ugbtb_view-models_use-cases">introduction</a>, view models can also be defined using JAXB annotations.
-The serialized form of these view models is therefore XML, which also enables these view models
-to act as DTOs.</p>
-</div>
-<div class="paragraph">
-<p>In case it&#8217;s not obvious, these DTOs are still usable as "regular" view models; they will render in the <a href="ugvw.html">Wicket viewer</a> just like any other.
-In fact, these JAXB-annotated view models are in many regards the most powerful of all the various ways of writing view models:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>their entire state (collections as well as properties) is automatically managed from interaction to interaction.<br></p>
-<div class="paragraph">
-<p>In contrast, using <a href="rgant.html#_rgant-ViewModel"><code>@ViewModel</code></a> (or its <a href="rgant.html#_rgant-DomainObject_nature"><code>@DomainObject#nature()</code></a> equivalent) will only manage the state of properties, but not collections.
-And if using the <a href="rgcms.html#_rgcms_classes_super_ViewModel"><code>ViewModel</code></a> interface, then the programmer must write all the state management (lots of boilerplate).</p>
-</div>
-</li>
-<li>
-<p>JAXB-annotated view models are editable.</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The examples in this section uses the DTO for <code>ToDoItem</code>, taken from the (non-ASF) <a href="http://github.com/isisaddons/isis-app-todoapp">Isis addons' todoapp</a>.
-This DTO is defined as follows:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="keyword">package</span> <span class="namespace">todoapp.app.viewmodels.todoitem.v1</span>;                         <i class="conum" data-value="1"></i><b>(1)</b>
-<span class="annotation">@XmlRootElement</span>(name = <span class="string"><span class="delimiter">&quot;</span><span class="content">toDoItemDto</span><span class="delimiter">&quot;</span></span>)                               <i class="conum" data-value="2"></i><b>(2)</b>
+}</code></pre> 
+              </div> 
+             </div>
+            </div></td> 
+           <td class="tableblock halign-left valign-top">
+            <div>
+             <div class="paragraph"> 
+              <p>Implement <a href="rgcms.html#_rgcms_classes_super_ViewModel"><code>ViewModel</code></a> interface. The memento is as defined by the interface\u2019s methods: the programmer has full control (but also full responsibility) for the string memento.</p> 
+             </div>
+            </div></td> 
+          </tr> 
+          <tr> 
+           <td class="tableblock halign-left valign-top">
+            <div>
+             <div class="paragraph"> 
+              <p>DTO</p> 
+             </div>
+            </div></td> 
+           <td class="tableblock halign-left valign-top">
+            <div>
+             <div class="listingblock"> 
+              <div class="content"> 
+               <pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@XmlRootElement</span>(<span class="string"><span class="delimiter">"</span><span class="content">customer</span><span class="delimiter">"</span></span>)
+<span class="directive">public</span> <span class="type">class</span> <span class="class">CustomerDto</span> { ... }</code></pre> 
+              </div> 
+             </div>
+            </div></td> 
+           <td class="tableblock halign-left valign-top">
+            <div>
+             <div class="paragraph"> 
+              <p>Annotate using JAXB <a href="rgant.html#<em>rgant-XmlRootElement"><code>@XmlRootElement</code></a> annotation. Memento derived automatically by serializing the XML graph as implied by the JAXB annotations. Note that (unlike <code>@ViewModel</code> et al) this state _can include collections.</p> 
+             </div>
+            </div></td> 
+          </tr> 
+         </tbody> 
+        </table> 
+        <div class="paragraph"> 
+         <p>JAXB-annotated DTOs are discussed in more detail immediately <a href="rg.html#_ugbtb_view-models_jaxb">below</a>.</p> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_ugbtb_view-models_jaxb">2.3. JAXB-annotated DTOs</h3> 
+        <div class="paragraph"> 
+         <p>As noted in the <a href="#_ugbtb_view-models_use-cases">introduction</a>, view models can also be defined using JAXB annotations. The serialized form of these view models is therefore XML, which also enables these view models to act as DTOs.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>In case it\u2019s not obvious, these DTOs are still usable as "regular" view models; they will render in the <a href="ugvw.html">Wicket viewer</a> just like any other. In fact, these JAXB-annotated view models are in many regards the most powerful of all the various ways of writing view models:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p>their entire state (collections as well as properties) is automatically managed from interaction to interaction.<br></p> 
+           <div class="paragraph"> 
+            <p>In contrast, using <a href="rgant.html#_rgant-ViewModel"><code>@ViewModel</code></a> (or its <a href="rgant.html#_rgant-DomainObject_nature"><code>@DomainObject#nature()</code></a> equivalent) will only manage the state of properties, but not collections. And if using the <a href="rgcms.html#_rgcms_classes_super_ViewModel"><code>ViewModel</code></a> interface, then the programmer must write all the state management (lots of boilerplate).</p> 
+           </div> </li> 
+          <li> <p>JAXB-annotated view models are editable.</p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The examples in this section uses the DTO for <code>ToDoItem</code>, taken from the (non-ASF) <a href="http://github.com/isisaddons/isis-app-todoapp">Isis addons' todoapp</a>. This DTO is defined as follows:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="java"><span class="keyword">package</span> <span class="namespace">todoapp.app.viewmodels.todoitem.v1</span>;                         <i class="conum" data-value="1"></i><b>(1)</b>
+<span class="annotation">@XmlRootElement</span>(name = <span class="string"><span class="delimiter">"</span><span class="content">toDoItemDto</span><span class="delimiter">"</span></span>)                               <i class="conum" data-value="2"></i><b>(2)</b>
 <span class="annotation">@XmlType</span>(
         propOrder = {                                               <i class="conum" data-value="3"></i><b>(3)</b>
-            <span class="string"><span class="delimiter">&quot;</span><span class="content">majorVersion</span><span class="delimiter">&quot;</span></span>, <span class="string"><span class="delimiter">&quot;</span><span class="content">minorVersion</span><span class="delimiter">&quot;</span></span>,
-            <span class="string"><span class="delimiter">&quot;</span><span class="content">description</span><span class="delimiter">&quot;</span></span>, <span class="string"><span class="delimiter">&quot;</span><span class="content">category</span><span class="delimiter">&quot;</span></span>, ...
-            <span class="string"><span class="delimiter">&quot;</span><span class="content">toDoItem</span><span class="delimiter">&quot;</span></span>, <span class="string"><span class="delimiter">&quot;</span><span class="content">similarItems</span><span class="delimiter">&quot;</span></span>
+            <span class="string"><span class="delimiter">"</span><span class="content">majorVersion</span><span class="delimiter">"</span></span>, <span class="string"><span class="delimiter">"</span><span class="content">minorVersion</span><span class="delimiter">"</span></span>,
+            <span class="string"><span class="delimiter">"</span><span class="content">description</span><span class="delimiter">"</span></span>, <span class="string"><span class="delimiter">"</span><span class="content">category</span><span class="delimiter">"</span></span>, ...
+            <span class="string"><span class="delimiter">"</span><span class="content">toDoItem</span><span class="delimiter">"</span></span>, <span class="string"><span class="delimiter">"</span><span class="content">similarItems</span><span class="delimiter">"</span></span>
         }
 )
 <span class="annotation">@DomainObjectLayout</span>(
         titleUiEvent = TitleUiEvent.Doop.class                      <i class="conum" data-value="4"></i><b>(4)</b>
 )
 <span class="directive">public</span> <span class="type">class</span> <span class="class">ToDoItemV1_1</span> <span class="directive">implements</span> Dto {                          <i class="conum" data-value="5"></i><b>(5)</b>
-    <span class="annotation">@XmlElement</span>(required = <span class="predefined-constant">true</span>, defaultValue = <span class="string"><span class="delimiter">&quot;</span><span class="content">1</span><span class="delimiter">&quot;</span></span>)                <i class="conum" data-value="6"></i><b>(6)</b>
-    <span class="directive">public</span> <span class="directive">final</span> <span class="predefined-type">String</span> getMajorVersion() { <span class="keyword">return</span> <span class="string"><span class="delimiter">&quot;</span><span class="content">1</span><span class="delimiter">&quot;</span></span>; }
-    <span class="annotation">@XmlElement</span>(required = <span class="predefined-constant">true</span>, defaultValue = <span class="string"><span class="delimiter">&quot;</span><span class="content">1</span><span class="delimiter">&quot;</span></span>)                <i class="conum" data-value="7"></i><b>(7)</b>
-    <span class="directive">public</span> <span class="predefined-type">String</span> getMinorVersion() { <span class="keyword">return</span> <span class="string"><span class="delimiter">&quot;</span><span class="content">1</span><span class="delimiter">&quot;</span></span>; }
+    <span class="annotation">@XmlElement</span>(required = <span class="predefined-constant">true</span>, defaultValue = <span class="string"><span class="delimiter">"</span><span class="content">1</span><span class="delimiter">"</span></span>)                <i class="conum" data-value="6"></i><b>(6)</b>
+    <span class="directive">public</span> <span class="directive">final</span> <span class="predefined-type">String</span> getMajorVersion() { <span class="keyword">return</span> <span class="string"><span class="delimiter">"</span><span class="content">1</span><span class="delimiter">"</span></span>; }
+    <span class="annotation">@XmlElement</span>(required = <span class="predefined-constant">true</span>, defaultValue = <span class="string"><span class="delimiter">"</span><span class="content">1</span><span class="delimiter">"</span></span>)                <i class="conum" data-value="7"></i><b>(7)</b>
+    <span class="directive">public</span> <span class="predefined-type">String</span> getMinorVersion() { <span class="keyword">return</span> <span class="string"><span class="delimiter">"</span><span class="content">1</span><span class="delimiter">"</span></span>; }
 
     <span class="annotation">@XmlElement</span>(required = <span class="predefined-constant">true</span>)                                    <i class="conum" data-value="8"></i><b>(8)</b>
     <span class="annotation">@Getter</span> <span class="annotation">@Setter</span>
@@ -979,320 +879,295 @@ This DTO is defined as follows:</p>
     <span class="annotation">@Getter</span> <span class="annotation">@Setter</span>                                                 <i class="conum" data-value="9"></i><b>(9)</b>
     <span class="directive">protected</span> ToDoItem toDoItem;
     <span class="annotation">@XmlElementWrapper</span>                                              <i class="conum" data-value="10"></i><b>(10)</b>
-    <span class="annotation">@XmlElement</span>(name = <span class="string"><span class="delimiter">&quot;</span><span class="content">todoItem</span><span class="delimiter">&quot;</span></span>)
+    <span class="annotation">@XmlElement</span>(name = <span class="string"><span class="delimiter">"</span><span class="content">todoItem</span><span class="delimiter">"</span></span>)
     <span class="annotation">@Getter</span> <span class="annotation">@Setter</span>
     <span class="directive">protected</span> <span class="predefined-type">List</span>&lt;ToDoItem&gt; similarItems = Lists.newArrayList();
-}</code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td>package name encodes major version; see discussion on <a href="#_ugbtb_view-models_jaxb_versioning">versioning</a></td>
-</tr>
-<tr>
-<td><i class="conum" data-value="2"></i><b>2</b></td>
-<td>identifies this class as a view model and defines the root element for JAXB serialization</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="3"></i><b>3</b></td>
-<td>all properties in the class must be listed; (they can be ignored using <code>@XmlTransient</code>)</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="4"></i><b>4</b></td>
-<td>demonstrating use of UI events for a subscriber to provide the DTO&#8217;s title; see <a href="rgant.html#_rgant-DomainObjectLayout_titleUiEvent"><code>@DomainObjectLayout#titleUiEvent()</code></a>.</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="5"></i><b>5</b></td>
-<td>class name encodes (major and) minor version; see discussion on <a href="#_ugbtb_view-models_jaxb_versioning">versioning</a></td>
-</tr>
-<tr>
-<td><i class="conum" data-value="6"></i><b>6</b></td>
-<td>again, see discussion on <a href="#_ugbtb_view-models_jaxb_versioning">versioning</a></td>
-</tr>
-<tr>
-<td><i class="conum" data-value="7"></i><b>7</b></td>
-<td>again, see discussion on <a href="#_ugbtb_view-models_jaxb_versioning">versioning</a></td>
-</tr>
-<tr>
-<td><i class="conum" data-value="8"></i><b>8</b></td>
-<td>simple scalar properties</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="9"></i><b>9</b></td>
-<td>reference to a persistent entity; discussed <a href="#_ugbtb_view-models_jaxb_referencing-domain-entities">below</a></td>
-</tr>
-<tr>
-<td><i class="conum" data-value="10"></i><b>10</b></td>
-<td>reference to a collection of persistent entities; again discussed <a href="#_ugbtb_view-models_jaxb_referencing-domain-entities">below</a></td>
-</tr>
-</table>
-</div>
-<div class="sect3">
-<h4 id="_ugbtb_view-models_jaxb_referencing-domain-entities">2.3.1. Referencing Domain Entities</h4>
-<div class="paragraph">
-<p>It&#8217;s quite common for view models to be "backed by" (be projections of) some underlying domain entity.
-The <code>ToDoItemDto</code> we&#8217;ve been using as the example in this section is an example: there is an underlying <code>ToDoItem</code> entity.</p>
-</div>
-<div class="paragraph">
-<p>It wouldn&#8217;t make sense to serialize out the state of a persistent entity: the point of a DTO is to act as a facade on top of the entity so that the implementation details (of the entity&#8217;s structure) don&#8217;t leak out to the consumer.
-However, the identity of the underlying entity can be well defined; Apache Isis defines the <a href="rgcms.html#_rgcms_schema-common">Common schema</a> which defines the <code>&lt;oid-dto&gt;</code> element (and corresponding <code>OidDto</code> class): the object&#8217;s type and its identifier.
-This is basically a formal XML equivalent to the <code>Bookmark</code> object obtained from the <a href="rgsvc.html#_rgsvc_api_BookmarkService"><code>BookmarkService</code></a>.</p>
-</div>
-<div class="paragraph">
-<p>There is only one requirement to make this work: every referenced domain entity must be annotated with <a href="rgant.html#_rgant-XmlJavaTypeAdapter"><code>@XmlJavaTypeAdapter</code></a>, specifying the framework-provided <code>PersistentEntityAdapter.class</code>.
-This class is similar to the <code>BookmarkService</code>: it knows how to create an <code>OidDto</code> from an object reference.</p>
-</div>
-<div class="paragraph">
-<p>Thus, in our view model we can legitimately write:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="keyword">package</span> <span class="namespace">todoapp.app.viewmodels.todoitem.v1</span>;
+}</code></pre> 
+         </div> 
+        </div> 
+        <div class="colist arabic"> 
+         <table> 
+          <tbody>
+           <tr> 
+            <td><i class="conum" data-value="1"></i><b>1</b></td> 
+            <td>package name encodes major version; see discussion on <a href="#_ugbtb_view-models_jaxb_versioning">versioning</a></td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="2"></i><b>2</b></td> 
+            <td>identifies this class as a view model and defines the root element for JAXB serialization</td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="3"></i><b>3</b></td> 
+            <td>all properties in the class must be listed; (they can be ignored using <code>@XmlTransient</code>)</td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="4"></i><b>4</b></td> 
+            <td>demonstrating use of UI events for a subscriber to provide the DTO\u2019s title; see <a href="rgant.html#_rgant-DomainObjectLayout_titleUiEvent"><code>@DomainObjectLayout#titleUiEvent()</code></a>.</td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="5"></i><b>5</b></td> 
+            <td>class name encodes (major and) minor version; see discussion on <a href="#_ugbtb_view-models_jaxb_versioning">versioning</a></td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="6"></i><b>6</b></td> 
+            <td>again, see discussion on <a href="#_ugbtb_view-models_jaxb_versioning">versioning</a></td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="7"></i><b>7</b></td> 
+            <td>again, see discussion on <a href="#_ugbtb_view-models_jaxb_versioning">versioning</a></td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="8"></i><b>8</b></td> 
+            <td>simple scalar properties</td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="9"></i><b>9</b></td> 
+            <td>reference to a persistent entity; discussed <a href="#_ugbtb_view-models_jaxb_referencing-domain-entities">below</a></td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="10"></i><b>10</b></td> 
+            <td>reference to a collection of persistent entities; again discussed <a href="#_ugbtb_view-models_jaxb_referencing-domain-entities">below</a></td> 
+           </tr> 
+          </tbody>
+         </table> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_ugbtb_view-models_jaxb_referencing-domain-entities">2.3.1. Referencing Domain Entities</h4> 
+         <div class="paragraph"> 
+          <p>It\u2019s quite common for view models to be "backed by" (be projections of) some underlying domain entity. The <code>ToDoItemDto</code> we\u2019ve been using as the example in this section is an example: there is an underlying <code>ToDoItem</code> entity.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>It wouldn\u2019t make sense to serialize out the state of a persistent entity: the point of a DTO is to act as a facade on top of the entity so that the implementation details (of the entity\u2019s structure) don\u2019t leak out to the consumer. However, the identity of the underlying entity can be well defined; Apache Isis defines the <a href="rgcms.html#_rgcms_schema-common">Common schema</a> which defines the <code>&lt;oid-dto&gt;</code> element (and corresponding <code>OidDto</code> class): the object\u2019s type and its identifier. This is basically a formal XML equivalent to the <code>Bookmark</code> object obtained from the <a href="rgsvc.html#_rgsvc_api_BookmarkService"><code>BookmarkService</code></a>.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>There is only one requirement to make this work: every referenced domain entity must be annotated with <a href="rgant.html#_rgant-XmlJavaTypeAdapter"><code>@XmlJavaTypeAdapter</code></a>, specifying the framework-provided <code>PersistentEntityAdapter.class</code>. This class is similar to the <code>BookmarkService</code>: it knows how to create an <code>OidDto</code> from an object reference.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>Thus, in our view model we can legitimately write:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="java"><span class="keyword">package</span> <span class="namespace">todoapp.app.viewmodels.todoitem.v1</span>;
 ...
 public <span class="type">class</span> <span class="class">ToDoItemV1_1</span> <span class="directive">implements</span> Dto {
     ...
     <span class="annotation">@Getter</span> <span class="annotation">@Setter</span>
     <span class="directive">protected</span> ToDoItem toDoItem;
-}</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>All we need to do is remember to add that <code>@XmlJavaTypeAdapter</code> annotation to the referenced entity:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@XmlJavaTypeAdapter</span>(PersistentEntityAdapter.class)
+}</code></pre> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>All we need to do is remember to add that <code>@XmlJavaTypeAdapter</code> annotation to the referenced entity:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@XmlJavaTypeAdapter</span>(PersistentEntityAdapter.class)
 <span class="directive">public</span> <span class="type">class</span> <span class="class">ToDoItem</span> ...  {
     ...
-}</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>It&#8217;s also possible for a DTO to hold collections of objects.
-These can be of any type, either simple properties, or references to other objects.
-The only bit of boilerplate that is required is the <code>@XmlElementWrapper</code> annotation.
-This instructs JAXB to create an XML element (based on the field name) to contain each of the elements.
-(If this is omitted then the contents of the collection are at the same level as the properties; almost certainly not what is required).</p>
-</div>
-<div class="paragraph">
-<p>For example, the DTO also contains:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="keyword">package</span> <span class="namespace">todoapp.app.viewmodels.todoitem.v1</span>;
+}</code></pre> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>It\u2019s also possible for a DTO to hold collections of objects. These can be of any type, either simple properties, or references to other objects. The only bit of boilerplate that is required is the <code>@XmlElementWrapper</code> annotation. This instructs JAXB to create an XML element (based on the field name) to contain each of the elements. (If this is omitted then the contents of the collection are at the same level as the properties; almost certainly not what is required).</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>For example, the DTO also contains:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="java"><span class="keyword">package</span> <span class="namespace">todoapp.app.viewmodels.todoitem.v1</span>;
 ...
 public <span class="type">class</span> <span class="class">ToDoItemV1_1</span> <span class="directive">implements</span> Dto {
     ...
     <span class="annotation">@XmlElementWrapper</span>
-    <span class="annotation">@XmlElement</span>(name = <span class="string"><span class="delimiter">&quot;</span><span class="content">todoItem</span><span class="delimiter">&quot;</span></span>)
+    <span class="annotation">@XmlElement</span>(name = <span class="string"><span class="delimiter">"</span><span class="content">todoItem</span><span class="delimiter">"</span></span>)
     <span class="annotation">@Getter</span> <span class="annotation">@Setter</span>
     <span class="directive">protected</span> <span class="predefined-type">List</span>&lt;ToDoItem&gt; similarItems = Lists.newArrayList();
-}</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>There&#8217;s nothing to prevent a JAXB DTO from containing rich graphs of data, parent containing children containing children.
-Be aware though that all of this state will become the DTO&#8217;s memento, ultimately converted into a URL-safe form, by way of the <a href="rgsvc.html#_rgsvc_spi_UrlEncodingService"><code>UrlEncodingService</code></a>.</p>
-</div>
-<div class="paragraph">
-<p>There are limits to the lengths of URLs, however.
-Therefore the DTO should not include state that can easily be derived from other information.
-If the URL does exceed limits, then provide a custom implementation of <a href="rgsvc.html#_rgsvc_spi_UrlEncodingService"><code>UrlEncodingService</code></a> to handle the memento string in some other fashion (eg substituting it with a GUID, with the memento cached somehow on the server).</p>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_ugbtb_view-models_jaxb_versioning">2.3.2. Versioning</h4>
-<div class="paragraph">
-<p>The whole point of using DTOs (in Apache Isis, at least) is to define a formal contact between two inter-operating but independent applications.
-Since the only thing we can predicate about the future with any certainty is that it one or both of these applications will change, we should version DTOs from the get-go.
-This allows us to make changes going forward without unnecessarily breaking existing consumers of the data.</p>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>There are several ways that versioning might be accomplished; we base our guidelines on this <a href="http://www.xfront.com/Versioning.pdf">article</a> taken from Roger Costello&#8217;s blog, well worth a read.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>We can distinguish two types of changes:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>backwardly compatible changes</p>
-</li>
-<li>
-<p>breaking changes.</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>We can immediately say that the XSD namespace should change only when there is a major/breaking change, if following <a href="http://semver.org">semantic versioning</a> that means when we bump the major version number v1, v2, etc.</p>
-</div>
-<div class="paragraph">
-<p>XML namespaces correspond (when using JAXB) to Java packages.
-We should therefore place our DTOs in a package that contains only the major number; this package will eventually contain a range of DTOs that are intended to be backwardly compatible with one another.
-The package should also have a <code>package-info.java</code>; it is this that declares the XSD namespace:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@javax</span>.xml.bind.annotation.XmlSchema(
-        namespace = <span class="string"><span class="delimiter">&quot;</span><span class="content">http://viewmodels.app.todoapp/todoitem/v1/Dto.xsd</span><span class="delimiter">&quot;</span></span>,        <i class="conum" data-value="1"></i><b>(1)</b>
+}</code></pre> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>There\u2019s nothing to prevent a JAXB DTO from containing rich graphs of data, parent containing children containing children. Be aware though that all of this state will become the DTO\u2019s memento, ultimately converted into a URL-safe form, by way of the <a href="rgsvc.html#_rgsvc_spi_UrlEncodingService"><code>UrlEncodingService</code></a>.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>There are limits to the lengths of URLs, however. Therefore the DTO should not include state that can easily be derived from other information. If the URL does exceed limits, then provide a custom implementation of <a href="rgsvc.html#_rgsvc_spi_UrlEncodingService"><code>UrlEncodingService</code></a> to handle the memento string in some other fashion (eg substituting it with a GUID, with the memento cached somehow on the server).</p> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_ugbtb_view-models_jaxb_versioning">2.3.2. Versioning</h4> 
+         <div class="paragraph"> 
+          <p>The whole point of using DTOs (in Apache Isis, at least) is to define a formal contact between two inter-operating but independent applications. Since the only thing we can predicate about the future with any certainty is that it one or both of these applications will change, we should version DTOs from the get-go. This allows us to make changes going forward without unnecessarily breaking existing consumers of the data.</p> 
+         </div> 
+         <div class="admonitionblock note"> 
+          <table> 
+           <tbody>
+            <tr> 
+             <td class="icon"> <i class="fa icon-note" title="Note"></i> </td> 
+             <td class="content"> 
+              <div class="paragraph"> 
+               <p>There are several ways that versioning might be accomplished; we base our guidelines on this <a href="http://www.xfront.com/Versioning.pdf">ar

<TRUNCATED>

[16/44] isis-site git commit: ISIS-1594: provide an 'edit' button

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/guides/ugsec.pdf
----------------------------------------------------------------------
diff --git a/content/guides/ugsec.pdf b/content/guides/ugsec.pdf
index 64b0018..d66792b 100644
--- a/content/guides/ugsec.pdf
+++ b/content/guides/ugsec.pdf
@@ -4,16 +4,16 @@
 << /Title (Security)
 /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:20161103173523+00'00')
-/ModDate (D:20161103173523+00'00')
+/CreationDate (D:20170307234522+00'00')
+/ModDate (D:20170307234522+00'00')
 >>
 endobj
 2 0 obj
 << /Type /Catalog
 /Pages 3 0 R
 /Names 14 0 R
-/Outlines 248 0 R
-/PageLabels 276 0 R
+/Outlines 247 0 R
+/PageLabels 275 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 32
-/Kids [7 0 R 10 0 R 12 0 R 35 0 R 53 0 R 62 0 R 68 0 R 75 0 R 79 0 R 85 0 R 91 0 R 95 0 R 100 0 R 106 0 R 110 0 R 114 0 R 118 0 R 120 0 R 126 0 R 131 0 R 137 0 R 139 0 R 143 0 R 148 0 R 150 0 R 156 0 R 164 0 R 166 0 R 176 0 R 187 0 R 189 0 R 193 0 R]
+/Kids [7 0 R 10 0 R 12 0 R 35 0 R 53 0 R 61 0 R 67 0 R 74 0 R 78 0 R 84 0 R 90 0 R 94 0 R 99 0 R 105 0 R 109 0 R 113 0 R 117 0 R 119 0 R 125 0 R 130 0 R 136 0 R 138 0 R 142 0 R 147 0 R 149 0 R 155 0 R 163 0 R 165 0 R 175 0 R 186 0 R 188 0 R 192 0 R]
 >>
 endobj
 4 0 obj
@@ -78,13 +78,13 @@ endobj
 endobj
 8 0 obj
 << /Type /Font
-/BaseFont /AAAADY+NotoSerif
+/BaseFont /AAAADM+NotoSerif
 /Subtype /TrueType
-/FontDescriptor 278 0 R
+/FontDescriptor 277 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 280 0 R
-/ToUnicode 279 0 R
+/Widths 279 0 R
+/ToUnicode 278 0 R
 >>
 endobj
 9 0 obj
@@ -1153,7 +1153,7 @@ endobj
 /F4.0 39 0 R
 >>
 >>
-/Annots [194 0 R 195 0 R 196 0 R 197 0 R 198 0 R 199 0 R 200 0 R 201 0 R 202 0 R 203 0 R 204 0 R 205 0 R 206 0 R 207 0 R 208 0 R 209 0 R 210 0 R 211 0 R 212 0 R 213 0 R 214 0 R 215 0 R 216 0 R 217 0 R 218 0 R 219 0 R 220 0 R 221 0 R 222 0 R 223 0 R 224 0 R 225 0 R 226 0 R 227 0 R 228 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 241 0 R 242 0 R 243 0 R 244 0 R 245 0 R 246 0 R]
+/Annots [193 0 R 194 0 R 195 0 R 196 0 R 197 0 R 198 0 R 199 0 R 200 0 R 201 0 R 202 0 R 203 0 R 204 0 R 205 0 R 206 0 R 207 0 R 208 0 R 209 0 R 210 0 R 211 0 R 212 0 R 213 0 R 214 0 R 215 0 R 216 0 R 217 0 R 218 0 R 219 0 R 220 0 R 221 0 R 222 0 R 223 0 R 224 0 R 225 0 R 226 0 R 227 0 R 228 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 241 0 R 242 0 R 243 0 R 244 0 R 245 0 R]
 >>
 endobj
 11 0 obj
@@ -1853,7 +1853,7 @@ endobj
 /Font << /F2.0 16 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 247 0 R
+/XObject << /Stamp1 246 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 31 0 R 32 0 R]
@@ -1868,18 +1868,18 @@ endobj
 >>
 endobj
 15 0 obj
-<< /Kids [152 0 R 153 0 R]
+<< /Kids [151 0 R 152 0 R]
 >>
 endobj
 16 0 obj
 << /Type /Font
-/BaseFont /AAAADZ+NotoSerif-Bold
+/BaseFont /AAAADN+NotoSerif-Bold
 /Subtype /TrueType
-/FontDescriptor 282 0 R
+/FontDescriptor 281 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 284 0 R
-/ToUnicode 283 0 R
+/Widths 283 0 R
+/ToUnicode 282 0 R
 >>
 endobj
 17 0 obj
@@ -3115,7 +3115,7 @@ endobj
 /F4.0 39 0 R
 /F5.1 43 0 R
 >>
-/XObject << /Stamp1 247 0 R
+/XObject << /Stamp1 246 0 R
 >>
 >>
 /Annots [37 0 R 40 0 R 41 0 R 42 0 R 44 0 R 45 0 R 46 0 R 47 0 R 48 0 R 49 0 R 50 0 R 51 0 R]
@@ -3123,13 +3123,13 @@ endobj
 endobj
 36 0 obj
 << /Type /Font
-/BaseFont /AAAAEA+NotoSerif-Italic
+/BaseFont /AAAADO+NotoSerif-Italic
 /Subtype /TrueType
-/FontDescriptor 286 0 R
+/FontDescriptor 285 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 288 0 R
-/ToUnicode 287 0 R
+/Widths 287 0 R
+/ToUnicode 286 0 R
 >>
 endobj
 37 0 obj
@@ -3145,24 +3145,24 @@ endobj
 endobj
 38 0 obj
 << /Type /Font
-/BaseFont /AAAAEB+NotoSerif
+/BaseFont /AAAADP+NotoSerif
 /Subtype /TrueType
-/FontDescriptor 290 0 R
+/FontDescriptor 289 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 292 0 R
-/ToUnicode 291 0 R
+/Widths 291 0 R
+/ToUnicode 290 0 R
 >>
 endobj
 39 0 obj
 << /Type /Font
-/BaseFont /AAAAEC+mplus1mn-regular
+/BaseFont /AAAADQ+mplus1mn-regular
 /Subtype /TrueType
-/FontDescriptor 294 0 R
+/FontDescriptor 293 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 296 0 R
-/ToUnicode 295 0 R
+/Widths 295 0 R
+/ToUnicode 294 0 R
 >>
 endobj
 40 0 obj
@@ -3200,13 +3200,13 @@ endobj
 endobj
 43 0 obj
 << /Type /Font
-/BaseFont /AAAAED+FontAwesome
+/BaseFont /AAAADR+FontAwesome
 /Subtype /TrueType
-/FontDescriptor 298 0 R
+/FontDescriptor 297 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 300 0 R
-/ToUnicode 299 0 R
+/Widths 299 0 R
+/ToUnicode 298 0 R
 >>
 endobj
 44 0 obj
@@ -3298,7 +3298,7 @@ endobj
 >>
 endobj
 52 0 obj
-<< /Length 12158
+<< /Length 11304
 >>
 stream
 q
@@ -3574,46 +3574,13 @@ f
 h
 S
 Q
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-59.24000000000001 533.6650000000002 Td
-/F6.0 11 Tf
-<697369732e61757468656e7469636174696f6e> 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
-163.74 533.6650000000002 Td
-/F4.0 11 Tf
-<3d> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-169.24 533.6650000000002 Td
+59.24000000000001 533.6650000000002 Td
 /F4.0 11 Tf
-<736869726f> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-59.24000000000001 518.9250000000002 Td
-/F6.0 11 Tf
-<697369732e617574686f72697a6174696f6e> Tj
+<697369732e61757468656e7469636174696f6e3d736869726f> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3622,20 +3589,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-158.24 518.9250000000002 Td
-/F4.0 11 Tf
-<3d> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-163.74 518.9250000000002 Td
+59.24000000000001 518.9250000000002 Td
 /F4.0 11 Tf
-<736869726f> Tj
+<697369732e617574686f72697a6174696f6e3d736869726f> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3888,35 +3844,13 @@ f
 h
 S
 Q
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-59.24000000000001 130.98695064629857 Td
-/F6.0 11 Tf
-<697369732e61757468656e7469636174696f6e2e736869726f2e6175746f4c6f676f75744966416c726561647941757468656e74696361746564> 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
-378.24 130.98695064629857 Td
-/F4.0 11 Tf
-<3d> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-383.74 130.98695064629857 Td
+59.24000000000001 130.98695064629857 Td
 /F4.0 11 Tf
-<66616c7365> Tj
+<697369732e61757468656e7469636174696f6e2e736869726f2e6175746f4c6f676f75744966416c726561647941757468656e746963617465643d66616c7365> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4026,13 +3960,12 @@ endobj
 /F1.0 8 0 R
 /F4.0 39 0 R
 /F5.1 43 0 R
-/F6.0 57 0 R
 >>
-/XObject << /I1 58 0 R
-/Stamp1 247 0 R
+/XObject << /I1 57 0 R
+/Stamp1 246 0 R
 >>
 >>
-/Annots [55 0 R 60 0 R]
+/Annots [55 0 R 59 0 R]
 >>
 endobj
 54 0 obj
@@ -4053,17 +3986,6 @@ endobj
 [53 0 R /XYZ 0 624.35 null]
 endobj
 57 0 obj
-<< /Type /Font
-/BaseFont /AAAAEE+mplus1mn-bold
-/Subtype /TrueType
-/FontDescriptor 302 0 R
-/FirstChar 32
-/LastChar 255
-/Widths 304 0 R
-/ToUnicode 303 0 R
->>
-endobj
-58 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 266
@@ -4100,10 +4022,10 @@ zY\u054f_Swh
 \ufffd;\ufffd\ufffd:\ufffd\ufffdy\ufffds\ufffd\ufffd|r\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdi\ufffd\ufffd	\ufffd.\ufffd\ufffd_\ufffdU\ufffds/\ufffd\ufffd \ufffd\ufffd9\ufffde\ufffd},k\ufffd2\ufffd-%\ufffdM7\u06c1\ufffd\ufffd\u053b:VV\ufffdr\ufffd\ufffd\u07e7E\ufffd\ufffd\ufffd\ufffd\u0768\ufffdq\ufffdCA\ufffd\ufffd<y<\ufffd\ufffd\ufffd|\ufffd=\ufffd\ufffd\ufffd%b\ufffd\ufffdk\u019e_\ufffd\u0638\ufffd\ufffd\ufffdO\ufffd\ufffdvh~\ufffd\ufffd\ufffdh\ufffd4?\ufffd\ufffd\ufffd\ufffdi~\u06a1\ufffd!""\ufffd!\ufffd\ufffd\ufffdC\ufffdCDDDC\ufffd\ufffdi\ufffd\u61c8\ufffd\ufffd\ufffdH\ufffd\ufffd\ufffd
\ufffd\ufffd\ufffd""""\ufffdO;4?DDD4D\ufffd\ufffdvh~\ufffd\ufffd\ufffdh\ufffd4?\ufffd\ufffd\ufffd\ufffdi~\u06a1\ufffd!""\ufffd!\ufffd\ufffd\ufffdC\ufffdCDDDC\ufffd\ufffdi\ufffd\u61c8\ufffd\ufffd\ufffdH\ufffd\ufffd\ufffd
\ufffd\ufffd\ufffd""""\ufffdO;4?DDD4D\ufffd\ufffdvh~\ufffd\ufffd\ufffdh\ufffd4?\ufffd\ufffd\ufffd\ufffdi~\u06a1\ufffd!""\ufffd!\ufffd\ufffd\ufffdc\ufffdbDDDDCL\ufffdeM\ufffd4\ufffd\ufffd\ufffd'~t\ufffd&\u074f\ufffd\ufffd`\ufffd\ufffd\ufffd?\ufffdW\ufffdG\ufffdr\ufffd\ufffd\ufffd%\u074f\ufffd\ufffd`\ufffd\ufffd\ufffd -\ufffd\ufffd\ufffd\ufffd -\ufffd\ufffd\ufffd\ufffd -\ufffd\ufffd\ufffd\ufffd -\ufffd\ufffd\ufffd\ufffd -\ufffd\ufffd\ufffd\ufffd -\ufffd\ufffd\ufffd\ufffd -\ufffd\ufffd\ufffd\ufffd -\ufffd\ufffd\ufffd\ufffd -\ufffd\ufffd\ufffd\ufffd -\ufffd\ufffd\ufffd\ufffd -\ufffd\ufffd\ufffd\ufffd -\ufffd\ufffd\ufffd\ufffd -\ufffd\ufffd\ufffd\ufffd -\ufffd\ufffd
 \ufffd -\ufffd\ufffd\ufffd\ufffd -\ufffd\ufffd\ufffd\ufffd -\ufffd\ufffd\ufffd\ufffd -\ufffd\ufffd\ufffd\ufffd -\ufffd\ufffd\ufffd\ufffd -\ufffd\ufffd\ufffd\ufffd -\ufffd\ufffd\ufffd\ufffd -\ufffd\ufffd\ufffd\ufffd -\ufffd\ufffd\ufffd\ufffd -\ufffd\ufffd\ufffd\ufffd -\ufffd\ufffd\ufffd\ufffd -\ufffd\ufffd\ufffd\ufffd -\ufffd\ufffd\ufffd\ufffd\ufffdw#\ufffd
 endstream
 endobj
-59 0 obj
+58 0 obj
 [53 0 R /XYZ 0 237.45195064629857 null]
 endobj
-60 0 obj
+59 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -4114,8 +4036,8 @@ endobj
 /Type /Annot
 >>
 endobj
-61 0 obj
-<< /Length 16181
+60 0 obj
+<< /Length 15125
 >>
 stream
 q
@@ -4323,12 +4245,12 @@ f
 h
 S
 Q
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 59.24000000000001 632.085 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c6c697374656e65723e> Tj
 ET
 
@@ -4345,12 +4267,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 81.24000000000001 617.345 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c6c697374656e65722d636c6173733e> Tj
 ET
 
@@ -4367,45 +4289,45 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 444.24 617.345 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f6c697374656e65722d> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 59.24000000000001 602.605 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <636c6173733e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 59.24000000000001 587.8650000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f6c697374656e65723e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 59.24000000000001 573.1250000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c66696c7465723e> Tj
 ET
 
@@ -4422,12 +4344,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 81.24000000000001 558.3850000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c66696c7465722d6e616d653e> Tj
 ET
 
@@ -4444,12 +4366,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 213.24 558.3850000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f66696c7465722d6e616d653e> Tj
 ET
 
@@ -4466,12 +4388,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 81.24000000000001 543.6450000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c66696c7465722d636c6173733e> Tj
 ET
 
@@ -4488,34 +4410,34 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 378.24 543.6450000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f66696c7465722d636c6173733e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 59.24000000000001 528.9050000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f66696c7465723e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 59.24000000000001 514.1650000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c66696c7465722d6d617070696e673e> Tj
 ET
 
@@ -4532,12 +4454,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 81.24000000000001 499.42500000000007 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c66696c7465722d6e616d653e> Tj
 ET
 
@@ -4554,12 +4476,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 213.24 499.42500000000007 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f66696c7465722d6e616d653e> Tj
 ET
 
@@ -4576,12 +4498,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 81.24000000000001 484.68500000000006 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c75726c2d7061747465726e3e> Tj
 ET
 
@@ -4598,23 +4520,23 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 163.74 484.68500000000006 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f75726c2d7061747465726e3e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 59.24000000000001 469.94500000000005 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f66696c7465722d6d617070696e673e> Tj
 ET
 
@@ -4758,57 +4680,13 @@ f
 h
 S
 Q
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-59.24000000000001 309.785 Td
-/F6.0 11 Tf
-<73656375726974794d616e616765722e7265616c6d73> 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
-180.24 309.785 Td
-/F4.0 11 Tf
-<20> 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
-185.74 309.785 Td
-/F4.0 11 Tf
-<3d> 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
-191.24 309.785 Td
-/F4.0 11 Tf
-<20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-196.74 309.785 Td
+59.24000000000001 309.785 Td
 /F4.0 11 Tf
-<247265616c6d4e616d65> Tj
+<73656375726974794d616e616765722e7265616c6d73203d20247265616c6d4e616d65> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4982,57 +4860,13 @@ f
 h
 S
 Q
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-59.24000000000001 173.925 Td
-/F6.0 11 Tf
-<73656375726974794d616e616765722e7265616c6d73> 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
-180.24 173.925 Td
-/F4.0 11 Tf
-<20> 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
-185.74 173.925 Td
-/F4.0 11 Tf
-<3d> 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
-191.24 173.925 Td
-/F4.0 11 Tf
-<20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-196.74 173.925 Td
+59.24000000000001 173.925 Td
 /F4.0 11 Tf
-<247265616c6d312c247265616c6d32> Tj
+<73656375726974794d616e616765722e7265616c6d73203d20247265616c6d312c247265616c6d32> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5094,31 +4928,30 @@ Q
 
 endstream
 endobj
-62 0 obj
+61 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 61 0 R
+/Contents 60 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F5.1 43 0 R
 /F1.0 8 0 R
 /F4.0 39 0 R
 /F2.0 16 0 R
-/F6.0 57 0 R
 >>
-/XObject << /Stamp1 247 0 R
+/XObject << /Stamp1 246 0 R
 >>
 >>
-/Annots [65 0 R 66 0 R]
+/Annots [64 0 R 65 0 R]
 >>
 endobj
+62 0 obj
+[61 0 R /XYZ 0 738.55 null]
+endobj
 63 0 obj
-[62 0 R /XYZ 0 738.55 null]
+[61 0 R /XYZ 0 400.4700000000001 null]
 endobj
 64 0 obj
-[62 0 R /XYZ 0 400.4700000000001 null]
-endobj
-65 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -5129,7 +4962,7 @@ endobj
 /Type /Annot
 >>
 endobj
-66 0 obj
+65 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -5140,8 +4973,8 @@ endobj
 /Type /Annot
 >>
 endobj
-67 0 obj
-<< /Length 10351
+66 0 obj
+<< /Length 9779
 >>
 stream
 q
@@ -5535,57 +5368,13 @@ f
 h
 S
 Q
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-59.24 179.51552878965927 Td
-/F6.0 11 Tf
-<73656375726974794d616e616765722e7265616c6d73> 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
-180.24 179.51552878965927 Td
-/F4.0 11 Tf
-<20> 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
-185.74 179.51552878965927 Td
-/F4.0 11 Tf
-<3d> 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
-191.24 179.51552878965927 Td
-/F4.0 11 Tf
-<20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-196.74 179.51552878965927 Td
+59.24 179.51552878965927 Td
 /F4.0 11 Tf
-<24696e695265616c6d> Tj
+<73656375726974794d616e616765722e7265616c6d73203d2024696e695265616c6d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5771,28 +5560,27 @@ Q
 
 endstream
 endobj
-68 0 obj
+67 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 67 0 R
+/Contents 66 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 16 0 R
 /F1.0 8 0 R
 /F4.0 39 0 R
-/F6.0 57 0 R
 >>
-/XObject << /I2 71 0 R
-/Stamp1 247 0 R
+/XObject << /I2 70 0 R
+/Stamp1 246 0 R
 >>
 >>
-/Annots [70 0 R 72 0 R]
+/Annots [69 0 R 71 0 R]
 >>
 endobj
-69 0 obj
-[68 0 R /XYZ 0 841.89 null]
+68 0 obj
+[67 0 R /XYZ 0 841.89 null]
 endobj
-70 0 obj
+69 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -5803,7 +5591,7 @@ endobj
 /Type /Annot
 >>
 endobj
-71 0 obj
+70 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 554
@@ -5879,7 +5667,7 @@ g
 \\ufffdRu&5\ufffd\ufffd\u01c7\ufffd_U\ufffd~'#\\ufffda=E\ufffd\ufffd"8\ufffdOW\ufffdV\ufffda\ufffd1\ufffd\ufffd\ufffdU&\ufffd\ufffd\ufffd{\ufffd\ufffd\ufffdp\u04493\ufffd C\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdK\ufffd2\ufffd
 endstream
 endobj
-72 0 obj
+71 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -5890,11 +5678,11 @@ endobj
 /Type /Annot
 >>
 endobj
-73 0 obj
-[68 0 R /XYZ 0 270.2005287896593 null]
+72 0 obj
+[67 0 R /XYZ 0 270.2005287896593 null]
 endobj
-74 0 obj
-<< /Length 17314
+73 0 obj
+<< /Length 11768
 >>
 stream
 q
@@ -6041,13 +5829,13 @@ f
 h
 S
 Q
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 59.24000000000001 638.6650000000002 Td
-/F6.0 11 Tf
-<7376656e> Tj
+/F4.0 11 Tf
+<7376656e203d20706173732c2061646d696e5f726f6c65> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6056,9 +5844,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-81.24000000000001 638.6650000000002 Td
+59.24000000000001 623.9250000000002 Td
 /F4.0 11 Tf
-<20> Tj
+<6469636b203d20706173732c20757365725f726f6c652c20616e616c797369735f726f6c652c2073656c662d696e7374616c6c5f726f6c65> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6067,9 +5855,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-86.74000000000001 638.6650000000002 Td
+59.24000000000001 609.1850000000002 Td
 /F4.0 11 Tf
-<3d> Tj
+<626f6220203d20706173732c20757365725f726f6c652c2073656c662d696e7374616c6c5f726f6c65> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6078,31 +5866,31 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-92.24000000000001 638.6650000000002 Td
-/F4.0 11 Tf
-<20> Tj
+48.24000000000001 571.3060000000002 Td
+/F1.0 10.5 Tf
+<5468652066697273742076616c7565206973207468652070617373776f726420286567202270617373222c207468652072656d61696e696e672076616c756573206172652074686520726f6c652873292e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-97.74000000000001 638.6650000000002 Td
-/F4.0 11 Tf
-<706173732c2061646d696e5f726f6c65> Tj
+48.24000000000001 536.8060000000003 Td
+/F2.0 13 Tf
+<332e312e322e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
 
 BT
-59.24000000000001 623.9250000000002 Td
-/F6.0 11 Tf
-<6469636b> Tj
+84.83500000000001 536.8060000000003 Td
+/F4.0 13 Tf
+<5b726f6c65735d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6111,9 +5899,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-81.24000000000001 623.9250000000002 Td
-/F4.0 11 Tf
-<20> Tj
+130.335 536.8060000000003 Td
+/F2.0 13 Tf
+<2073656374696f6e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6122,9 +5910,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-86.74000000000001 623.9250000000002 Td
-/F4.0 11 Tf
-<3d> Tj
+48.24000000000001 510.2460000000004 Td
+/F1.0 10.5 Tf
+<546869732073656374696f6e206c6973747320726f6c657320616e6420746865697220636f72726573706f6e64696e67207065726d697373696f6e732e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6133,42 +5921,47 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-92.24000000000001 623.9250000000002 Td
-/F4.0 11 Tf
-<20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-97.74000000000001 623.9250000000002 Td
-/F4.0 11 Tf
-<706173732c20757365725f726f6c652c20616e616c797369735f726f6c652c2073656c662d696e7374616c6c5f726f6c65> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-59.24000000000001 609.1850000000002 Td
-/F6.0 11 Tf
-<626f62> Tj
+48.24000000000001 482.4660000000004 Td
+/F1.0 10.5 Tf
+[<46> 40.0390625 <6f72206578616d706c653a>] TJ
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
+q
+0.961 0.961 0.961 scn
+52.240 466.650 m
+543.040 466.650 l
+545.249 466.650 547.040 464.859 547.040 462.650 c
+547.040 330.730 l
+547.040 328.521 545.249 326.730 543.040 326.730 c
+52.240 326.730 l
+50.031 326.730 48.240 328.521 48.240 330.730 c
+48.240 462.650 l
+48.240 464.859 50.031 466.650 52.240 466.650 c
+h
+f
+0.800 0.800 0.800 SCN
+0.75 w
+52.240 466.650 m
+543.040 466.650 l
+545.249 466.650 547.040 464.859 547.040 462.650 c
+547.040 330.730 l
+547.040 328.521 545.249 326.730 543.040 326.730 c
+52.240 326.730 l
+50.031 326.730 48.240 328.521 48.240 330.730 c
+48.240 462.650 l
+48.240 464.859 50.031 466.650 52.240 466.650 c
+h
+S
+Q
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-75.74000000000001 609.1850000000002 Td
+59.24000000000001 443.82500000000044 Td
 /F4.0 11 Tf
-<2020> Tj
+<757365725f726f6c65203d202a3a546f446f4974656d733a2a3a2a2c5c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6177,9 +5970,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-86.74000000000001 609.1850000000002 Td
+59.24000000000001 429.08500000000043 Td
 /F4.0 11 Tf
-<3d> Tj
+<ca20202020202020202020202a3a546f446f4974656d3a2a3a2a2c5c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6188,20 +5981,20 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-92.24000000000001 609.1850000000002 Td
+59.24000000000001 414.3450000000004 Td
 /F4.0 11 Tf
-<20> Tj
+<ca20202020202020202020202a3a546f446f41707044617368626f6172643a2a3a2a> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-97.74000000000001 609.1850000000002 Td
+59.24000000000001 399.6050000000004 Td
 /F4.0 11 Tf
-<706173732c20757365725f726f6c652c2073656c662d696e7374616c6c5f726f6c65> Tj
+<616e616c797369735f726f6c65203d202a3a546f446f4974656d416e616c797369733a2a3a2a2c5c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6210,9 +6003,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 571.3060000000002 Td
-/F1.0 10.5 Tf
-<5468652066697273742076616c7565206973207468652070617373776f726420286567202270617373222c207468652072656d61696e696e672076616c756573206172652074686520726f6c652873292e> Tj
+59.24000000000001 384.8650000000004 Td
+/F4.0 11 Tf
+<ca20202020202020202020202a3a546f446f4974656d73427943617465676f7279566965774d6f64656c3a2a3a2a2c5c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6221,20 +6014,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 536.8060000000003 Td
-/F2.0 13 Tf
-<332e312e322e20> Tj
-ET
-
-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
-
-BT
-84.83500000000001 536.8060000000003 Td
-/F4.0 13 Tf
-<5b726f6c65735d> Tj
+59.24000000000001 370.12500000000045 Td
+/F4.0 11 Tf
+<ca20202020202020202020202a3a546f446f4974656d7342794461746552616e6765566965774d6f64656c3a2a3a2a> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6243,9 +6025,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-130.335 536.8060000000003 Td
-/F2.0 13 Tf
-<2073656374696f6e> Tj
+59.24000000000001 355.38500000000045 Td
+/F4.0 11 Tf
+<73656c662d696e7374616c6c5f726f6c65203d202a3a546f446f4974656d734669787475726573536572766963653a696e7374616c6c3a2a> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6254,9 +6036,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 510.2460000000004 Td
-/F1.0 10.5 Tf
-<546869732073656374696f6e206c6973747320726f6c657320616e6420746865697220636f72726573706f6e64696e67207065726d697373696f6e732e> Tj
+59.24000000000001 340.64500000000044 Td
+/F4.0 11 Tf
+<61646d696e5f726f6c65203d202a> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6265,58 +6047,47 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 482.4660000000004 Td
+48.24000000000001 302.7660000000004 Td
 /F1.0 10.5 Tf
-[<46> 40.0390625 <6f72206578616d706c653a>] TJ
+[<5468652076616c7565206973206120636f6d6d612d7365706172> 20.01953125 <61746564206c697374206f66207065726d697373696f6e7320666f722074686520726f6c652e202054686520666f726d61742069733a>] TJ
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 q
 0.961 0.961 0.961 scn
-52.240 466.650 m
-543.040 466.650 l
-545.249 466.650 547.040 464.859 547.040 462.650 c
-547.040 330.730 l
-547.040 328.521 545.249 326.730 543.040 326.730 c
-52.240 326.730 l
-50.031 326.730 48.240 328.521 48.240 330.730 c
-48.240 462.650 l
-48.240 464.859 50.031 466.650 52.240 466.650 c
+52.240 286.950 m
+543.040 286.950 l
+545.249 286.950 547.040 285.159 547.040 282.950 c
+547.040 254.210 l
+547.040 252.001 545.249 250.210 543.040 250.210 c
+52.240 250.210 l
+50.031 250.210 48.240 252.001 48.240 254.210 c
+48.240 282.950 l
+48.240 285.159 50.031 286.950 52.240 286.950 c
 h
 f
 0.800 0.800 0.800 SCN
 0.75 w
-52.240 466.650 m
-543.040 466.650 l
-545.249 466.650 547.040 464.859 547.040 462.650 c
-547.040 330.730 l
-547.040 328.521 545.249 326.730 543.040 326.730 c
-52.240 326.730 l
-50.031 326.730 48.240 328.521 48.240 330.730 c
-48.240 462.650 l
-48.240 464.859 50.031 466.650 52.240 466.650 c
+52.240 286.950 m
+543.040 286.950 l
+545.249 286.950 547.040 285.159 547.040 282.950 c
+547.040 254.210 l
+547.040 252.001 545.249 250.210 543.040 250.210 c
+52.240 250.210 l
+50.031 250.210 48.240 252.001 48.240 254.210 c
+48.240 282.950 l
+48.240 285.159 50.031 286.950 52.240 286.950 c
 h
 S
 Q
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-59.24000000000001 443.82500000000044 Td
-/F6.0 11 Tf
-<757365725f726f6c65> 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
-108.74000000000001 443.82500000000044 Td
+59.24000000000001 264.12500000000034 Td
 /F4.0 11 Tf
-<20> Tj
+<7061636b6167654e616d653a636c6173734e616d653a6d656d6265724e616d653a722c77> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6325,108 +6096,120 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-114.24000000000001 443.82500000000044 Td
-/F4.0 11 Tf
-<3d> Tj
+48.24000000000001 226.24600000000038 Td
+/F1.0 10.5 Tf
+<77686572653a> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
+
+-0.500 Tc
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-119.74000000000001 443.82500000000044 Td
-/F4.0 11 Tf
-<20> Tj
+56.88050000000001 198.46600000000038 Td
+/F1.0 10.5 Tf
+<a5> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+
+0.000 Tc
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
 
 BT
-125.24000000000001 443.82500000000044 Td
-/F4.0 11 Tf
-<2a3a546f446f4974656d733a2a3a2a2c> Tj
+66.24000000000001 198.46600000000038 Td
+/F4.0 10.5 Tf
+<6d656d6265724e616d65> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-213.24 443.82500000000044 Td
-/F4.0 11 Tf
-<5c> Tj
+118.74000000000001 198.46600000000038 Td
+/F1.0 10.5 Tf
+[<206973207468652070726f7065727479> 89.84375 <2c20636f6c6c656374696f6e206f7220616374696f6e206e616d652e>] TJ
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
+
+-0.500 Tc
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-59.24000000000001 429.08500000000043 Td
-/F4.0 11 Tf
-<ca2020202020202020202020> Tj
+56.88050000000001 176.68600000000038 Td
+/F1.0 10.5 Tf
+<a5> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+
+0.000 Tc
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
 
 BT
-125.24000000000001 429.08500000000043 Td
-/F4.0 11 Tf
-<2a3a546f446f4974656d3a2a3a2a2c> Tj
+66.24000000000001 176.68600000000038 Td
+/F4.0 10.5 Tf
+<72> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-207.74 429.08500000000043 Td
-/F4.0 11 Tf
-<5c> Tj
+71.49000000000001 176.68600000000038 Td
+/F1.0 10.5 Tf
+<20696e64696361746573207468617420746865206d656d6265722069732076697369626c65> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
+
+-0.500 Tc
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-59.24000000000001 414.3450000000004 Td
-/F4.0 11 Tf
-<ca2020202020202020202020> Tj
+56.88050000000001 154.90600000000038 Td
+/F1.0 10.5 Tf
+<a5> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+
+0.000 Tc
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
 
 BT
-125.24000000000001 414.3450000000004 Td
-/F4.0 11 Tf
-<2a3a546f446f41707044617368626f6172643a2a3a2a> Tj
+66.24000000000001 154.90600000000038 Td
+/F4.0 10.5 Tf
+<77> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-59.24000000000001 399.6050000000004 Td
-/F6.0 11 Tf
-<616e616c797369735f726f6c65> Tj
+71.49000000000001 154.90600000000038 Td
+/F1.0 10.5 Tf
+<20696e64696361746573207468617420746865206d656d62657220697320757361626c6520286564697461626c65206f7220696e766f6b61626c6529> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6435,20 +6218,20 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-130.74 399.6050000000004 Td
-/F4.0 11 Tf
-<20> Tj
+48.24000000000001 127.12600000000037 Td
+/F1.0 10.5 Tf
+<616e642077686572652065616368206f6620746865207061727473206f6620746865207065726d697373696f6e20737472696e672063616e2062652077696c64636172646564207573696e6720> 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
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
 
 BT
-136.24 399.6050000000004 Td
-/F4.0 11 Tf
-<3d> Tj
+436.86600000000004 127.12600000000037 Td
+/F4.0 10.5 Tf
+<2a> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6457,31 +6240,35 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-141.74 399.6050000000004 Td
-/F4.0 11 Tf
-<20> Tj
+442.11600000000004 127.12600000000037 Td
+/F1.0 10.5 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+2.087 Tw
 
 BT
-147.24 399.6050000000004 Td
-/F4.0 11 Tf
-<2a3a546f446f4974656d416e616c797369733a2a3a2a2c> Tj
+48.24000000000001 99.34600000000037 Td
+/F1.0 10.5 Tf
+[<42656361757365207468657365206172652077696c6463617264732c206120272a272063616e206265207573656420617420616e> 20.01953125 <79206c6576656c2e2041> 20.01953125 <64646974696f6e616c6c79> 89.84375 <2c206d697373696e67206c6576656c7320617373756d65>] TJ
 ET
 
+
+0.000 Tw
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-273.74 399.6050000000004 Td
-/F4.0 11 Tf
-<5c> Tj
+48.24000000000001 83.56600000000037 Td
+/F1.0 10.5 Tf
+<77696c6463617264732e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6490,75 +6277,123 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24000000000001 384.8650000000004 Td
-/F4.0 11 Tf
-<ca2020202020202020202020> Tj
+48.24000000000001 55.78600000000037 Td
+/F1.0 10.5 Tf
+<546875733a> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-125.24000000000001 384.8650000000004 Td
-/F4.0 11 Tf
-<2a3a546f446f4974656d73427943617465676f7279566965774d6f64656c3a2a3a2a2c> Tj
+49.24 14.388 Td
+/F1.0 9 Tf
+<36> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
+Q
+Q
 
-BT
-317.74 384.8650000000004 Td
-/F4.0 11 Tf
-<5c> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
+endstream
+endobj
+74 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 595.28 841.89]
+/Contents 73 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F1.0 8 0 R
+/F4.0 39 0 R
+/F2.0 16 0 R
+>>
+/XObject << /Stamp1 246 0 R
+>>
+>>
+>>
+endobj
+75 0 obj
+[74 0 R /XYZ 0 750.33 null]
+endobj
+76 0 obj
+[74 0 R /XYZ 0 555.4900000000002 null]
+endobj
+77 0 obj
+<< /Length 13060
+>>
+stream
+q
+q
+/DeviceRGB cs
+0.961 0.961 0.961 scn
+52.240 805.890 m
+543.040 805.890 l
+545.249 805.890 547.040 804.099 547.040 801.890 c
+547.040 596.270 l
+547.040 594.061 545.249 592.270 543.040 592.270 c
+52.240 592.270 l
+50.031 592.270 48.240 594.061 48.240 596.270 c
+48.240 801.890 l
+48.240 804.099 50.031 805.890 52.240 805.890 c
+h
+f
+/DeviceRGB CS
+0.800 0.800 0.800 SCN
+0.75 w
+52.240 805.890 m
+543.040 805.890 l
+545.249 805.890 547.040 804.099 547.040 801.890 c
+547.040 596.270 l
+547.040 594.061 545.249 592.270 543.040 592.270 c
+52.240 592.270 l
+50.031 592.270 48.240 594.061 48.240 596.270 c
+48.240 801.890 l
+48.240 804.099 50.031 805.890 52.240 805.890 c
+h
+S
+Q
+/DeviceRGB cs
 0.200 0.200 0.200 scn
+/DeviceRGB CS
 0.200 0.200 0.200 SCN
 
 BT
-59.24000000000001 370.12500000000045 Td
+59.24 783.0649999999999 Td
 /F4.0 11 Tf
-<ca2020202020202020202020> Tj
+<636f6d2e6d79636f6d70616e792e6d796170703a437573746f6d65723a66697273744e616d653a722c77202020232076696577206f72206564697420637573746f6d657227732066697273744e616d65> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-125.24000000000001 370.12500000000045 Td
+59.24 768.3249999999999 Td
 /F4.0 11 Tf
-<2a3a546f446f4974656d7342794461746552616e6765566965774d6f64656c3a2a3a2a> Tj
+<636f6d2e6d79636f6d70616e792e6d796170703a437573746f6d65723a6c6173744e616d653a7220202020202023207669657720637573746f6d65722773206c6173744e616d65206f6e6c79> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-59.24000000000001 355.38500000000045 Td
+59.24 753.585 Td
 /F4.0 11 Tf
-<73656c662d> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-86.74000000000001 355.38500000000045 Td
-/F6.0 11 Tf
-<696e7374616c6c5f726f6c65> Tj
+<636f6d2e6d79636f6d70616e792e6d796170703a437573746f6d65723a706c6163654f726465723a2a2020202023207669657720616e6420696e766f6b6520706c6163654f7264657220616374696f6e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6567,9 +6402,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-152.74 355.38500000000045 Td
+59.24 738.845 Td
 /F4.0 11 Tf
-<20> Tj
+<636f6d2e6d79636f6d70616e792e6d796170703a437573746f6d65723a706c6163654f726465722020202020202320646974746f> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6578,9 +6413,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-158.24 355.38500000000045 Td
+59.24 724.105 Td
 /F4.0 11 Tf
-<3d> Tj
+<636f6d2e6d79636f6d70616e792e6d796170703a437573746f6d65723a2a3a722020202020202020202020202023207669657720616c6c20637573746f6d657220636c617373206d656d62657273> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6589,31 +6424,31 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-163.74 355.38500000000045 Td
+59.24 709.365 Td
 /F4.0 11 Tf
-<20> Tj
+<636f6d2e6d79636f6d70616e792e6d796170703a2a3a2a3a7220202020202020202020202020202020202020202320766965772d6f6e6c792061636365737320666f7220616c6c20636c617373657320696e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-169.24 355.38500000000045 Td
+59.24 694.625 Td
 /F4.0 11 Tf
-<2a3a546f446f4974656d734669787475726573536572766963653a696e7374616c6c3a2a> Tj
+<6d79617070207061636b616765> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-59.24000000000001 340.64500000000044 Td
-/F6.0 11 Tf
-<61646d696e5f726f6c65> Tj
+59.24 679.885 Td
+/F4.0 11 Tf
+<636f6d2e6d79636f6d70616e792e6d796170703a2a3a2a3a2a20202020202020202020202020202020202020202320766965772f6564697420666f7220616c6c20636c617373657320696e206d79617070> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6622,9 +6457,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-114.24000000000001 340.64500000000044 Td
+59.24 665.145 Td
 /F4.0 11 Tf
-<20> Tj
+<7061636b616765> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6633,9 +6468,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-119.74000000000001 340.64500000000044 Td
+59.24 650.405 Td
 /F4.0 11 Tf
-<3d> Tj
+<636f6d2e6d79636f6d70616e792e6d796170703a2a3a2a202020202020202020202020202020202020202020202320646974746f> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6644,20 +6479,20 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-125.24000000000001 340.64500000000044 Td
+59.24 635.665 Td
 /F4.0 11 Tf
-<20> Tj
+<636f6d2e6d79636f6d70616e792e6d796170703a2a2020202020202020202020202020202020202020202020202320646974746f> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-130.74 340.64500000000044 Td
+59.24 620.925 Td
 /F4.0 11 Tf
-<2a> Tj
+<636f6d2e6d79636f6d70616e792e6d7961707020202020202020202020202020202020202020202020202020202320646974746f> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6666,121 +6501,79 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 302.7660000000004 Td
-/F1.0 10.5 Tf
-[<5468652076616c7565206973206120636f6d6d612d7365706172> 20.01953125 <61746564206c697374206f66207065726d697373696f6e7320666f722074686520726f6c652e202054686520666f726d61742069733a>] TJ
+59.24 606.185 Td
+/F4.0 11 Tf
+<2a20202020202020202020202020202020202020202020202020202020202020202020202020202020202020202320766965772f656469742061636365737320746f2065766572797468696e67> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 q
-0.961 0.961 0.961 scn
-52.240 286.950 m
-543.040 286.950 l
-545.249 286.950 547.040 285.159 547.040 282.950 c
-547.040 254.210 l
-547.040 252.001 545.249 250.210 543.040 250.210 c
-52.240 250.210 l
-50.031 250.210 48.240 252.001 48.240 254.210 c
-48.240 282.950 l
-48.240 285.159 50.031 286.950 52.240 286.950 c
-h
-f
-0.800 0.800 0.800 SCN
-0.75 w
-52.240 286.950 m
-543.040 286.950 l
-545.249 286.950 547.040 285.159 547.040 282.950 c
-547.040 254.210 l
-547.040 252.001 545.249 250.210 543.040 250.210 c
-52.240 250.210 l
-50.031 250.210 48.240 252.001 48.240 254.210 c
-48.240 282.950 l
-48.240 285.159 50.031 286.950 52.240 286.950 c
-h
+0.5 w
+0.933 0.933 0.933 SCN
+113.807 540.710 m
+113.807 580.270 l
 S
 Q
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
-
-BT
-59.24000000000001 264.12500000000034 Td
-/F4.0 11 Tf
-<7061636b6167654e616d653a636c6173734e616d653a6d656d6265724e616d653a722c77> Tj
-ET
-
+0.067 0.067 0.067 scn
+0.067 0.067 0.067 SCN
 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
+0.067 0.067 0.067 scn
+0.067 0.067 0.067 SCN
 
 BT
-48.24000000000001 226.24600000000038 Td
-/F1.0 10.5 Tf
-<77686572653a> Tj
+80.17133333333334 551.91 Td
+/F5.1 24 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-
--0.500 Tc
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
+1.986 Tw
+
 BT
-56.88050000000001 198.46600000000038 Td
+125.80666666666667 564.3059999999999 Td
 /F1.0 10.5 Tf
-<a5> Tj
+[<54686520666f726d6174206f6620746865207065726d697373696f6e7320737472696e6720697320636f6e6669677572> 20.01953125 <61626c6520696e20536869726f2c20616e64204170616368652049736973>] TJ
 ET
 
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-
-0.000 Tc
-0.694 0.129 0.275 scn
-0.694 0.129 0.275 SCN
-
-BT
-66.24000000000001 198.46600000000038 Td
-/F4.0 10.5 Tf
-<6d656d6265724e616d65> 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
-118.74000000000001 198.46600000000038 Td
+125.80666666666667 548.526 Td
 /F1.0 10.5 Tf
-[<206973207468652070726f7065727479> 89.84375 <2c20636f6c6c656374696f6e206f7220616374696f6e206e616d652e>] TJ
+<75736573207468697320746f2070726f7669646520616e20657874656e6465642077696c646361726420666f726d61742c2064657363726962656420> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-
--0.500 Tc
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-56.88050000000001 176.68600000000038 Td
+428.3641666666667 548.526 Td
 /F1.0 10.5 Tf
-<a5> Tj
+<68657265> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-
-0.000 Tc
-0.694 0.129 0.275 scn
-0.694 0.129 0.275 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-66.24000000000001 176.68600000000038 Td
-/F4.0 10.5 Tf
-<72> Tj
+451.20166666666665 548.526 Td
+/F1.0 10.5 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6789,68 +6582,65 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-71.49000000000001 176.68600000000038 Td
-/F1.0 10.5 Tf
-<20696e64696361746573207468617420746865206d656d6265722069732076697369626c65> Tj
+48.24000000000001 504.6860000000001 Td
+/F2.0 18 Tf
+<332e322e2045787465726e616c697a656420496e695265616c6d> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-
--0.500 Tc
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
+0.761 Tw
+
 BT
-56.88050000000001 154.90600000000038 Td
+48.24000000000001 476.66600000000005 Td
 /F1.0 10.5 Tf
-<a5> Tj
+<5468657265d573206e6f20726571756972656d656e7420666f7220616c6c2075736572732f726f6c657320746f20626520646566696e656420696e2074686520> Tj
 ET
 
+
+0.000 Tw
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-
-0.000 Tc
 0.694 0.129 0.275 scn
 0.694 0.129 0.275 SCN
 
+0.761 Tw
+
 BT
-66.24000000000001 154.90600000000038 Td
+367.1740294117647 476.66600000000005 Td
 /F4.0 10.5 Tf
-<77> Tj
+<736869726f2e696e69> 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
 
+0.761 Tw
+
 BT
-71.49000000000001 154.90600000000038 Td
+414.4240294117647 476.66600000000005 Td
 /F1.0 10.5 Tf
-<20696e64696361746573207468617420746865206d656d62657220697320757361626c6520286564697461626c65206f7220696e766f6b61626c6529> Tj
+<2066696c652e2020496e73746561642c2061207265616c6d2063616e> 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
-48.24000000000001 127.12600000000037 Td
+48.24000000000001 460.8860000000001 Td
 /F1.0 10.5 Tf
-<616e642077686572652065616368206f6620746865207061727473206f6620746865207065726d697373696f6e20737472696e672063616e2062652077696c64636172646564207573696e6720> Tj
-ET
-
-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
-
-BT
-436.86600000000004 127.12600000000037 Td
-/F4.0 10.5 Tf
-<2a> Tj
+<626520646566696e65642074686174206c6f616473206974732075736572732f726f6c65732066726f6d20736f6d65206f74686572207265736f757263652e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6859,35 +6649,58 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-442.11600000000004 127.12600000000037 Td
+48.24000000000001 433.10600000000005 Td
 /F1.0 10.5 Tf
-<2e> Tj
+[<46> 40.0390625 <6f72206578616d706c653a>] 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
-
-2.087 Tw
+q
+0.961 0.961 0.961 scn
+52.240 417.290 m
+543.040 417.290 l
+545.249 417.290 547.040 415.499 547.040 413.290 c
+547.040 369.810 l
+547.040 367.601 545.249 365.810 543.040 365.810 c
+52.240 365.810 l
+50.031 365.810 48.240 367.601 48.240 369.810 c
+48.240 413.290 l
+48.240 415.499 50.031 417.290 52.240 417.290 c
+h
+f
+0.800 0.800 0.800 SCN
+0.75 w
+52.240 417.290 m
+543.040 417.290 l
+545.249 417.290 547.040 415.499 547.040 413.290 c
+547.040 369.810 l
+547.040 367.601 545.249 365.810 543.040 365.810 c
+52.240 365.810 l
+50.031 365.810 48.240 367.601 48.240 369.810 c
+48.240 413.290 l
+48.240 415.499 50.031 417.290 52.240 417.290 c
+h
+S
+Q
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 99.34600000000037 Td
-/F1.0 10.5 Tf
-[<42656361757365207468657365206172652077696c6463617264732c206120272a272063616e206265207573656420617420616e> 20.01953125 <79206c6576656c2e2041> 20.01953125 <64646974696f6e616c6c79> 89.84375 <2c206d697373696e67206c6576656c7320617373756d65>] TJ
+59.24000000000001 394.4650000000001 Td
+/F4.0 11 Tf
+<247265616c6d313d6f72672e6170616368652e736869726f2e7265616c6d2e746578742e496e695265616c6d20> 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
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
 
 BT
-48.24000000000001 83.56600000000037 Td
-/F1.0 10.5 Tf
-<77696c6463617264732e> Tj
+306.74 394.4650000000001 Td
+/F4.1 11 Tf
+<21> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6896,102 +6709,31 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 55.78600000000037 Td
-/F1.0 10.5 Tf
-<546875733a> Tj
+59.24000000000001 379.7250000000001 Td
+/F4.0 11 Tf
+<7265616c6d312e7265736f75726365506174683d636c617373706174683a7765626170702f7265616c6d312e696e6920> Tj
 ET
 
 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
-1 w
-0 J
-0 j
-[ ] 0 d
-/Stamp1 Do
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
 
 BT
-49.24 14.388 Td
-/F1.0 9 Tf
-<36> Tj
+323.24 379.7250000000001 Td
+/F4.1 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-Q
-Q
-
-endstream
-endobj
-75 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 595.28 841.89]
-/Contents 74 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F1.0 8 0 R
-/F4.0 39 0 R
-/F2.0 16 0 R
-/F6.0 57 0 R
->>
-/XObject << /Stamp1 247 0 R
->>
->>
->>
-endobj
-76 0 obj
-[75 0 R /XYZ 0 750.33 null]
-endobj
-77 0 obj
-[75 0 R /XYZ 0 555.4900000000002 null]
-endobj
-78 0 obj
-<< /Length 16771
->>
-stream
-q
-q
-/DeviceRGB cs
-0.961 0.961 0.961 scn
-52.240 805.890 m
-543.040 805.890 l
-545.249 805.890 547.040 804.099 547.040 801.890 c
-547.040 596.270 l
-547.040 594.061 545.249 592.270 543.040 592.270 c
-52.240 592.270 l
-50.031 592.270 48.240 594.061 48.240 596.270 c
-48.240 801.890 l
-48.240 804.099 50.031 805.890 52.240 805.890 c
-h
-f
-/DeviceRGB CS
-0.800 0.800 0.800 SCN
-0.75 w
-52.240 805.890 m
-543.040 805.890 l
-545.249 805.890 547.040 804.099 547.040 801.890 c
-547.040 596.270 l
-547.040 594.061 545.249 592.270 543.040 592.270 c
-52.240 592.270 l
-50.031 592.270 48.240 594.061 48.240 596.270 c
-48.240 801.890 l
-48.240 804.099 50.031 805.890 52.240 805.890 c
-h
-S
-Q
-/DeviceRGB cs
-0.651 0.090 0.090 scn
-/DeviceRGB CS
-0.651 0.090 0.090 SCN
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
 
 BT
-59.24 783.0649999999999 Td
-/F4.0 11 Tf
-<636f6d2e6d79636f6d70616e792e6d796170703a437573746f6d65723a66697273744e616d653a722c77> Tj
+51.27450000000001 348.0850000000001 Td
+/F4.1 10.5 Tf
+<21> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7000,64 +6742,64 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-290.24 783.0649999999999 Td
-/F4.0 11 Tf
-<202020> Tj
+64.80900000000001 347.84600000000006 Td
+/F1.0 10.5 Tf
+<68617070656e7320746f2028636f696e636964656e74616c6c79292062652074686520> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-306.74 783.0649999999999 Td
-/F4.0 11 Tf
-<232076696577206f72206564697420637573746f6d657227732066697273744e616d65> Tj
+236.7255 347.84600000000006 Td
+/F1.0 10.5 Tf
+<73616d6520696d706c656d656e746174696f6e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-59.24 768.3249999999999 Td
-/F4.0 11 Tf
-<636f6d2e6d79636f6d70616e792e6d796170703a437573746f6d65723a6c6173744e616d653a72> Tj
+345.95700000000005 347.84600000000006 Td
+/F1.0 10.5 Tf
+<20617320536869726fd573206275696c742d696e2024696e695265616c6d> 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
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
 
 BT
-273.74 768.3249999999999 Td
-/F4.0 11 Tf
-<202020202020> Tj
+51.27450000000001 326.3050000000001 Td
+/F4.1 10.5 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-306.74 768.3249999999999 Td
-/F4.0 11 Tf
-<23207669657720637573746f6d65722773206c6173744e616d65206f6e6c79> Tj
+64.80900000000001 326.0660000000001 Td
+/F1.0 10.5 Tf
+<696e20746869732063617365206c6f6164207468652075736572732f726f6c65732066726f6d2074686520> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
 
 BT
-59.24 753.585 Td
-/F4.0 11 Tf
-<636f6d2e6d79636f6d70616e792e6d796170703a437573746f6d65723a706c6163654f726465723a2a> Tj
+269.2545 326.0660000000001 Td
+/F4.0 10.5 Tf
+<7372632f6d61696e2f7265736f75726365732f7765626170702f7265616c6d312e696e69> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7066,64 +6808,87 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-284.74 753.585 Td
-/F4.0 11 Tf
-<20202020> Tj
+458.25450000000006 326.0660000000001 Td
+/F1.0 10.5 Tf
+<2066696c652e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+1.171 Tw
 
 BT
-306.74 753.585 Td
-/F4.0 11 Tf
-<23207669657720616e6420696e766f6b6520706c6163654f7264657220616374696f6e> Tj
+48.24000000000001 298.2860000000001 Td
+/F1.0 10.5 Tf
+<4e6f7465207468617420612055524c20636f756c642062652070726f76696465642061732074686520> Tj
 ET
 
+
+0.000 Tw
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+1.171 Tw
 
 BT
-59.24 738.845 Td
-/F4.0 11 Tf
-<636f6d2e6d79636f6d70616e792e6d796170703a437573746f6d65723a706c6163654f72646572> Tj
+265.019314453125 298.2860000000001 Td
+/F4.0 10.5 Tf
+<7265736f7572636550617468> 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.171 Tw
+
 BT
-273.74 738.845 Td
-/F4.0 11 Tf
-<202020202020> Tj
+328.019314453125 298.2860000000001 Td
+/F1.0 10.5 Tf
+[<2c20736f20612063656e7472> 20.01953125 <616c697a656420636f6e6669672066696c6520636f756c6420626520757365642e>] TJ
 ET
 
+
+0.000 Tw
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-306.74 738.845 Td
-/F4.0 11 Tf
-<2320646974746f> Tj
+48.24000000000001 282.5060000000001 Td
+/F1.0 10.5 Tf
+<4576656e20736f2c20746865> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+q
+0.5 w
+0.933 0.933 0.933 SCN
+113.807 227.130 m
+113.807 266.690 l
+S
+Q
+0.098 0.251 0.486 scn
+0.098 0.251 0.486 SCN
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.098 0.251 0.486 scn
+0.098 0.251 0.486 SCN
 
 BT
-59.24 724.105 Td
-/F4.0 11 Tf
-<636f6d2e6d79636f6d70616e792e6d796170703a437573746f6d65723a2a3a72> Tj
+76.73933333333335 238.33000000000015 Td
+/F5.1 24 Tf
+<21> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7131,120 +6896,126 @@ ET
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
-BT
-235.24 724.105 Td
-/F4.0 11 Tf
-<20202020202020202020202020> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.651 Tw
 
 BT
-306.74 724.105 Td
-/F4.0 11 Tf
-<23207669657720616c6c20637573746f6d657220636c617373206d656d62657273> Tj
+125.80666666666667 250.7260000000001 Td
+/F1.0 10.5 Tf
+[<496620636f6e666967757265642074686973207761> 20.01953125 <79207468656e2074686520>] TJ
 ET
 
+
+0.000 Tw
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+0.651 Tw
 
 BT
-59.24 709.365 Td
-/F4.0 11 Tf
-<636f6d2e6d79636f6d70616e792e6d796170703a2a3a2a3a72> Tj
+286.08698079427086 250.7260000000001 Td
+/F4.0 10.5 Tf
+<5b75736572735d> 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
 
+0.651 Tw
+
 BT
-196.74 709.365 Td
-/F4.0 11 Tf
-<2020202020202020202020202020202020202020> Tj
+322.83698079427086 250.7260000000001 Td
+/F1.0 10.5 Tf
+<20616e6420> Tj
 ET
 
+
+0.000 Tw
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+0.651 Tw
 
 BT
-306.74 709.365 Td
-/F4.0 11 Tf
-<2320766965772d6f6e6c792061636365737320666f7220616c6c20636c617373657320696e> Tj
+348.6873205295139 250.7260000000001 Td
+/F4.0 10.5 Tf
+<5b726f6c65735d> Tj
 ET
 
+
+0.000 Tw
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+0.651 Tw
 
 BT
-59.24 694.625 Td
-/F4.0 11 Tf
-<6d79617070207061636b616765> Tj
+385.4373205295139 250.7260000000001 Td
+/F1.0 10.5 Tf
+<2073656374696f6e73206f6620> Tj
 ET
 
+
+0.000 Tw
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+0.651 Tw
 
 BT
-59.24 679.885 Td
-/F4.0 11 Tf
-<636f6d2e6d79636f6d70616e792e6d796170703a2a3a2a3a2a> Tj
+445.6118301323785 250.7260000000001 Td
+/F4.0 10.5 Tf
+<736869726f2e696e69> 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
-196.74 679.885 Td
-/F4.0 11 Tf
-<2020202020202020202020202020202020202020> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.651 Tw
 
 BT
-306.74 679.885 Td
-/F4.0 11 Tf
-<2320766965772f6564697420666f7220616c6c20636c617373657320696e206d79617070> Tj
+492.8618301323785 250.7260000000001 Td
+/F1.0 10.5 Tf
+<206265636f6d65> Tj
 ET
 
+
+0.000 Tw
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-59.24 665.145 Td
-/F4.0 11 Tf
-<7061636b616765> Tj
+125.80666666666667 234.9460000000001 Td
+/F1.0 10.5 Tf
+<756e757365642e20496e73746561642c2074686520636f72726573706f6e64696e672073656374696f6e732066726f6d20666f7220> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
 
 BT
-59.24 650.405 Td
-/F4.0 11 Tf
-<636f6d2e6d79636f6d70616e792e6d796170703a2a3a2a> Tj
+392.6956666666667 234.9460000000001 Td
+/F4.0 10.5 Tf
+<7265616c6d312e696e69> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7253,154 +7024,236 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-185.73999999999998 650.405 Td
-/F4.0 11 Tf
-<20202020202020202020202020202020202020202020> Tj
+445.1956666666667 234.9460000000001 Td
+/F1.0 10.5 Tf
+<20617265207573656420696e73746561642e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
-
-BT
-306.74 650.405 Td
-/F4.0 11 Tf
-<2320646974746f> Tj
-ET
-
-0.000 0.000 0.000 SCN
+q
 0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-59.24 635.665 Td
-/F4.0 11 Tf
-<636f6d2e6d79636f6d70616e792e6d796170703a2a> Tj
+541.0089999999999 14.388 Td
+/F1.0 9 Tf
+<37> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+78 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 595.28 841.89]
+/Contents 77 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F4.0 39 0 R
+/F5.1 43 0 R
+/F1.0 8 0 R
+/F2.0 16 0 R
+/F4.1 81 0 R
+>>
+/XObject << /Stamp1 246 0 R
+>>
+>>
+/Annots [79 0 R 82 0 R]
+>>
+endobj
+79 0 obj
+<< /Border [0 0 0]
+/Dest (_ugsec_shiro-isis-enhanced-wildcard-permission)
+/Subtype /Link
+/Rect [428.3641666666667 545.46 451.20166666666665 559.74]
+/Type /Annot
+>>
+endobj
+80 0 obj
+[78 0 R /XYZ 0 528.71 null]
+endobj
+81 0 obj
+<< /Type /Font
+/BaseFont /AAAADS+mplus1mn-regular
+/Subtype /TrueType
+/FontDescriptor 301 0 R
+/FirstChar 32
+/LastChar 255
+/Widths 303 0 R
+/ToUnicode 302 0 R
+>>
+endobj
+82 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (http://shiro.apache.org/static/latest/apidocs/org/apache/shiro/realm/text/IniRealm.html)
+>>
+/Subtype /Link
+/Rect [236.7255 344.7800000000001 345.95700000000005 359.06000000000006]
+/Type /Annot
+>>
+endobj
+83 0 obj
+<< /Length 3827
+>>
+stream
+q
+/DeviceRGB cs
 0.200 0.200 0.200 scn
+/DeviceRGB CS
 0.200 0.200 0.200 SCN
 
 BT
-174.74 635.665 Td
-/F4.0 11 Tf
-<202020202020202020202020202020202020202020202020> Tj
+48.24 782.394 Td
+/F2.0 22 Tf
+<4368617074657220342e2049736973204c646170205265616c6d> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+0.351 Tw
 
 BT
-306.74 635.665 Td
-/F4.0 11 Tf
-<2320646974746f> Tj
+48.24 753.206 Td
+/F1.0 10.5 Tf
+<49736973207368697073207769746820616e20696d706c656d656e746174696f6e206f6620> Tj
 ET
 
+
+0.000 Tw
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+0.351 Tw
 
 BT
-59.24 620.925 Td
-/F4.0 11 Tf
-<636f6d2e6d79636f6d70616e792e6d79617070> Tj
+234.94542857142855 753.206 Td
+/F1.0 10.5 Tf
+<41706163686520536869726f> 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
 
+0.351 Tw
+
 BT
-163.74 620.925 Td
-/F4.0 11 Tf
-<2020202020202020202020202020202020202020202020202020> Tj
+301.90824999999995 753.206 Td
+/F1.0 10.5 Tf
+<277320> Tj
 ET
 
+
+0.000 Tw
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+0.351 Tw
 
 BT
-306.74 620.925 Td
-/F4.0 11 Tf
-<2320646974746f> Tj
+312.0240714285714 753.206 Td
+/F4.0 10.5 Tf
+<5265616c6d> Tj
 ET
 
+
+0.000 Tw
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+0.351 Tw
 
 BT
-59.24 606.185 Td
-/F4.0 11 Tf
-<2a> Tj
+338.2740714285714 753.206 Td
+/F1.0 10.5 Tf
+<20636c617373207468617420616c6c6f777320757365722061757468656e7469636174696f6e20616e64> 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
-64.74000000000001 606.185 Td
-/F4.0 11 Tf
-<2020202020202020202020202020202020202020202020202020202020202020202020202020202020202020> Tj
+48.24 737.426 Td
+/F1.0 10.5 Tf
+[<617574686f72697a6174696f6e20746f20626520706572666f726d656420616761696e737420616e204c44> 20.01953125 <4150207365727665722e>] TJ
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+
+q
+450.000 0 0 291.706 48.240 429.904 cm
+/I3 Do
+Q
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+1.101 Tw
 
 BT
-306.74 606.185 Td
-/F4.0 11 Tf
-<2320766965772f656469742061636365737320746f2065766572797468696e67> Tj
+48.24 405.94011764705897 Td
+/F1.0 10.5 Tf
+[<546865204c44> 20.01953125 <41502064617461626173652073746f7265732074686520757365722f70617373776f72647320616e6420757365722067726f7570732c207768696c652074686520>] TJ
 ET
 
+
+0.000 Tw
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-q
-0.5 w
-0.933 0.933 0.933 SCN
-113.807 540.710 m
-113.807 580.270 l
-S
-Q
-0.067 0.067 0.067 scn
-0.067 0.067 0.067 SCN
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.067 0.067 0.067 scn
-0.067 0.067 0.067 SCN
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+1.101 Tw
 
 BT
-80.17133333333334 551.91 Td
-/F5.1 24 Tf
-<22> Tj
+427.1257119791667 405.94011764705897 Td
+/F4.0 10.5 Tf
+<736869726f2e696e69> 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.986 Tw
+1.101 Tw
 
 BT
-125.80666666666667 564.3059999999999 Td
+474.3757119791667 405.94011764705897 Td
 /F1.0 10.5 Tf
-[<54686520666f726d6174206f6620746865207065726d697373696f6e7320737472696e6720697320636f6e6669677572> 20.01953125 <61626c6520696e20536869726f2c20616e64204170616368652049736973>] TJ
+<2066696c65206973207573656420746f> Tj
 ET
 
 
@@ -7411,20 +7264,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-125.80666666666667 548.526 Td
+48.24 390.160117647059 Td
 /F1.0 10.5 Tf
-<75736573207468697320746f2070726f7669646520616e20657874656e6465642077696c646361726420666f726d61742c2064657363726962656420> 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
-428.3641666666667 548.526 Td
-/F1.0 10.5 Tf
-<68657265> Tj
+[<6d617020746865204c44> 20.01953125 <41502067726f75707320746f20726f6c65732c20616e6420746f206d61702074686520726f6c657320746f207065726d697373696f6e732e>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -7433,9 +7275,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-451.20166666666665 548.526 Td
-/F1.0 10.5 Tf
-<2e> Tj
+48.24 350.32011764705896 Td
+/F2.0 18 Tf
+[<342e312e20536869726f20436f6e6669677572> 20.01953125 <6174696f6e>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -7443,126 +7285,228 @@ ET
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
+0.111 Tw
+
 BT
-48.24000000000001 504.6860000000001 Td
-/F2.0 18 Tf
-<332e322e2045787465726e616c697a656420496e695265616c6d> Tj
+48.24 322.3001176470589 Td
+/F1.0 10.5 Tf
+[<54> 29.78515625 <6f20757365204c44> 20.01953125 <415020696e766f6c7665732074656c6c696e6720536869726f20686f7720746f20696e7374616e746961746520746865207265616c6d2e20205468697320626f6f74737472> 20.01953125 <617070696e6720696e666f206c6976657320696e20746865>] 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
 
-0.761 Tw
-
 BT
-48.24000000000001 476.66600000000005 Td
-/F1.0 10.5 Tf
-<5468657265d573206e6f20726571756972656d656e7420666f7220616c6c2075736572732f726f6c657320746f20626520646566696e656420696e2074686520> Tj
+48.24 306.5201176470589 Td
 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
 
-0.761 Tw
-
 BT
-367.1740294117647 476.66600000000005 Td
+48.24 306.5201176470589 Td
 /F4.0 10.5 Tf
-<736869726f2e696e69> Tj
+<5745422d494e462f736869726f2e696e69> 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
 
-0.761 Tw
-
 BT
-414.4240294117647 476.66600000000005 Td
+137.49 306.5201176470589 Td
 /F1.0 10.5 Tf
-<2066696c652e2020496e73746561642c2061207265616c6d2063616e> Tj
+<3a> 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
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 460.8860000000001 Td
-/F1.0 10.5 Tf
-<626520646566696e65642074686174206c6f616473206974732075736572732f726f6c65732066726f6d20736f6d65206f74686572207265736f757263652e> Tj
+49.24 14.388 Td
+/F1.0 9 Tf
+<38> 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
+Q
+Q
 
-BT
-48.24000000000001 433.10600000000005 Td
-/F1.0 10.5 Tf
-[<46> 40.0390625 <6f72206578616d706c653a>] TJ
-ET
+endstream
+endobj
+84 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 595.28 841.89]
+/Contents 83 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 16 0 R
+/F1.0 8 0 R
+/F4.0 39 0 R
+>>
+/XObject << /I3 87 0 R
+/Stamp1 246 0 R
+>>
+>>
+/Annots [86 0 R]
+>>
+endobj
+85 0 obj
+[84 0 R /XYZ 0 841.89 null]
+endobj
+86 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (http://shiro.apache.org)
+>>
+/Subtype /Link
+/Rect [234.94542857142855 750.14 301.90824999999995 764.4200000000001]
+/Type /Annot
+>>
+endobj
+87 0 obj
+<< /Type /XObject
+/Subtype /Image
+/Height 551
+/Width 850
+/BitsPerComponent 8
+/ColorSpace /DeviceRGB
+/Length 28559
+/Filter [/FlateDecode]
+/DecodeParms [<< /Predictor 15
+/Colors 3
+/BitsPerComponent 8
+/Columns 850
+>>]
+>>
+stream
+x\ufffd\ufffdw|\ufffd\u07bf\ufffd_\ufffd\ufffd\ufffd\u0142G\u03f1<\u03e3\ufffd\ufffdGD@\ufffd\ufffd
+zD\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd(\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdJ\ufffd"\ufffdA	\ufffd\ufffdBh"\ufffd\ufffd\ufffd\ufffd\ufffddvdfvg7\ufffd\ufffd\ufffd\ufffd\ufffdu\ufffd\ufffd\ufffd/\u071d\ufffd\ufffd{fg?\ufffds\\ufffdc\ufffd \ufffd"b@D@\ufffd\ufffd\ufffd}\ufffd " \ufffdD\ufffd>\ufffd\ufffd\ufffd\ufffd\ufffd"b@D@\ufffd\ufffd\ufffd}\ufffd " \ufffd@dQSSS\ufffd\ufffd\ufffd\u01a5\ufffdg@\ufffd"Ic\ufffd\ufffd\ufffd\ufffd\ufffdr\ufffd9V"\ufffdK/$?p\ufffd>\ufffd\ufffd\ufffdW\\,\ufffdl\u035a5k\u05ee]\ufffdn\ufffdo\ufffd\ufffd\ufffd~\ufffd\ufffd\ufffd\ufffdl\u0630a\ufffd\u018d\ufffd\ufffdl\u07bcy\u02d6-[\ufffdl\u06f6m\ufffd\ufffdnv\ufffd\u0739\ufffd\ufffd\ufffd\u077b\ufffd\ufffd\u0673\ufffd\u037e}\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd/\ufffd\ufffd\ufffd\ufffdi\ufffd R\ufffd\ufffd\ufffd.++\ufffd\ufffd\ufffd	B\ufffd^\ufffd/\ufffd\ufffd\ufffd\ufffdb\ufffdO\ufffd\ubbb3Q.\ufffdQz\ufffd{^\ufffdN\ufffd:t(\ufffdOz\ufffd\ufffd\ufffd}\ufffd(\ufffd}`3\ufffd$\ufffdu\ufffd\ufffd\ufffd\ufffd\ufffdl\ufffd=zHG$?\ufffdHF\ufffd@aa\ufffdD\ufffd \ufffd>yE\ufffd\ufffd\ufffdi\ufffd?!\ufffd\ufffd\ufffd(\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd7n\ufffd\ufffd+Ux\ufffd\ufffd
+ov\ufffdT\ufffdmn\ufffdUx\ufffdc\ufffd={\ufffd\ufffd\ufffd\ufffd+\ufffd\ufffd"\ufffdR%\ufffd\ufffd\ufffd-\ufffd\ufffd\ufffd\ufffd\ufffdvR]]]^^~\ufffd\ufffd\u0266M\ufffdZ\ufffd\ufffd\ufffd.\ufffdH\ufffd\ufffd@\ufffdB\ufffd\ufffd\ufffdv"	\ufffd\ufffd\ufffd\ufffd\u0631c\ufffd\ufffd~\ufffd\u0571\ufffd\ufffd;\uf50e\ufffd;b@\ufffdB\ufffd\ufffd\ufffdv"Q\ufffd\ufffd\ufffd\ufffd\ufffdn\ufffd:\ufffdI\ufffdT\ufffd\ufffd\ufffd
+D,\ufffd>\ufffdp\ufffd}`'R\ufffd\ufffd\ufffd\ufffdD6i\ufffd$\ufffdO\ufffd!\ufffdQ\ufffd"bD8\ufffd>\ufffd\ufffd`\u01be\ufffdn\ufffd\ufffd\ufffd\ufffd\ufffd \ufffd!\ufffd\ufffd\ufffd\ufffd \ufffd\ufffd \ufffd!\ufffd\ufffd\ufffd\ufffd \ufffd\ufffd \ufffd!\ufffd\ufffd\ufffd\ufffd \ufffd\ufffd \ufffd!\ufffd\ufffd\ufffd\ufffd \ufffd\ufffd \ufffd!\ufffd\ufffd\ufffd\ufffd \ufffd\ufffd \ufffd!\ufffd\ufffd\ufffd\ufffd \ufffd\ufffd \ufffd!\ufffd\ufffd\ufffd\ufffd \ufffd\ufffd \ufffd!\ufffd\ufffd\ufffd\ufffd \ufffd\ufffd \ufffd!\ufffd\ufffd\ufffd\ufffd \ufffd\ufffd \ufffd!\ufffd\ufffd\ufffd\ufffd \ufffd\ufffd \ufffd!\ufffd\ufffd\ufffd\ufffd \ufffd\ufffd \ufffd!\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u0538\ufffd\ufffd\ufffd\ufffd\ufffdEyyy^^\ufffd\ufffd\ufffd \ufffd>\ufffdF\ufffd\ufffd}\ufffd\ufffd\u068d\u0302\ufffd\ufffdb\ufffd	\ufffd\ua264%\ufffdQ\ufffdn\ufffd\ufffd\ufffd\ufffdp\ufffd\ufffd\ufffd[\ufffd.\ufffd\ufffdZ\ufffd\ufffd[n\ufffd\ufffd \ufffd\ufffd\ufffd\ufffd\ufffdN\ufffd}P\ufffd\ufffd|eeeIII\ufffd\ufffd\ufffd?\u06f5k\ufffd\ufffd\ufffd\ufffdl\u067247\ufffd\ufffd\ufffd\u02d7/_\ufffdbEFF\ufffd\u0295+333W\ufffdY\ufffdz\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd:\ufffd\ufffd\u0211#G\ufffdss\ufffd\ufffd\ufffd,7\ufffd\ufffd\ufffd999\ufffd\ufffd\ufffdK\ufffd\ufffd\ufffd\ufffd\ufffdR\ufffdX
\ufffd,\ufffd\ufffd?*++\ufffdP'\ufffd\u027f\ufffd;\ufffd\ufffd\ufffd\ufffd\u067d\ufffdJ\ufffd\ufffd9\ufffdRR@\ufffdx\u226b\ufffd\ufffd\ufffd\ufffd\ufffd~
+\ufffd\ufffd'\ufffd?\ufffd\ufffd\ufffd5\ufffd\ufffd\ufffd4T\ufffdbe\ufffd;::z\ufffd\ufffd{\ufffd_\ufffd~}\ufffd\ufffd\ufffd\u0673\ufffde\ufffd]fu\ufffd\ufffd\ufffd\u02e5#\ufffdN:5\ufffd\ufffd;**\ufffd\ufffdm\ufffd\ufffd$TIe\ufffd`\u05e7O\ufffd\ufffd
\ufffd\ufffd\ufffd\ufffd\ufffd}3g\ufffdl\u0420A\ufffd.]dl\u0497LL\ufffd @\ufffd#QI*W\ufffdN\ufffd\ufffd9\ufffdV\ufffdZ\ufffd\ufffd\ufffd\u02dd\ufffd\ufffdW\u077c\ufffd\ufffd^\ufffd\ufffd\ufffd\ufffd\ufffdb\ufffd|\ufffd]7\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u01cdU\ufffd}\ufffd\u024c\ufffd\ufffd\ufffd\ufffdHKKKO\ufffd8!?y\ufffd\ufffd\ufffd\ufffd?\ufffd\ufffd\ufffd\ufffd^{\ufffd=\ufffd\ufffd\ufffd\ufffd:0\ufffd\u027b]\ufffdv\ufffd\ufffd\ufffd\ufffd>b\u0108\ufffd\ufffdd\ufffd\ufffd\ufffd\ufffd\ufffd]RR\ufffdI^\ufffdb\ufffd\ufffdj)^R\ufffdG\ufffdy\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdu6\ufffd9c	V\ufffd\ufffd\ufffd6\ufffd\ufffd\ufffd\ufffd\ufffd\u0673/\ufffd\ufffd\ufffdn\u077a\ufffd\ufffd\ufffd+g\ufffd\ufffd^\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd]\ufffdT\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\uaaef\ufffd\ufffd^s\ufffd5-[\ufffd\ufffd9s\ufffd\ufffd\ufffdJ\ufffd\ufffdq\ufffd<EEET\ufffd>$\ufffd\ufffdzR\u0764>J\ufffd\u999b\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd;?\ufffdI\ufffd:u\ufffd\uaaab&O\ufffd,\ufffds\ufffd
@\ufffd\ufffd$\ufffd\ufffd\ufffd\u04bc\ufffd<\ufffd\ufffdK\ufffd\ufffd
+7d\u0210/\ufffd\ufffd^Z\ufffdt\ufffdb\u07f0a\ufffd6l\u063d{\ufffd\u014bK1\ufffd\ufffdd\u0293'OJf%\ufffdAp \ufffdA Q\ufffdoqq\ufffd\ufffdJY\ufffd\ufffd*\u0576s\ufffd\ufffdR\ufffd>\ufffd\ufffdC'\u01fe\ufffd\ufffd\ufffd+\ufffd\ufffd\ufffdm\u06f6\ufffd\ufffd\ufffd\ufffdH\ufffd\ufffd:\ufffd\ufffd\ufffd\ufffdrUqyy\ufffd\ufffdv\ufffd^\ufffdT\ufffd'\ufffd\ufffd\ufffdQQQ\ufffd\ufffds\ufffd\ufffd\ufffd_?s\ufffdLc\ufffd|\ufffdU\ufffdV\ufffd]w\u07581cd\u0488\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd2\ufffd\ufffdB\ufffd \ufffdA\ufffdQ\ufffd\ufffd+((P\ufffdIuKLL;v\ufffd\ufffd\ufffd\u05ad[K\ufffdrZ\ufffd	z\ufffd\ufffd)\ufffd\ufffdO>\ufffd\ufffd\ufffd\ufffdQI2\ufffd\ufffdc\u0644\ufffd\ufffd\u063dD\ufffd_\ufffd\ufffdu&\ufffd\ufffd!{\ufffd\ufffd/\ufffd\u05ad\u06f9\ufffd\u06ff[b\ufffd\ufffd?\ufffd|\ufffd\ufffd\ufffdo\ufffd>&&&55U\ufffd\ufffd)\ufffd\ufffdH\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd-\ufffdL\ufffd\u759a(U5%%e\u07bcyR\ufffd.\ufffd\u44af\ufffd\ufffd\ufffd9\ufffdO\ufffd\u03a6Y\ufffdfQQQIII2iG\ufffd\ufffd\ufffdV%\ufffdQ\ufffdB\ufffdCYY\ufffd\ufffd\ufffdo\J\ufffd\ufffd\ufffd\ufffd\ufffd1c\ufffd\{\ufffd-[\ufffd\ufffd_z\ufffdb\ufffd\ufffd\u0563G\ufffd\ufffd.\ufffdh\u0210!\ufffd\ufffd+uO\ufffd\ufffd\ufffd\ufffd\ufffdS\ufffd\ufffd\ufffd}`	\ufffd>\ufffd\u0253'\ufffd\ufffdI\ufffd\\ufffd|\ufffdT\ufffd\ufffd\ufffd_z\ufffdO=\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd^g\ufffd\ufffd\ufffd&\ufffd\u0139\ufffd\ufffd\ufffd\ufffd4\ufffd\ufffdgQQQNN\ufffdr\ufffd\ufffd\u04a5K\u055d\ufffd\ufffd1\ufffdOz\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdN\u066bT\ufffd\u0615\ufffda\ufffd%f\ufffd\ufffd\ufffdV\ufffd\ufffdsKu+((8~\ufffd\ufffdr\ufffd\ufffd\ufffdgKl\u0462\ufffd?\ufffd\ufffd'\ufffd\ufffd\ufffdS)\ufffdM\ufffd4\ufffd2e\ufffdr\ufffd
 \ufffd\ufffd\ufffd\ufffd\ufffd:\ufffd\ufffd@\ufffd\ufffd,--=u\ufffd\ufffd\ufffd\ufffdt\ufffdX\ufffdBv>e\uf88b.\ufffd\u0739\ufffd\ufffd\ufffdo\ufffd\u0211\ufffdw^\ufffdn\u0754\ufffdJ\ufffd\ufffd'Np\ufffd\ufffd\ufffd,D\ufffd\ufffdW\\\ufffd^j\ufffd\ufffd\ufffd.uP\ufffd\ufffd\ufffd\ufffd}\ufffd|\ufffdM�
\ufffd{\ufffd9\ufffd:\ufffd2''\ufffd\ufffd\ufffd\ufffd\ufffd|\ufffd\ufffd>\ufffd\ufffd\ufffd\ufffd\ufffd|6n\u0738Q\ufffdF\ufffd\ufffd\ufffdx\ufffd\ufffdk\ufffd\ufffd\uaaefV\ufffd\u0790'\ufffd:z\ufffd({\ufffd\ufffd\ufffd}`9\ufffdKm\ufffdbJ\ufffdKLL\ufffd2e\ufffdRyg\u03de\ufffd\ufffd'-\ufffd7\ufffd)woHSO\ufffd:UZZ\ufffd.8@X\ufffd\ufffd\ufffdC
+\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdE\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd9p\ufffd\ufffd\u01be\ufffd\ufffd\ufffd+woH\ufffd\\ufffdt){\ufffd\ufffd4\ufffd}\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdJqT\ufffd*\ufffd\ufffd[\ufffdnRy{\ufffd\ufffdau\ufffd\ufffd\u99df\ufffdr\ufffdp\ufffdB)\ufffd\u048b\ufffdT\ufffd\ufffd{t;\ufffdR=d\ufffdO\ufffd\ufffdF\ufffd}\ufffdW\ufffdk\ufffdN\ufffd`\ufffdc\ufffdR\ufffd\ufffd\ufffd\ufffd\ufffdb\ufffd
+\ufffd\ufffdC\ufffd\u062bGA\ufffd\ufffd}\ufffd\ufffd#G\ufffd\ufffdfffJ\ufffd7n\u0735\ufffd^\u06ecY3\ufffd\ufffd\ufffdO>\ufffd\ufffd3\ufffd\y\u5543V\u02b1\ufffd#\u5627\ufffdD\u069dO\ufffd\u07d3*!\ufffd&%%e\ufffd\u0739m\u06f6\ufffd\ufffd {\ufffdu\ufffd}\ufffd\ufffd4i\u04b8qc\ufffd\ufffd\u073d\u0384\ufffdAEWy\ufffd;\ufffdbbb\ufffd{\ufffd9\ufffd	\ufffd@\u017e\ufffd\ufffd\ufffd_v\ufffdem\u06b4\ufffd\u279c\ufffd\ufffdv\ufffdZ\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd#Z\ufffd\ufffd \ufffdP\ufffd\ufffd>\ufffd\ufffdS2\u06ef_\ufffds\ufffd=\ufffdW\ufffd^u\ufffd}�o\u0630\ufffd\ufffd/\ufffd\ufffdh\ufffd"\ufffd\ufffd\ufffd\ufffd<\ufffd\ufffdl\ufffdx\ufffd]FF\u0192%K\ufffd.\ufffd<\ufffd\ufffd\ufffd\ufffd>\ufffd@=\ufffd\ufffdEv\ufffd\ufffdt\ufffdD \ufffd}\ufffdS\ufffdth\ufffd6\ufffd\ufffd\ufffd[SRR\ufffd\ufffd}\ufffd\u05ad\ufffd\u0421�W^\ufffd\.\ufffd\ufffd\ufffd)\ufffdq\ufffd8\ufffd\ufffd\ufffd}\ufffd[W,\ufffd\ufffdm\ufffd\u06cd1<\,\ufffdh\ufffd\ufffd\u06ed\ufffdo6\ufffd\ufffd\ufffd\ufffd?\ufffdt\ufffd\ufffd\ufffd
}\ufffd\ufffd\ufffd\ufffdk\ufffdz\ufffd\ufffd\ufffd\ufffdw\ufffd\ufffd}R\u012f\ufffd\ufffd+\ufffd\ufffd?}\ufffd\ufffd\ufffd\ufffd\ufffd5\ufffd\ufffd&\ufffdxc\ufffdk7Gwm\ufffdk\ufffd[\ufffd\ufffdu\ufffd\ufffdK-R
+\u0161\ufffd_\ufffd6h\ufffdRb\ufffd\ufffd:\ufffd\ufffdF\ufffd^\ufffd\ufffd\ufffd\ufffd7}\ufffd\ufffd\ufffd\ufffdO]3\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd?o\ufffd\ufffd\ufffd>c\ufffd\u0739s\ufffd\ufffd\ufffdo\ufffd]\u0770\u07e3W}\ufffd1\ufffd\ufffd\ufffd\u048d3\ufffd\ufffd\ufffd\ufffd7-\ufffd~\ufffd\ufffdO\ufffd	{\ufffd_m\ufffdO\ufffd\u013e\ufffd~\ufffd\ufffdc`]\ufffdV*\uf0b7\ufffdy\ufffdi\ufffd\ufffd\ufffd\ufffds7|\ufffd\ufffd_<\ufffd\ufffd\ufffd\ufffd\\ufffd\ufffd\ufffd\ufffd<\ufffd\u0513\ufffd^\ufffd\ufffd\ufffd\u07bb\ufffd.8\ufffd/\ufffd\ufffdr\ufffdg\ufffd\ufffds\ufffd\ufffd\ufffd\ufffd.e]\ufffd\ufffd\ufffdx\ufffdq$\ufffd\ufffdwS\ufffd
\ufffdT\ufffd\ufffd\ufffd~\u0f2e\ufffdL\ufffd\ufffd\ufffd\ufffd\ufffd0\ufffd�_\ufffd\ufffdg\ufffdfW\ufffd\ufffdO<\ufffd\ufffdu\ufffd\u017e\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdO\ufffd\ufffd\ub9ef\ufffd\ufffd\ufffd~z\ufffdf\ufffdc\ufffd5\ufffd\ufffdF\ufffd\ufffd\ufffdYm\ufffdO\ufffd\ufffd>\u06ffZ\ufffdH\ufffd\ufffd>\ufffd\u05f5\u044c\ufffd\ufffd=\ufffd\ufffd\ufffd}\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdA\ufffd\ufffd_\ufffd\ufffd+/\ufffd>}\ufffd\ufffd\ufffd/55\ufffd\ufffdM\ufffd_{E\ufffdw\ufffd\ufffdA\ufffd\ufffd\ufffd\ufffd3\ufffdMx\ufffdF)\ufffdR\ufffd9\ufffdQRm\ufffd\ufffd8\ufffd\ufffd\ufffd\ufffd_\ufffdl4\ufffd\u02ff'kN;4\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdg\u0318\ufffd\ufffd}+V\ufffd\ufffd\ufffd\ubbf9\ufffdB\ufffd\u020cz\ufffd:\ufffdZR\ufffd\ufffd\ufffdIc\ufffd2
T\ufffd	\ufffd\ufffdJ\ufffdo\ufffdaf\ufffdwm\ufffd\ufffdk]8\ufffd\ufffd\ufffdQ\ufffdr\ufffd\ufffd\ufffd\ufffd'\ufffd\ufffd;\ufffdwk\ufffd\ufffd\ufffd\\ufffd\ufffd/]^y\u065f\ufffd7l\u0220\ufffd\ufffd\ufffd\ufffd\ufffdE\ufffd\ufffd8\ufffd\ufffd;V}|\ufffd\ufffd/\ufffd;<\ufffde\ufffd
+\u01b4\ufffd.\ufffd#\ufffdg-5 \ufffd\ufffdjiJe\ufffd\ufffds\ufffd\ufffd\ufffd}\ufffdr\u05e0\ufffdk\ufffd\ufffdgA\ufffd&\ufffd[_u\ufffd\ufffd\ufffd\ufffd~\ufffd\ufffd\ufffd\u018e\ufffd\ufffdRd~\ufffd\ufffd8\ufffd\ufffd\ufffd\ufffd\u077d\ufffd\ufffd\ufffd\ufffd\ufffdh)\ufffdKZ\ufffd\ufffdD\ufffd\ufffd>k\ufffd\ufffd\ufffdR.\ufffd\u01b6\ufffd\ufffd`\ufffd\ufffdV\ufffd\ufffd\u073fq`\ufffd\ufffd}\ufffd.\ufffdy\u06c4o\ufffd\ufffd\ufffd\ufffdz\ufffd\ufffd111\ufffdb\ufffd\ufffd\ufffdo\ufffdk\ufffd\ufffdh\ufffd3\ufffd\u01fc}\u06f2>M\ufffdr\ufffd\ufffd\ufffd\ufffd\ufffd\u0569o\ufffdrL-\ufffd\ufffd}X7\ufffd\ufffd\ufffd?\ufffd\ufffd\uc46d\ufffd=\ufffd\ufffd\s\u0645\ufffd\ufffd3))\ufffdv\ufffd]qq\ufffd/\ufffd_\ufffd\ufffd\ufffdCN\ufffdZE\ufffd\u0213\ufffdg-\ufffdHP9\ufffdW0\ufffdu\ufffddz\ufffd\ufffd\ufffd\ufffd\ufffdn\u0665\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd{\ufffdWOc\ufffd4i\ufffd\ufffd?q\ufffd\ufffd\ufffd\ufffd8\ufffd\ufffd\ufffd3?\ufffd{\ufffd\ufffd\ufffd\ufffd"\ufffd\ufffd\ufffd\ufffd\ufffdQ\ufffd\ufffd\ufffdjO;\ufffd\ufffd'\ufffd\ufffd;\ufffd\ufffdj\u0731\ufffd\ufffdsN\ufffd.\ufffd\ufffdz\ufffd%\ufffd\u073e\U000a3ef6|\ufffdL\ufffdg"Yb\ufffd\ufffdP\ufffd#Ge\ufffd\ufffd\u0537\ufffdn\ufffd\ufffdL\ufffd\ufffd\u027di4\ufffd\ufffd\ubc5dn\ufffd\ufffd\ufffdd\ufffd;--M\ufffd}\ufffdW\ufffdV\ufffd\ufffd?ow\u036f=\ufffd,}\ufffd\ufffdu\ufffd\ufffd=\ufffd\ufffd\ufffd\ufffdZ\ufffd\ufffd _DJ\ufffd\ufffdz\ufffd\ufffd?{\u07ff\ufffd\ufffd{\ufffd\ufffd9}\ufffdoA\ufffd&\ufffd\u07beM\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdD\ufffdAb\ufffd\ufffdP\ufffd#J\ufffda?\u0665\ufffd\ufffd\ufffd}\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdnw\ufffd<x\u05acY\ufffd\ufffd\ufffdo\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd=\ufffd�6\ufffd\ufffd\ufffd\ufffd\ufffd#[\ufffds\ufffd%R%
 a\ufffdU\ufffdO\ufffd7\ufffdb\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u028f\ufffdZ\ufffd\ufffd\ufffdRd\ufffd\ufffd_\ufffd'v\ufffd\ufffdg-\ufffdT\ufffd\ufffdZ\ufffd\ufffd\ufffd=\ufffd\ufffdo\ufffdI}\ufffd\u0385=n\ufffd\ufffd\ufffdW\\ufffd\ufffd\ufffd\ufffd\ufffd�\ufffd!\ufffd\ufffd)\ufffd\ufffd)Ey\ufffd\u034f\ufffd\ufffdc\ufffd[w\u03a5lJ\ufffd\ufffd\ufffd,Y\ufffd*\ufffd\ufffd>Sh\ufffd\ufffd>\ufffd\ufffd}Rdr\ufffd\ufffd\ufffd%\ufffd\ufffd\ufffd\ufffd\ufffdT\ufffd\u0211\ufffdg-\u2c37\ufffd\ufffd]U5\ufffd\ufffd\ufffd\u06e9/*\ufffd\ufffd\ufffd\ufffdTv\ufffd\ufffd|\ufffdL\ufffd\ufffd\ufffd\u07f9}\ufffd\u03b1\ufffd\ufffd$\ufffdg\ufffdx~\ufffd@\ufffd\ufffd\ufffd\u0211\u0607\ufffd\ufffd\ufffdUN\ufffd\ufffd}YR\T\ufffd2ovO\ufffdg\ufffd6\ufffd#\ufffd\ufffdZ(\ufffda\ufffd\ufffdB,V\ufffdx\ufffd\u0743\ufffd\ufffd\ufffd\ufffd\ufffdU\u07ff\ufffdn\ufffd-\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd,\ufffd\ufffd\ufffd\ufffd\ufffd	RR\ufffdWWUV\ufffd\ufffd\ufffd\ufffdR\ufffd\ufffd2\ufffd\ufffd\ufffd>k\ufffd\ufffd\ufffd\ufffd\ufffdR}\ufffdB\ufffd7\ufffdr\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\dS\ufffdk\ufffd\ufffdB\ufffd\ufffd\ufffd\ufffd>\ufffdh\ufffd\ufffd>\ufffdG\ufffd\ufffd\ufffd&r$\ufffdY\ufffd8\ufffd\ufffdY\ufffd\ufffd\ufffd+H\ufffd;1\ufffd\ufffd+\ufffd\ufffd\u037a\u03f9T\ufffd\ufffd.\ufffd\ufffd\ufffd\ufffdVK\ufffdC\ufffd(\ufffdQm"Jb\ufffd\ufffdP\ufffd\ufffd^\ufffd\ufffd\ufffdr\ufffd4uP\ufffd\ufffd\ufffdJ\ufffd\ufffdTU^ZU|\ufffdd\ufffd\ufffd\ufffd\ufffdXYV>\ufffd\ufffd\ufffd3\ufffdA\ufffd\u0607\ufffd\ufffdg\ufffd\ufffd\ufffd\ufffdT\ufffd\ufffd\ufffd\ufffdg-\ufffd\ufffdX[\ufffd\ufffdUA=uR\ufffd\ufffd1r$\ufffd\ufffd?Rm\ufffd\ufffd\ufffd\ufffd\ufffdB\ufffd\ufffdj\ufffd7\ufffdiv\ufffd\ufffdv-\ufffdV
 \ufffd'\ufffd\u0211\u0607\ufffdH\ufffd\ufffd\ufffdK\ufffd
+q\ufffd\ubcf6\ufffdyb\ufffd\ufffd}\ufffdT\ufffd\ufffd\ufffd>k\ufffd\ufffd\ufffd&gR\ufffd\ufffdf\ufffdgb\ufffd\ufffd}\ufffdT\ufffd\ufffd\ufffd>k\ufffd\ufffd\ufffd]d\ufffd%\ufffd\ufffd\ufffdj\ufffd\ufffd\ufffd\ufffdg-\ufffd\ufffd\ufffd
+\ufffd[.My\ufffd\ufffd\ufffd9\ufffd\ufffd\ufffd6X\ufffd}\ufffdB!{\u035f\ufffd\ufffd\ufffd\ufffd\ufffdVc\ufffdH\ufffdC\ufffd\ufffd`\ufffd%\ufffdY\ufffd8\ufffd\ufffd_7\ufffd\ufffd\ufffd5e\ufffdj%5\ufffd\ufffd\ufffd\ufffd9\ufffd\ufffd\ufffd6X\ufffd}\ufffdB!{=\ufffdZ\ufffdj\ufffd^@]\ufffd\ufffd1r$\ufffd\ufffd?Rm\ufffd\ufffd\ufffd\ufffd\ufffdB\ufffdw\ufffd+\ufffd\ufffdj\ufffd\ufffdu@\ufffdd\ufffdZM\ufffd\ufffd#\ufffd\ufffd\ufffdj\ufffd\ufffd\ufffd\ufffdg-bD\ufffd)\ufffd\ufffd#\ufffd\ufffdZ(\u0108\ufffdSb"Gb\ufffd\ufffdP\ufffd\u0467\ufffd>D\ufffd\ufffd>k\ufffd#\ufffdO\ufffd}\ufffd\ufffd}\ufffdB!FD\ufffd\ufffd18\ufffd\ufffd\ufffdB\ufffd\ufffd>%\ufffd!bp$\ufffdY\ufffd}J\ufffdC\ufffd\ufffdH\ufffd
+1"\ufffd\ufffd\u0607\ufffd\ufffd\ufffd\ufffdg-bD\ufffd)\ufffd\ufffd#\ufffd\ufffdZ(\u0108\ufffdSb"Gb\ufffd\ufffdP\ufffd\u0467\ufffd>D\ufffd\ufffd>k\ufffd#\ufffdO\ufffd}\ufffd\ufffd}\ufffdB!FD\ufffd\ufffd18\ufffd\ufffd%\ufffd
+qE\ufffdWMuu\ufffd\ufffd\ufffd\ufffd\ufffd>\ufffd\ufffd\ufffdW\ufffd?\ufffd\ufffdH\ufffd\ufffd\ufffd]K\ufffd\ufffdI\ufffdx\ufffd\ufffd)\ufffd\ufffdH\\ufffde\ufffd\ufffd{\ufffdt_eS:\ufffdf)_Y\ufffd\ufffd\ufffd&SV\ufffd\ufffd\ufffdL\ufffd\ufffd\ufffd\ufffd\u4c9f_vUU\ufffd~\ufffd\ufffd{3\ufffd\ufffd\u0514\ufffdNlg\ufffd\ufffdDH\ufffd\ufffd\ufffd\ufffd\ufffdbuG\ufffdo\ufffdYm1J\ufffdGb\ufffd\ufffd\\ufffd\ufffd\u05a5C=
+~\ufffd3I`+f0\ufffd\ufffd\ufffdSM\ufffd1)"g}\ufffdP\ufffd}\ufffd\ufffd|)\ufffd\ufffd\ufffdQ\ufffd9b_x\u051f\ufffd\ufffd\ufffdm),\ufffd\ufffd\ufffd#\ufffdj\ufffdQb\ufffd\ufffd8\ufffd\ufffdQ\ufffdo\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd}\ufffd\ufffd\ufffd\ufffd!\ufffd\ufffd}\ufffd\\ufffd\ufffd\u0699,GBi\ufffd\ufffd&WEu#\ufffd\ufffdrG\ufffd\ufffdH\ufffd}\ufffdW\ufffd-\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd-F\ufffd}\ufffd\ufffdB\ufffd\ufffd\ufffd\ufffd\ufffd:k\ufffd\ufffd\ufffdY\ufffdSv#'\ufffdU\ufffd\ufffd\ufffdl\u0541U$\ufffd\ufffd\ufffd\ufffd\ufffdsM\ufffd\ufffd*\ufffd^tTi\ufffd\ufffd\ufffd~\ufffd' \ufffd\ufffd\ufffd-Z�\ufffd%\ufffdY\ufffds
+\ufffd\ufffdV\ufffdKo\ufffd\ufffd\ufffd\ubeaa\ufffd\ufffdt(\ufffd
\ufffd\u01f5\ufffdy\u070f\ufffd*\ufffdN\ufffd\ufffd)\ufffd\ufffd\u079a2\ufffd\ufffd_\ufffdz\ufffd\ufffd\ufffd5\ufffd\ufffd\ufffd\ufffde\ufffdDWA\ufffd\ufffdGm\ufffd>\ufffd\ufffd\ufffdeb\ufffd_\ufffd\ufffd\ufffd\ufffdg\ufffd\ufffd\ufffdq\ufffd7k\ufffd\ufffd+\u07ce4\ufffdNf\ufffd)\ufffd�\ufffd\ufffd\ufffd~S\ufffd*\ufffda\ufffd\ufffdV|\ufffd<\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdj\ufffd\ufffdp\ufffd,,\ufffd\ufffd\ufffd->\ufffd\ufffd!\ufffd\ufffd(\ufffd\ufffdZ\ufffdS\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u02f5-\ufffd5\ufffd9\ufffdKt?c\ufffd\ufffdY-\ufffd~\ufffdi\ufffd\ufffd\ufffddz]\ufffd_g\ufffd\ufffdN\ufffd\u03e3\ufffdqe\ufffd\ufffd\ufffdM\u0512m,\ufffd>\ufffd\ufffd\u03ef\ufffdg;/s\ufffd\u0372\ufffd/]\u9966\ufffd\ufffdw\ufffd&\ufffd\ufffd\ufffdG\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdu\ufffd\ufffd\ufffd\ufffd\ufffdh\m<\ufffd\ufffdh[XJ\ufffdW[|\u0397\ufffd�\ufffd_b\ufffd\ufffd8\ufffd\ufffd\ufffdk\ufffd`\ufffdw\ufffdy\ufffd\u0334\ufffd\ufffd\ufffd=(3\ufffd\ufffd8*i\ufffd\ufffdR\ufffd\u039c.\ufffd\ufffdl\ufffd\ufffdH\ufffd\ufffd\ufffd?\ufffd\ufffdv.\ufffd\ufffdhc\ufffdvg\ufffd\ufffd \ufffd\ufffdK\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd<j\ufffd\ufffd\ufffd\ufffd=m9\ufffd\ufffdL\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd#\ufffd\ufffd\ufffd\ufffd?_\ufffd\ufffd\ufffd\ufffd\ufffde\ufffd\ufffdd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdi\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdh\ufffd\ufffd\ufffdf\ufffd\ufffd\ufffd\ufffd\ufffd~\ufffd\u015f\ufffd\ufffd\ufffd8\ufffd\ufffd%\ufffdY\ufffdC
+\ufffd\ufffdC\ufffdN\ufffd\ufffdz\ufffd\ufffdu?\ufffd\ufffd\ufffd>\ufffd\ufffd\ufffdgS\ufffdW\ufffd\ufffd^N\ufffd\ufffd\\ufffd\ufffdX,\ufffd\ufffdk5\ufffd\ufffd\u018d-k_\ufffd\ufffd\ufffd\ufffd\u03d7\ufffd\ufffd\ufffdg;\ufffd\ufffdT\ufffdD\ufffd\ufffd/\ufffd\ufffd=r\ufffdZY\ufffd5\ufffd\ufffd{4~\ufffd!\ufffd9\ufffdc\ufffd\ufffd\ua3df?Ook\ufffd\ufffdjS\ufffd\ufffd\ufffd\ufffdXZX\ufffd\ufffd\u05f3\ufffd\ufffd\ufffd\ufffd\ufffdb\ufffd\ufffdg-)\ufffd\ufffd=\ufffdROI( e\ufffd\ufffd\ufffd\u07ae\ufffdPP?[\u03d1x\ufffd\ufffd\ufffd\ufffdE\ufffd\ufffd\ufffd/\ufffdL\ufffd\ufffd\ufffd\ufffdn\ufffd\ufffd
+o\ufffd\ufffdd\ufffd\ufffd\\ufffd>\ufffd1/\ufffd~~\ufffd\ufffd\ufffd4\ufffdyM\ufffdu\ufffd\ufffd\ufffd\ufffdJsx\ufffd>\ufffd\ufffd?~\ufffd\ufffd\ufffdF\ufffd\ufffdF\ufffd#o\ufffd\ufffd\ufffd\ufffddH\ufffdc\ufffdu\ufffd-\ufffd\ufffdEmqHm1J\ufffd\ufffdb\ufffdW\ufffd(/
+	\ufffd\ufffd\ufffd\ufffdG\ufffdm.\ufffd\ufffdYW:\ufffd\ufffdJ\ufffd.C\ufffd+Q\ufffd\ufffd\ufffd3_~.g\ufffd\ufffd\ufffd7\ufffdY\ufffd4\ufffdgM\ufffd\ufffdu8\ufffd4\ufffdw\ufffds\\ufffd\ufffd\ufffd\ufffdY\ufffd\u0627\ufffd	h\ufffd\ufffda\ufffd\ufffd.,g\ufffd\ufffd\ufffd\ufffd\ufffd|Q[R[\ufffd\ufffd\ufffd\ufffd	\ufffd\ufffd\ufffd\ufffd\u028d\ufffdj\ufffd\ufffdnm\ufffd2i\ufffdc\ufffd3\ufffdT\ufffd\ufffd{\ufffdO\ufffd\ufffdro)\u02a7\ufffd~z\ufffdc\ufffd6\ufffds\ufffd\ufffd\\ufffd>\ufffd1r\ufffd\ufffd_\ufffd\ufffd\ufffd\\ufffd5Y\ufffd\ufffdJs\u01feP\ufffd?\ufffd9\ufffdg\ufffd\ufffdL\u0471\ufffd\ufffd\ufffd\ufffd_[\ufffd\ufffd/j\ufffdCj\ufffdQb\ufffd\ufffd8\ufffd{\ufffd"D\ufffdO\ufffd]\ufffd\ufffd\ufffd9\ufffde\ufffd\u053f\ufffd\ufffd,9\ufffd\ufffd\ufffd\ufffdxj\ufffd>\ufffd\ufffd\ufffd\ufffd\ufffd]\ufffdS\ufffd\u0627N`<\ufffd\ufffd+\ufffd\ufffd\ufffdW\ufffd\ufffd\ufffd\ufffd\ufffd\u05d4\ufffdR\ufffd|\ufffd\ufffd\ufffd\ufffd\ufffd,\u0375]\ufffdC\ufffd4\ufffdq\ufffdsf\ufffd\ufffd\ufffd\ufffd>b\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdb6#\ufffdj\ufffd\ufffd\ufffdEmqHm1J\ufffd\ufffd\ufffd\ufffd\u0390\ufffd\ufffd\ufffd\u01ab\ufffd].]\ufffd\ufffd\ufffd\ufffdx\ufffd\u06b5\ufffdO\ufffd\ufffdx\ufffd\ufffd\ufffd\ufffd\ufffdUO:2\ufffd\ufffd\ufffd\u7243:\ufffd\ufffd\u03a0\ufffd\ufffd\ufffdZ\ufffdEO\ufffdC{\ufffdq\ufffdc\ufffd\ufffd|\ufffd\uaf3c\ufffdv\ufffd\ufffd\ufffd\u011f/\u077c4\ufffdjM\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u019c\X<\ufffd_\ufffd_m\ufffds\ufffd\ufffd-\ufffd-F\ufffd}\ufffdb{!6_G\ufffd\ufffd\ufffdv\ufffde\ufffdY\ufffd=^T\ufffdRax\\ufffd\ufffd/\ufffd\ufffdUu\ufffd}Gb\ufffdG\ufffdGo\u03ce\ufffd[_&3\ufffd\ufffdQ\u0275\ufffd}nu\ufffd5\ufffdH\ufffd\ufffdU\ufffd-\ufffd\ufffdv<N\ufffd\ufffd2\ufffd4\ufffdj
 M\ufffd\ufffd\ufffd\ufffd/\ufffd\ufffd\ufffd\ufffd(>c\ufffd\ufffd\ufffd\ufffd)M9\ufffd\ufffdxk\ufffd\ufffd\ufffd\ufffd\ufffd|Q[R[\ufffd\ufffd\ufffd\ufffd\ufffdB\ufffd\ufffd\u0635\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdt#\ufffd=\ufffd?i\ufffd\ufffd\ufffd^\ufffd\ufffd\ufffdz\ufffdzk\ufffd8o\ufffd:]u0\ufffdJm;~\u03b5\ufffd\ufffdt\ufffdx\ufffd\ufffd\ufffd\ufffd\ufffdV\ufffd)\ufffd\ufffd\ufffd/\ufffd\ufffd\ufffdy;^\ufffd\ufffd>\ufffd\ufffd/\u077c4\ufffdjM\ufffd\ufffd\ufffd\ufffd\u03f1\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffde\ufffd\ufffd#H\ufffdSXL\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd/j\ufffdCj\ufffdQb\ufffd\ufffd8\ufffd#V\ufffd\ufffdU\ufffd\ufffd\ufffdB\ufffd\ufffd\ufffd\ufffd#\ufffd\ufffd
+\ufffd}\ufffdB!\u01b0\ufffd\u37b4\ufffdm4\ufffd\ufffd\u0607h\ufffd\ufffdb\ufffd\ufffd>k\ufffdc\ufffd\ufffd\ufffd\ufffd&\ufffd\ufffd?|\ufffdF\ufffd}\ufffdF\ufffd-VH\ufffd
+1F\ufffd\ufffdKp\ufffd\ufffd_b\ufffd7\ufffd-\ufffd\ufffd\ufffdg-bD\ufffd)\ufffd\ufffd#\ufffd\ufffdZ(\u0108\ufffdSb"Gb\ufffd\ufffdP\ufffd\u0467\ufffd>D\ufffd\ufffd>kQ\ufffd/"\ufffdO\ufffd6\ufffd\ufffds\ufffdC\ufffd\u013e%\ufffd\ufffd\ufffd\ufffd\ufffd"b\ufffdH\ufffdA\ufffd\ufffd\ufffd\ufffdB&\ufffd\ufffdN\ufffdl\ufffdW\ufffd\ufffd!\ufffd\ufffd\u0643\ufffd6\ufffd\ufffdYm\ufffdO\ufffd\ufffd>\ufffd\ufffd>\ufffd\ufffd\ufffd\ufffd\ufffd"b@D2\ufffdo\ufffd\u028c\ufffdO\ufffd\ufffd\ufffd;mWb\ufffd\ufffdE1v\ufffd\ufffd2\ufffd\uf1f6\ufffd\ufffd\ufffd#"""\ufffd\ufffdj\ufffd\ufffd\ufffd|T;B&\ufffd\ufffd\ufffd\ufffd""""\ufffd;\u054e\u040b}\ufffd\ufffdGDDD\ufffdQb\ufffd\ufffd\ufffd\ufffd!\ufffd\ufffd\ufffd\u0607\ufffd\ufffd\ufffd\ufffd\ufffdg-\ufffd>DDDt\ufffd\ufffd>k!\ufffd!""\ufffdC$\ufffdY\ufffd"\ufffd\ufffdZ\ufffd}\ufffd\ufffd\ufffd\ufffd\ufffd}\ufffdB\ufffdCDDD\ufffdH\ufffdb""":Db\ufffd\ufffd\ufffd\ufffd!\ufffd\ufffd\ufffd\u0607\ufffd\ufffd\ufffd\ufffd\ufffdg-\ufffd>DDDt\ufffd\ufffd>k!\ufffd!""\ufffdC$\ufffdY\ufffd"\ufffd\ufffdZ\ufffd}\ufffd\ufffd\ufffd\ufffd\ufffd}\ufffdB\ufffdCDDD\ufffdH\ufffdb"\ufffd/\ufffdP\ufffd\ufffd-\ufffdg\ufffd\u022fl":Mb\ufffd\ufffd\ufffd\ufffdhf\ufffd\u05eb+**
 
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
+\ufffd;=\ufffds\ufffd_\ufffd\ufffd\ufffd\ufffd\ufffd./_\ufffdQ_\ufffd\ufffd\ufffdDb\ufffd\ufffd\ufffd\u0468u\ufffd\ufffdV-#b\ufffdI\ufffdb"\ufffd.\ufffde\ufffd\ufffdI\ufffd98\ufffd\ufffd\ufffd(\ufffd\ufffdZ\ufffd}\ufffdh\u0522\u0627\ufffd\ufffd-\u073b'\ufffd\ufffdl\ufffdGDt\ufffd\ufffd>k!\ufffd!\ufffdQ\ufffd\ufffdo\u07cc\ufffd\ufffd\u04a1\ufffdn\ufffdO,/\ufffdy.#Sb\ufffd\ufffd\ufffd\u04681\ufffdic\ufffd\ufffdz\ufffd\ufffdV#"\ufffdH\ufffdb"\ufffd%9\ufffd\ufffd\ufffd@]Vz\ufffd\ufffd\ufffdg>1"\ufffd\ufffd\ufffd>k!\ufffd!\ufffdQ\ufffdI\ufffd\ufffd#"\ufffdH\ufffdb"59o\ufffd\ufffd*\ufffd>#"\ufffdH\ufffdb"\ufffd\ufffdDDs\ufffd}\ufffdB\ufffdCD\ufffd&pQ\ufffdri\ufffd\\ufffd&FD4\ufffd\ufffdg-\ufffd>D4j\ufffd\ufffd>\ufffd\ufffd{\ufffd\ufffd\ufffdDb\ufffd\ufffd\ufffd\u0468.\ufffd\ufffd\ufffdV\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd#"\ufffdH\ufffdb"\ufffd\ufffdt\ufffdC\ufffd]\ufffdV#"\ufffdH\ufffdb"5\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdj\ufffdth\ufffd\ufffdW\ufffd\ufffdM$\ufffdY\ufffd"\ufffd\ufffdZ\ufffd}\ufffd\ufffd\ufffd\ufffd\ufffd}\ufffdB\ufffdCDDD\ufffdH\ufffdb""":Db\ufffd\ufffd\ufffd\ufffd!\ufffd\ufffd\ufffd\u0607\ufffd\ufffd\ufffd\ufffd\ufffdg-\ufffd>DDDt\ufffd\ufffd>k!\ufffd!""\ufffdC$\ufffdY\ufffd"\ufffd\ufffdZ\ufffd}\ufffd\ufffd\ufffd\ufffd\ufffd}\ufffdB\ufffdCDDD\ufffdH\ufffdb""":Db\ufffd\ufffd\ufffd\ufffd!\ufffd\ufffd\ufffd\u0607Nv\ufffd\ufffd#j\ufffd\ufffd\ufffd\ufffdI\ufffd\ufffd\ufffd\ufffdb\ufffd+F\ufffd\ufffd\ufffd>k!\ufffd\ufffd\ufffd\ufffd\u06a9]'\ufffd\ufffd\ufffdJ}\ufffd\ufffdM\ufffd2Yuy\ufffd\ufffd\ufffd\ufffd|xY\ufffdi\u0181J\ufffddK\ufffd\ufffd\ufffdx\u9172\ufffdl\ufffdS\ufffd
 \ufffd\ufffdWr\ufffd\ufffd\ufffd\ufffd>k!\ufffd\ufffd\ufffdfv}\ufffd\ufffd\ufffdB\ufffdNj\ufffd^\ufffd\ufffd>m\ufffd\ufffdY\ufffdY\ufffdv\ufffd#~\ufffd3I`\ufffd\ufffd\ufffd\ufffd\ufffd\u050c\ufffdva\ufffd\ufffdWL\ufffd\ufffdp\ufffd\ufffdg-\ufffd>\ufffdQ\ufffd8\ufffdv\ufffd(\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd>\ufffdT\ufffd\ufffdc\ufffd\ufffd\u04ca\ufffd\ufffd\ufffdN\ufffd\u052d\ufffd\u01fe\ufffdk\u07cc\ufffd\ufffd\ufffdKij\ufffdUz\ufffd\ufffd1\ufffd%\ufffdY\ufffd\ufffdR=\ufffdbrf\ufffd\ufffdM\ufffd\ufffd$d\ufffdJB\ufffd\ufffdI@\ufffdd\ufffdP\ufffd}\ufffd\ufffd\ufffd1\ufffd\ufffd$\ufffdZ\ufffd~_1bHK\ufffdb\u06a5\ufffd<n\ufffd\ufffd\ufffdL\ufffd%\ufffd\ufffd\ufffd(Q@{\ufffdF\ufffd\ufffd\ufffddJ\ufffd\ufffd\ufffd)O.{\ufffd\ufffd+#T>\ufffdm\ufffd\ufffd\ufffdu]\ufffd]\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdN\ufffd;\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd)\ufffd\ufffd\ufffd\ufffdvIzl\ufffdxu\ufffd\ufffd}\ufffd\ufffdx\ufffd\ufffd\ufffdMR\ufffd\u04af:\ufffd5\ufffdi_\ufffd\ufffdb\ufffd6/\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u038e\ufffdu^\ufffd\ufffdUDUb\ufffd\ufffd\ufffd\ufffdF}^J\ufffdlu\ufffdrs\ufffdqGA\ufffd\ufffd\ufffd\ufffdJ\ufffd\ufffd\ufffd\ufffd\ufffd\ud5b7\ufffd�g\u054d_j-\ufffd\ufffd\ufffd6\ufffd\ufffdAo\ufffd\u059d\ufffd\ufffdTmc\ufffd\ufffd\ufffd8X\ufffd\ufffd\ufffd\ufffd
+\ufffd}\ufffd\ufffdTgT\ufffd\ufffd\u0694\u025a_\ufffd?\ufffdb\ufffd\ufffd\ufffdQ\ufffdZ\ufffd\ufffdo{\ufffd\ufffdH\ufffd\ufffdg-\ufffd>\ufffdW\ufffd\ufffd\ufffd\ufffd\ufffd\u01f7\ufffdw\ufffd\ufffdv#\ufffd-\ufffd\ufffd&\ufffd6\ufffd\ufffd\ufffd\ufffd c\u04c6\ufffd_\u0766\u069fL\ufffd\ufffdZ\u03602\ufffd\ufffd\ufffdR?\ufffd\ufffd6o\ufffd\ufffdx\ufffdH\ufffd\ufffd\ufffd]\ufffd\ufffd\ufffd\u03ef\ufffd\ufffd7\ufffd\u03c5\ufffd�\ufffd\ufffdg~\ufffd\ufffd\ufffd\u06fcx;Rk}>bp$\ufffdY\ufffdmWw\ufffd\u0498$t\ufffdRe#g\ufffd#\ufffd\ufffdb\ufffdhy\u072e\ufffd\ufffdkx(mO
\ufffd6\ufffd\ufffd>gP\ufffdN\ufffd\ufffdU\ufffd\ufffdgS\ufffd\u01fe\ufffd^\ufffd\ufffd\ufffd\\ufffd\ufffdx\ufffd\ufffdp=\ufffd\ufffd5\ufffdi_\ufffd?\ufffd\ufffd\u06fc\ufffd\ufffd>]G\ufffdY\ufffd\ufffd\ufffd\ufffd\ufffdg-\ufffd>t\ufffd\ufffd\ufffd\u050d\ufffd\ufffd[\o\ufffdOw\ufffd\ufffd\ufffdcG\u01a3Y\ufffd\ufffd\ufffdP@2\ufffd\ufffd\ufffd=^\ufffd\ufffd\ufffd~\ufffd\ufffd#\ufffdx}\ufffd\ufffd{#\ufffdg\ufffd\ufffd\ufffd\ufffd+0\ufffd\ufffd\u07cbV\ufffdG\ufffd<\ufffd\ufffd\ubd2f\ufffd\ufffdb\ufffd6/&\ufffdO{N\ufffd\ufffd18\ufffd\ufffd\ufffd\u0607\ufffdRw\ufffd+h\ufffd\ufffdx\ufffd\ufffd\ufffd\ufffdZ
+\ufffdf\ufffd5\ufffd\ufffd\ufffd7L5\ufffdU\ufffds\ufffd\ufffd}\u0792\ufffd\ufffdk\ufffd<\ufffd\ufffd`\ufffd\ufffd\ufffd\,\ufffd\ufffd}\ufffdEQ\ufffd\ufffd\ufffd\ufffd}\ufffdB\ufffdCG\ufffd;'e\ufffd\ufffd>o\ufffdF\ufffdxI\ufffd]\ufffd\ufffd\ufffdM\ufffd\ufffd\ufffd1\ufffd\ufffdtj|\ufffd?}\ufffd\ufffd\ufffd\ufffd\ufffdt\ufffd\ufffd+v.S3N*_q\ufffd\ufffd\ufffd\ufffdy\ufffde\ufffd>b$\ufffdY\ufffd\ufffdn\ufffd\u0617\ufffd\ufffdX\ufffd.Lx\ufffd\u0298*\ufffdW\ufffd#\ufffdO&H\ufffd\ufffd2;+N\ufffdz\ufffd\ufffdc#~\ufffd\ufffd\ufffdW\ufffd3\ufffdy\ufffd\ufffd4\ufffd\ufffd\u8d2f\u061fk\ufffd\ufffd\ufffd}\u07be\ufffdz.|\ufffd H\ufffdb\u06a5\ufffd9\ufffd\ufffd8\ufffdm
+\ufffd}\ufffd-\ufffd\ufffd~\ufffdm\ufffd\ufffdG\ufffdtH\ufffd\ufffdD\u0758]\ufffd\ufffd{\ufffd\ufffd\ufffd9\ufffd\ufffd5\ufffd\ufffdW\ufffdS\ufffdFb\\ufffd\ufffd\u0162\ufffd\ufffdx\ufffd\ufffd\ufffd\u03fe\ufffd\ufffd
+L\ufffd\ufffdT\ufffd\ufffdY\ufffd,x|\ufffd\ufffd\ufffd}m\ufffd\ufffdM\ufffd\ufffd\ufffd\ufffd[\ufffd\ufffd\ufffd\ufffdG\ufffdZb\ufffd\ufffd\ufffd\ufffd.\ufffd\ufffde\ufffd\ufffd\ufffd5\ufffdc_\ufffd\ufffd+\ufffdtOB\ufffd\ufffd\ufffd2o\ufffd`j\ufffdwv\ufffd\ufffdx\ufffd\ufffd\ufffdY\ufffd&3h2\ufffd:\ufffd>\ufffd#19b\ufffdGo\ufffd\ufffd\ufffd/\ufffd_\ufffd\ufffd7h~\ufffd\ufffd.\ufffdxl'\ufffd\ufffdb\u0763\ufffd}\ufffd>\ufffd\ufffdZm\ufffd\ufffd\ufffdj\ufffd}\ufffdB\ufffdC5&\ufffd\ufffd)\ufffdU\ufffd3\ufffd\ufffd;\ufffd\ufffd\ufffd\ufffd,\ufffdSi\ufffdx0I\ufffd\ufffd\ufffd\ufffd\ufffdEc/.C\ufffd\ufffdUS\u0191x\ufffd-@\ufffd\ufffds\ufffd]\ufffdJ;~\u03b5\u03ef\ufffd\ufffd7\ufffdq\ufffd\ufffd\ufffd<\ufffd\ufffd\u062f\ufffd|\ufffd\ufffd\ufffd\ufffd\ufffdb\ufffd\ufffdx\ufffd\ufffd\ufffdG\ufffdNb\ufffd\ufffd\ufffd\ufffd!\ufffd\ufffd\ufffd\u0607\ufffd\ufffd\ufffd\ufffd\ufffdg-\ufffd>DDDt\ufffd\ufffd>k!\ufffd!""\ufffdC$\ufffdY\ufffd/\ufffd]\ufffd6\ufffd\ufffdc\ufffd\ufffd\ufffdb\ufffd\ufffd"\ufffdB\ufffdQ\u028e\ufffds\ufffdI\ufffdb_\ufffd\ufffd\ufffd\ufffd\ufffdp\ufffd9\ufffd\ufffd7P\ufffd1\ufffd]v\ufffd\ufffd=v\ufffd%\ufffdXZs\ufffd\ufffd\ufffddjN\ufffdJ\ufffdb_X\ufffdd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u01cd\ufffdv\ufffd\ufffdu\ufffd\ufffd\ufffd\ufffd\ufffdo\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdl\u0738q\u04e6M\ufffd\ufffdl\u0672e\ufffd\u05ad\ufffd\ufffdlw\ufffd\ufffd\ufffd\u039d;w\ufffd\u06b5\ufffd\u035e={\ufffd\ufffd\u0677o\ufffd\ufffd\ufffd\ufffd80{\ufffd\ufffd[\ufffd\ufffdR:"\ufffd!F\ufffdJ\ufffd[\ufffd\ufffd\ufffd\ufffd\ufffd\u05acY\ufffd-;\ufffd\ufffdQk\ufffdRv\ufffd\ufffd\ufffd\ufffdc\ufffdQ\u028e\ufffd\ufffd\u04be\ufffdB\ufffdW\ufffd}\ufffdB\ufffdK%\ufffd%>\ufffd6\ufffd\ufffd\ufffd7_~\ufffd\u0571\ufffd+\ufffd\ufffd\ufffd\ufffd;
 \ufffd\ufffdGD\ufffdT\ufffd\u03af\ufffd>\ufffd\ufffd'\ufffdPs\ufffdUb\ufffd\ufffd\ufffd\ufffdR\ufffdP\ufffd/\ufffd\ufffd\ufffd2\ufffdc\ufffd\ufffdW\.)\ufffdl\ufffdqD\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdB\ufffd^\ufffdPs\ufffdTb\ufffd\ufffd\ufffd\ufffdR\ufffd\ufffd\ufffdp\ufffd\u07ed\ufffd}7]~9%\ufffd\ufffd=\ufffd\ufffd\ufffd6!\ufffdI/\ufffd5',%\ufffdY\ufffd/,Ub\ufffd\ufffd\ufffd\ufffd\ufffd\u01fe/\ufffd\:"\ufffd!F\ufffdRb{dF\ufffdVA\ufffd}\ufffdK,\ufffd/L%\ufffdY\ufffd/,%\ufffd!b\ufffd%\ufffda@$\ufffdY\ufffd/,%\ufffd!b\ufffd%\ufffda@$\ufffdY\ufffd/,%\ufffd!b\ufffd%\ufffda@$\ufffdY\ufffd/,%\ufffd!b\ufffd%\ufffda@$\ufffdY\ufffd/,%\ufffd!b\ufffd%\ufffda@$\ufffdY\ufffd/,%\ufffd!b\ufffd%\ufffda@$\ufffdY\ufffd/,%\ufffd!b\ufffd%\ufffda@$\ufffdY\ufffd/,%\ufffd!b\ufffd%\ufffda@$\ufffdY\ufffd\ufffd|1\ufffd\ufffd\ufffd\ufffdw\ufffd\u07bf\ufffdW_r\ufffd\u0571\uf7d7^*Iw\u04a9\ufffd3\ufffd\ufffdv)`\ufffd\ufffd}tk\ufffd \ufffd>\ufffdE\ufffd\ufffd\u6137v\ufffd\ufffd2\ufffdoT\ufffdf\ufffd\ufffdp\ufffd}\ufffdd\ufffd}X\ufffd\ufffdG\ufffd#db\u07eaiSm\ufffdj1\ufffd\ufffd1\ufffd\ufffd0\ufffd&jw>\ufffd!\ufffd ,\ufffd\ufffd\ufffd***\ufffd\ufffd\u0624I\ufffdc\ufffdm\ufffd\ufffd&\ufffd\ufffd\ufffdS\ufffd\ufffdlC*@AA\ufffd\ufffd \ufffd>yK\ufffd\ufffd\ufffds \ufffd\ufffd\ufffd\ufffd \ufffd\ufffd \ufffd!\ufffd\ufffd\ufffd\ufffd \ufffd\ufffd \ufffd!\ufffd\ufffd\ufffd\ufffd \ufffd\ufffd \ufffd!\ufffd\ufffd%\ufffd\ufffdGeeeaa\ufffdT\ufffd\ufffd\ufffd>\ufffd\ufffdt'\ufffd\ufffd9<\ufffd\ufffd"\ufffd\ufffd\ufffdN~~\ufffd\ufffd\ufffd \ufffd>yW\ufffd\ufffd\ufffds \ufffdA\ufffd\ufffd\ufffdU]]=\ufffd\ufffd\ufffd\u04ef_\ufffd\ufffd}
 \ufffd\ufffd\ufffd\ufffd\ufffd\ufffd.\ufffd:\ufffd]~\ufffd\ufffd\u0491t'\ufffd\ufffdIP\ufffd%3B!p>\ufffd-;|\ufffdA\ufffd=\ufffd\ufffd\ufffd\ufffd\u02fc\ufffdc\ufffd\ufffd@ \ufffdA\ufffd\ufffd\ufffdUQQ\u0469S')y\ufffdZ\ufffdz\ufffd\ufffd;\ufffd\ufffd7\ufffd\ufffdy\ufffdM\ufffd3\ufffd\ufffd\ufffd\ufffd)))\ufffd\ufffd>\ufffd\ufffd\ufffdnz\ufffd\ufffd=
\uf7e1\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd
+8oe\ufffd3x,;R,\ufffd}\ufffd~\ufffd\ufffd\ufffd5\ufffd\ufffd7\ufffd\ufffd\ufffd\ufffd\ufffdQs \ufffd \ufffdH\ufffd\ufffd\ufffd\ufffd*))9q\ufffd\ufffd\u0211#/\ufffd\ufffd\ufffd7\ufffdx#55u\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u02d7\ufffdX\ufffd"##c\ufffd\u0295\ufffdnV\ufffdZ\ufffdz\ufffdj]\ufffd
l\ufffd<x\ufffd\u0421\ufffdn\ufffd9r\ufffd\ufffd17\u01cf\ufffdr\ufffd\ufffd\ufffd={\ufffd\ufffdK/\ufffd\ufffd[\ufffdn999\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd+xEWv4h\u0437o_\ufffd\uc9391\ufffd\ufffdUn\ufffde'\ufffd\ufffd\ufffd\ufffd5G&\ufffd\ufffd\ufffd\ufffd \ufffd\ufffd\ufffd\ufffdI]\ufffd\ufffds\ufffdM7\ufffd}\ufffd\ufffd\ufffd\ufffd\ufffdw~\ufffd:u\ufffdt\ufffdUWM\ufffd<Y\ufffdi
+
+
+d\ufffd\ufffdd\ufffdeGJAtt\ufffdZv\ufffdd\ufffd7\ufffd|Sv\ufffd\ufffd\ufffdH\ufffd25\ufffd\ufffd\ufffd\ufffdD\ufffd\ufffdV\u0645\ufffd\ufffd(%u\ufffd\u04a5\ufffd;wn\u0630\ufffd~\ufffd\ufffd\ufffd{\ufffdW\ufffdm\ufffd6..N\ufffd#\ufffd\ufffd\ufffdEEE\ufffdy8\ufffd\ufffd(;oRIRRR:t\ufffd\ufffd\u05ff\ufffdu\u0108\ufffd\ufffd}\ufffd\ufffd\ufffd\ufffd\sM\ufffd\u05ad\ufffd\ufffdW\ufffd4N\u0341 @\ufffd\ufffd\d#\ufffd\ufffd\ufffd?)g\ufffd\ufffd\ufffdc\u01ce\ufffdP%NB\ufffd\ufffdb\ufffdL\u0433gO	\ufffd\ufffd|\ufffdI||\ufffd\ufffdJ\ufffd\ufffd	\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdev\ufffd^\ufffd\ufffd\ufffd\ufffd\u020fZj\ufffdT);�
\ufffd\ufffd\ufffd+\ufffdz\ufffd)	XN\ufffd}\ufffd\ufffd\ufffd\ufffd\ufffd\u04fbw\ufffd%K\ufffd\u0228\ufffd\ufffd&//\ufffd\ufffdVC\ufffd\ufffd\ufffdR'%\ufffd\ufffd\ufffdPv\ufffd\ufffd JI\ufffd\ufffd\ufffdy\ufffd\ufffdo\ufffd\ufffd\ufffdK.\ufffd\ufffd\ubbdd\ufffd\ufffd\ufffd\ufffde\ufffd\ufffdY\ufffdfQQQIII2iG\ufffd\ufffdl?\ufffd\ufffd\ufffdn7\ufffd\ufffd1\ufffd)&\ufffd\ufffdf\u0318\u0462E\ufffd\ufffd\ufffd\ufffdz\ufffd\ufffd\ufffd\ufffd}\ufffd\ufffd\ufffd\ufffd~\ufffd\ufffd7O\ufffd2E\ufffd\ufffdC\ufffd\ufffd\ufffd\ufffd\ufffdgRs\ufffdR\ufffd}`	\ufffd\ufffd6%%%'O\ufffd\ufffd\ufffd'\ufffdS\ufffd\ufffd\ufffd\ufffd\ufffd|\u9957\ufffd\ufffdwjj\ufffd_\ufffd~\ufffd\ufffd\u077d{\ufffd\u014b\ufffd\ufffd\ufffdIG2qnnnqq1\ufffd\ufffd\ufffd\ufffdU\ufffd\u0389'\ufffd'/uC\ufffd\ufffdbcc\ufffd\ufffd\ufffds\ufffd\ufffd\ufffd\ufffd[\ufffd\u01feo\ufffd\ufffd\ufffd\ufffd/\ufffd\u0529SLL\ufffd\ufffd@\ufffdK\ufffdW\ufffd\ufffd\ufffd@p \ufffd\ufffdU(\ufffd\ufffd\ufffdkAA\ufffd\ufffd\ufffd\u01d5kn\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdd\ufffd\ufffd\ufffd\ufffd\ufffd\u0109\ufffd}\u04a9\ufffdp7i\ufffdDv\ufffd
 \ufffd\ufffd\ufffd\ufffd\ufffdeee2l\ufffd/@(\ufffd\ufffd\ufffd\ufffdoYb\ufffdT\ufffd-\ufffd\ufffd\ufffd\ufffdKo\u0738\ufffd-\ufffd\ufffd\ufffd\ufffd/\ufffd\ufffd\ufffd\ufffd;v\ufffd\ufffd\ufffd+G\ufffd\ufffdd\ufffdI\ufffd\u04a0\u051c\ufffd\ufffd\ufffd\ufffd\ufffdRj
bX\ufffdr\ufffdE\ufffd\ufffde_V\ufffd\ufffd\ufffdx\ufffd\ufffd~\ufffd\ufffd]t\ufffdE\ufffd;w~\ufffd\ufffd
>\ufffd\ufffds\ufffd\ufffdt$S\ufffdwQQ;\ufffd\ufffd\ufffdz\ufffdW\ufffdNnn\ufffd\ufffd$\u02d6-\ufffd\ufffd\ufffd\ufffd/\ufffd,eg\ufffd\ufffdA\ufffd}.\ufffd\ufffd\ufffd\u06f7o?o\u07bc\ufffd\ufffd\ufffdN>\ufffd\ufffd\ufffdUXX\u0209]2\ufffd>\ufffd\ufffd\ufffd\ufffdF\ufffd\u035e=;8\ufffdOZn\u056a\ufffdu\ufffd]7f\ufffd\ufffd\ufffd
\ufffd	\ufffdN\ufffd\ufffdnn\ufffd\ufffd\ufffd#\ufffd\ubf3c\ufffd#G\ufffd\ufffd/]~\ufffdK\ufffd,=z\ufffd\ufffdW_\u0772e\u02e4\ufffd\ufffd \ufffd>y\ufffdG\ufffd\ufffd5eG766v\ufffd\ufffd\ufffd\u04a0d\ufffd\ufffd'O\ufffd\ufffd\ufffdPs \ufffd\ufffd \ufffd\ufffd\ufffdEEE\ufffd\ufffd\ufffdE\ufffdu\ufffd\ufffdMj\ufffdTF\ufffdc\ufffdO?\ufffd\ufffd\ufffdp\u02de\ufffd\u04a5K\ufffd\ufffd,;;\ufffdn\ufffd\ufffdD[v\ufffd.\ufffdw\ufffd\ufffd\ufffd\ufffds\ufffd*\ufffd\ufffd}\ufffd\ufffd>\ufffd37\ufffd|\ufffdw\u07a9\ufffdc\ufffd\ufffd\ufffd\ufffd\ufffdc\ufffd\ufffd[ \ufffdA\ufffd\ufffd\ufffdK
\ufffd\ufffd\u030c\ufffd\ufffd7n\u0735\ufffd^\u06ecY3\ufffd\ufffd\ufffdO>\ufffd\ufffd3\ufffd\y\u5543\ufffd\ufffd\ufffd[\ufffdb;\ufffd\ufffdr{\ufffd\ufffd\ufffd\ufffd\u02ef^{{\ufffd\ufffdp\ufffd\ufffd\ufffd+V\u013eO?\ufffd\ufffda�\ufffd[k\ufffdcL\ufffd\ufffd~&\ufffd\ufffd\ufffd\ufffdn\ufffd[\ufffd\ufffdT[\ufffd'\ufffd\ufffd\ufffdy\ufffd\ufffd
+80\ufffd\ufffdo\ufffd\ufffd\ufffd\ufffd]vY\ufffd6md?99Y\ufffd\ufffde2v\ufffd"\ufffd\ufffd\ufffdEGG0\ufffdI\ufffd\ufffd\ufffd$\ufffdC\ufffd\ufffd\ufffd ;\ufffd\ufffd1\ufffd!db_\ufffd\ufffd\ufffdO|=\ufffd\ufffdbX8\ufffd\ufffd~\ufffd\ufffd\ufffd\ufffdWM\ufffdm\ufffd\ubcdb\ufffd\ufffd\ufffdW\u07bd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd{\ufffd\u016dZ\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd>\ufffd\ufffd\ufffd]\ufffd\ufffd\ufffd\ufffd.o\ufffd\ufffd\ufffdN]o\ufffd\ufffd\ufffd\ufffd}\ufffd\ufffd\ufffd\ufffd!\u04b5\ufffd\ufffd\ufffdd$v/
+\ufffdR(b~\ufffdR\ufffdj\ufffdm\ufffd/\ufffd=\ufffd\ufffd\ufffd1|z\ufffd;C\ufffd\ufffd5\ufffd\ufffd\ufffd_\ufffd\ufffd\u05a7\ufffd\ufffd\ufffda\ufffd\u07fd\ufffd\ufffd7om\ufffd\u02bf\ufffd}y\ufffd\ufffd\ufffd\ufffd\ufffd= \ufffdo\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdv\ufffdo\ufffd\u0435\ufffd\ufffdn{\ufffdo\ufffd7?\ufffd\ufffd\ufffd\ufffdz
n.c\ufffd\ufffd\u063f40@J\ufffdX\ufffd1.P9'8\ufffdL\ufffd{x\ufffdD\ufffd7'PGI\ufffd\ufffd\u3477\ufffd~k\ufffd/o\ufffd1\ufffd.}\ufffd{\ufffd\u01ff\ufffd~\ufffd\u049bn=\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u013e\ufffd\ufffd\ufffd+\ufffd\ufa86W_\ufffd\ufffd'_\ufffd\ufffd\ufffd7\ufffd\ufffd\u07bf\ufffd\ufffd\ufffd\ufffd\ufffd/\ufffd\ufffd~\ufffd\ufffd_\ufffd\ufffd\ufffd_{\ufffdgc\ufffdSm>\ufffd\ufffd\ufffd\ufffdD	C\ufffd\ufffdt_\ufffd\u03da\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u0469G\ufffd\ufffd\ufffd\ufffd\ufffdP\ufffd\ufffd.\ufffd\ufffd\ufffd6\ufffd%))\ufffd\u03b1O>\ufffd\ufffd\ufffd'.\ufffd\ufffdA\ufffdG\ufffd\ufffd\ufffdk\ufffd\ufffd\u062d\ufffdK\ufffd\ufffdx\ufffd\u3efa
\ufffd\ufffd\ufffdA\ufffdI\ufffd$\ufffd}\ufffdn\ufffd\ufffdB&\ufffd\u067e!A\ufffd\ufffdk\ufffdg\ufffd\ufffd\ufffd~]?\ufffd\ufffds\ufffdk\ufffd{\ufffd\ufffdV\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdV\ufffd^]\ufffd\ufffd\u05ebw\ufffd4hp\ufffd\ufffd\u036e\ufffd\ufffd\ufffd\ufffd\ufffd{\ufffd\ufffdF\ufffdF=?m\ufffd\ufffd\ufffd\ufffd>q{\ufffd\ufffd\ufffd\ufffdSml\u07d0\ufffd\ufffd*\ufffd\ufffd7\ufffd\ufffdE\ufffd7?\ufffd\ufffd\u057eM_\ufffdu[\ufffd\ufffd\ufffd\ufffdu\ufffd\ufffd\ufffd&\ufffd\ufffd\ufffdyC\ufffd\ufffdC\ufffd7o\ufffd\ufffdW\ufffd\ufffd\ufffd_\ufffd\ufffd7=\ufffdF\ufffd\ufffd{\ufffd\ufffd\ufffdwvp\ufffd _O\ufffd\ufffd9A"\ufffdb_\ufffdyV\ufffd]\ufffd\ufffd\ufffd\ufffdZ\ufffd\ufffd\ufffd'-j1fv\ufffda
 \ufffd~:\ufffd\ufffd;\ufffd~\ufffd\ufffdW\ufffd\ufffdU\u04e7O\ufffd?\ufffd\ufffd\ufffd\ufffd\ufffdpK\ufffdK\ufffdu\ufffd-\ufffd\ufffd50\ufffd\u07a1\ufffdZ\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdMO|d\ufffd2\ufffdH\ufffd\ufffd\ufffd\ufffd2\ufffd&&v�tBB\ufffd\ufffdK:~\ufffd\ufffd\ufffdo\ufffd\ufffdg\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdo[\ufffd3\ufffdE\ufffd\ufffd\ufffd\ufffdz\ufffd\ufffd?\ufffd\ufffd+\ufffd\ufffd}ot\ufffd\ufffd\ufffds\ufffd>wS\ufffdA-\ufffd\ufffdzp\ufffd\ufffdG\ufffd\ufffdh'-\ufffd\ufffd\ufffdE\ufffd\ufffd}~\ufffd
+\ufffd}\ufffdB\ufffdg%\ufffd\ufffd]\ufffd\ufffd\ufffd\ufffdR\ufffdL]\ufffdj\ufffd\ufffd\ufffd#\ufffd\ufffd\ufffd\ufffdw|\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd_\u03bf\ufffd\ufffdW_\ufffd'\ufffd
2\ufffd.\ufffd\ufffd\ufffd6w|4\ufffd\u03ff\ufffd\ufffdi-\ufffd\ufffd\ufffdzJ\ufffd\ufffdQ\u024f\ufffdN\ufffd.\ufffd|a/\ufffd\ufffdT\ufffd\u0604\ufffd\ufffd?\ufffd=;va\ufffd\ufffds\ufffd<\ufffd\ufffd\ufffd?\ufffd\u0788Vo}\ufffd\ufffd\u05bb\ufffd\ufffd\ufffd\ufffdFEE\ufffd\ufffd}\ufffd\ufffd\ufffd\ufffd\ufffd\u51ab\ufffd\ufffd\ufffd>M{k\ufffdo\ufffdC\ufffd\ufffd>\ufffd\ufffd\ufffd'\ufffd\ufffd\ufffd\ufffd\ufffd\u03ce\ufffd'\ufffd\ufffd>k!\ufffd\ufffd\ufffd\ufffda\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u0118\ufffdg\ufffd;\ufffd\u01e6\ufffd|{K\ufffd~\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd}KLL\ufffd\ufffd\ufffd'\ufffd\ufffdM\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdwu\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd_\ufffdLKxdf\ufffdJ_\ufffdH\ufffd\ufffdZ\ufffd\ufffda\ufffdE\ufffd\ufffd
\ufffd\ufffdn\ufffd\ufffdG\ufffd\ufffdz\ufffd\u05e0m\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdZ\ufffdu\ufffd\ufffdy\ufffd}C\ufffd\ufffd\ufffd_\ufffd\ufffd\ufffd\u05fc\ufffd\ufffd\ufffd\ufffd|\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdo\ufffd\ufffd\ufffdn\ufffd3\ufffd\u2795LI\ufffdo\ufffd}\ufffdB\ufffd\ufffd8\ufffd\ufffdpTr\ufffd)q\ufffd\ufffd\ufffd\ufffd\ufadf\ufffd\ufffd\ufffd\ufffd;>\ufffd\ufffd\ufffd~\ufffd.\ufffd\ufffd\ufffdc\ufffd4iR\ufffd/\ufffd\ufffd\ufffd\ufffd\ufffd8\ufffd\ufffd\ufffd\ufffd\ufffd7bj\ufffd\ufffd\u6d5e\ufffd\ufffd\ufffd\u024f\ufffdZ\ufffdA\ufffd\ufffd\ufffd\u0607\ufffd\ufffdt\ufffd\ufffd\ufffdC\ufffdc~}\ufffd\ufffd\ufffdO\ufffd\ufffdX\ufffd\ufffd\ufffd\u07aa\ufffdGw\ufffd\ufffd\ufffd\ufffd\ufffd-Z\ufffd\ufffd}k\u05ac\ufffd\ufffd\ufffd]\ufffd\ufffdo\ufffdN=n{wh\u02cf\u01f4\ufffdbr\ufffd
 \ufffd\u068f^\ufffdA\ufffd\ufffd\ufffdg-\u013e\ufffd\ufffd~\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd;\ufffd\ufffd!\ufffd0\ufffd\ufffdo|\ufffd\ufffd\ufffd\ufffd\ufffdfiiiJ\ufffd[\ufffdz\ufffdc\ufffdlp\ufffd\u07ee\ufffd\ufffd;\ufffd\ufffd\ufffdg\ufffd\ufffd\ufffd\ufffdD=0~A\ufffdi\ufffd\ufffdX\ufffdA\ufffd\ufffd\u0607uP9\ufffd;~I\ufffd\ufffd=\ufffdM\ufffdSC~\ufffd\ufffd\ufffd|0\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u05dc\ufffdy}\ufffd~\ufffd\u01be\ufffd'^pa\ufffd&\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd?<<d\ufffd\ufffd#\ufffd=56\ufffd\ufffd"Jb\ufffd\ufffd\ufffd"K\ufffda\ufffd\u0271-\ufffd\ufffdw\u07c8\ufffdw}6\ufffd\ufffd\ufffdF\ufffdO\ufffd\x\ufffd\ufffd\ufffd\ufffdg\u035au\ufffd\ufffd{\ufffdM\ufffdt\u05e7c\ufffd
\ufffd\ufffdb\ufffd'-zhz\ufffd\ufffd|\u073d\ufffd\ufffd\ufffd\u03aa\ufffd\ufffdF\ufffd\ufffd\ufffdY\ufffd\ufffd\ufffd1m\ufffd\u06b2S\ufffd\u06ee\ufffd\ufffd\ufffd\ufffdso\u04e4\ufffd\ufffdg\ufffd\ufffd\ufffdE7x\ufffdF\ufffd\ufffd\ufffdpT\ufffd\ufffd&=:\\ufffd{c1woD\ufffd\ufffd>k!\ufffd\ufffd\ufffd\ufffdW\ufffd\ufffds\ufffd\ufffd\ufffd\ufffd\ufffd&\ufffd\ufffd7;\ufffd\ufffd\ufffd\ufffdm\ufffd%<0~\ufffd\ufffd\ufffd\ufffd\ufffd<\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u06bb
.\ufffd\ufffd78\ufffd\ufffd\ufffdt\ufffd\ufffd\ufffd\ufffd\ufffd|9\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdo3u\ufffdr\ufffd\ufffd\ufffd\ufffd\ufffdb\ufffdd\ufffd\ufffdz5b\ufffdN\ufffdPb\ufffdG\ufffd\u07f8\ufffdg\ufffd\ufffdt\ufffdf\ufffdSC\ufffd?>\ufffd\ufffd\ufffd\ufffd\ua077\ufffdh~\ufffd\ufffd\ufffd8\ufffdsnl|\ufffd\ufffd\ufffd\ufffd\u0788V\ufffd\ufffdh\u0434\u01fe\ufffd\ufffd\ufffd\u0605~\ufffd _DJ\ufffdb_\ufffd\ufffdd\ufffd\ufffd\ufffd\ufffd&-\ufffdo\ufffd\ufffd\ufffd\ufffd,\u07d2_Pp\ufffd\ufffd\ufffdg\ufffd6>\ufffd\ufffd\ufffdJ\ufffd
 8\ufffd\u0670\ufffd-F\ufffdzpR\ufffd\ufffd|~?\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdj\ufffd2|F\ufffd\ufffd&=\ufffd\u1ded{k\ufffdkP\ufffdw\ufffd\ufffd\ufffd\ufffd-Q\ufffdF\ufffd\ufffd>\ufffd\ufffdY\ufffdo\ufffd\U0004cc8a�)\ufffd\ufffd>\ufffd\ufffd\ufffdg-\u013eP\ufffd\ufffd*\ufffd\ufffdu_eyUu\ufffd\ufffdM\ufffd\ufffdc\u07fc\ufffd\ufffdoX\ufffd\U0008a2bc�\ufffdcV\ufffd\ufffd\u0350\ufffd'\ufffd?*\ufffd\u0578\ufffd\ufffd\ufffd\ufffd=\ufffdR\ufffdG\ufffd(+(\ufffd|z\ufffd*\u06d7PbD\ufffd\ufffd]Nx\ufffd\ufffd\ufffd}2\ufffd\ufffdA\ufffdN?\ufffde\ufffd\ufffd\u0452\ufffd\ufffd;\ufffd`\ufffd\ufffd\ufffdlIxK\ufffdb_(\ufffd\ufffd\u04e6:\ufffdy%\ufffdU\ufffd\ufffd}\ufffd\ufffdS\ufffdNn=%\ufffd\ufffd	\ufffd\ufffd\ufffd\ufffd\ufffduks\ufffdOu\ufffd\ufffdX\ufffd#\ufffd/"\ufffd\ufffd>\ufffd3\ufffd{UV\ufffd\ufffd>\ufffdJy\ufffd\ufffd\ufffds\ufffd1\ufffd\ufffd>\ufffd\ufffd\ufffd\ufffd2ky\ufffd\ufffd\ufffd\ufffd\ufffdkmI\ufffdK\ufffdb_\ufffd\ufffd\u03c9\ufffdZ\u013ey>\ufffdYr\ufffd\ufffdQ)\ufffd\ufffdL\ufffd\ufffd>\ufffdE\ufffd\ufffd\ufffdbHI\ufffds\ufffd\u04d7uM\ufffd:\ufffd\ufffdo9\u01d4Mcjj\ufffd\ufffd7\ufffd9}\ufffdG\u0733\ufffd$\ufffd\ufffd\ufffd\ufffd\ufffd<\u0227\ufffd\ufffd\ufffd1\ufffdr\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd[\ufffd\ufffd>k!\ufffd\ufffd\ufffdj\ufffd39\ufffd\ufffd\ufffd}\ufffdKu9\ub72c;\ufffd\ufffd\ufffdiUU\u057cm\ufffd\ufffde\ufffd\gS4\ufffd\\ufffdF\ufffd\ufffd[jO4\ufffd/\ufffd\ufffdCWb\ufffdT\ufffdGeuy\u031a\ufffd\ufffdoe\ufffd\ufffd\u079f\ufffdv\ufffd\ufffdY\ufffd\ufffd\ufffd\ufffd\ufffd\ue7a3~\ufffdW\ufffd\ufffd\ufffd\u0702\ufffd\u02f6\ufffd\ufffd\ufffd*U\ufffd\ufffdSX\ufffd\ufffd=\ufffd)\ufffd\ufffd\ufffd\ufffdY\ufffd\ufffd)\ufffd\ufffd*M\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd
 Zs\ufffd	/\ufffd\\u01a7f>\ufffd\ufffd\ufffd\u053d\ufffd\u0329\ufffd\ufffd\ufffd;eQ(\ufffd\ufffd\ufffdA\ufffd\ufffd\ufffd\ufffd\ufffd\u0539V[\ufffd5e\ufffd\ufffd)\ufffd\ufffdZ\ufffd}\ufffd\ufffdr.\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdrJ\u0295\ufffdE\ufffd\ufffd\ufffd\ufffd\ufffd))\ufffd;V*\ufffdYM\ufffdT\ufffd\ufffd#'\ufffd\ufffdS\ufffd\ufffd\ufffd\ufffdcI\ufffdW%x\ufffd\ufffd\ufffd\ufffd\ufffdr:\ufffd\ufffd$\ufffdbt\ufffdE9v\ufffd\ufffd\ufffd\ufffd%]XTZS\ufffd\ufffdh\ufffd\ufffd\ufffd[\ufffdJ\ufffdR\u048f\ufffd\ufffd\ufffd\ufffdG\ufffd\ufffd#<~P\ufffd\ufffd\ufffd\ufffd
j\ufffd\ufffdL]\ufffd\ufffd\ufffdNl2x];\ufffd\ufffd\ufffd\ufffdc
+7y}J\ufffdb_\ufffd\ufffd=\ufffdgJ\ufffd\u04fd\ufffd\ufffd6m\ufffd\ufffd\ufffdt\ufffdi\ufffd\ufffd6ub\ufffd\ufffdS9*\ufffd=\ufffd' \ufffd\ufffd\ufffd\ufffd>[TR\ufffd\ufffdp\ufffd\ufffd-%\ufffd\ufffd2\ufffd6KM<;\ufffd\ufffd\ufffdi\ufffd]PZS?\ufffd;\ufffdg\u04ac6J\ufffd\ufffd\ufffd\ufffdA	^&K{hM\ufffde\ufffd\ufffd\ufffd\u02bb\ufffd/\ufffda+\ufffd[&^\ufffd}\ufffd\ufffd]\ufffd\ufffd\ufffdDb\ufffd\ufffd\ufffdBWm\ufffdsyz\ufffd\ufffd\ue52b\ufffd/z\ufffd}\ufffd[q\ufffd\u076b\ufffd\ufffd\ufffd\ufffd1\ufffda\ufffdJ\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd[=%!]jQ\ufffdW\ufffd5\ufffd@\ufffd\ufffdwA\ufffd\ufffd\ufffd4;\ufffd\ufffd2]*5;4j\ufffd\ufffd\u04b21\ufffdzLc&\ufffdN\ufffdJ}\ufffd\ufffdN\ufffdw\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdj\ufffd\ufffdS\ufffd\ufffd\ufffd[:\ufffd9\ufffd[\ufffd\ufffd\ufffd8\ufffdg~\ufffdz8\ufffd\ufffdD0\ufffd\ufffd\ufffd>[\ufffd\ufffdiD\ufffdYT\ufffdm
+j\ufffd1\ufffd0\ufffd\ufffd\ufffdN\ufffd&\u036a\ufffdU^W[\ufffdV\ufffduu.M>\ufffd}P7$U\ufffd!R{\\u0438(\ufffdw\ufffdL\ufffd9[=\ufffdj<<i\ufffd\ufffdK\ufffdb_x\ufffd;\ufffd\ufffd\u0627\ufffd`r\ufffd\ufffdt\ufffd\ufffd\ufffd>U\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd-\ufffd\ufffd\ufffd|8\ufffd]\ufffd\ufffd\ufffdTN\u06da\ufffd]\ufffd\ufffd\ufffd1\ufffdP\ufffd\ufffd\u0183v\ufffd?\ufffd\uc72a[\ufffd\u0669\ufffd2QTS\ufffd\ufffd0\ufffd\ufffd-\ufffdGb\ufffd\ufffd\ufffd\ufffdC\ufffd	\\ufffd\ufffd\ufffd
\ufffdE\ufffdY\ufffd}\ufffd\ufffdD\ufffd\ufffd\ufffdi\ufffd\ufffdxV\ufffd\ufffd\ufffd\ufffd|\wK\ufffd\u069a\ufffdR9?c\ufffd6\ufffdy\ufffdn\ufffd\ufffd\ufffd\ufffd}\ufffdW\ufffd\ufffdB\ufffdn\ufffd\ufffd\ufffd\ufffd\ufffdSc\ufffd$\ufffdY\ufffd/<\ufffd\ufffd\ufffd\u01be\ufffdg\ufffd \ufffd\u0575}:\ufffd\ufffd/\ufffd%\ufffd9\ufffdEk\ufffd\ufffdvs\ufffd\ufffd\ufffd4\ufffd@\u04d7u\ufffd+>\ufffdD\ufffd[\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd|\ufffdo\ufffd@\ufffd\ufffd+\ufffd[\ufffd\ufffd\ufffdu\ufffd\ufffdc\ufffd\ufffd*i\ufffd#\ufffdxq\ufffd2\ufe90\ufffd:\ufffdu\ufffd\ufffd\ufffdLts\ufffd\ufffdp\ufffd\ufffd\ufffd\ufffd\ufffd-\ufffd_b\ufffd\ufffd\ufffdBN%\ufffdi\ufffd\ufffd$?5~<\ufffd\ufffd\ufffdj\ufffd\ufffd*\ufffd\ufffd[\ufffd\ufffd\u018b**M\ufffd\ufffd\ufffd\ufffd*z;\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd$\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd]\ufffdk\ufffdc\ufffd|6\ufffd}]{\ufffdR}\ufffd[\ufffd\ufffd\ufffdA\ufffdU\ufffd\u019b-\u0537two\u0222H\ufffd\ufffd\ufffd:\ufffd\u01c3\ufffd>\ufffd\ufffdt\ufffd\ufffd\ufffdHb\ufffd\ufffd\ufffdBN\ufffd
\ufffd*\ufffdD\ufffd\ufffd\ufffd\ufffd\ufffdG\ufffdh\ufffd\ufffdL\ufffd8\ufffd{;BTb_\ufffd\ufffd\ufffd\ufffdP\ufffd\ufffd\u0459\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd.{Y\ufffd\ufffd
 \ufffd\ufffd<t\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u013e\ufffd\ufffdUt!\ufffd?DgJ\ufffdb"\ufffd\ufffd\ufffd!\ufffd\ufffd2\ufffd\ufffd\ufffd\ufffd\ufffd\u0607\ufffd>%\ufffd!bp$\ufffdY\ufffd}J\ufffdC\ufffd\ufffdH\ufffdb"\ufffd\ufffd\u0607\ufffd\ufffd\ufffd\ufffdg-\ufffd>D\ufffd)\ufffd\ufffd#\ufffd\ufffdZ\ufffd}\ufffd\ufffdSb"Gb\ufffd\ufffd\ufffd\u0467\ufffd>D\ufffd\ufffd>k!\ufffd!\ufffdO\ufffd}\ufffd\ufffd}\ufffdB\ufffdCD\ufffd\ufffd18\ufffd\ufffd\ufffd\u0607\ufffd>%\ufffd!bp$\ufffdY\ufffd}J\ufffd\ufffd:\ufffd\ufffd\ufffd_\ufffdB\ufffdJb\ufffd\ufffd\ufffd\u0467\u013e4;\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd3\ufffd)H\ufffd\ufffd\ufffd<f\ufffd@\ufffd\ufffdm\ufffd\ufffdg-\ufffd>D\ufffd)\ufffd/\ufffdTr\ufffd\ufffd\ufffdC,\ufffd1\ufffdM_\u05b5\ufffd4\ufffd(\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd[EuuAy\ufffd\ufffdV\ufffd>	\ufffd}\ufffdr\ufffdO\ufffd$\ufffdUT\ufffdZ\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdj\ufffd\ufffdeA\ufffd}\ufffd\ufffd(s1b\ufffdN?\ufffdw\ufffdA$\ufffd/\ufffd/rT\ufffd\ufffdNguu\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd=\ufffd \ufffd\ufffd) \ufffdY\ufffd\ufffd\ufffd\ufffdY\ufffd]\\ufffd\ufffd_\ufffd\ufffd\ufffd\ufffdY]Sc\ufffdY\ud408}\ufffd\ufffd\ufffd9\ufffd\ufffdo\ufffd\ufffdo\ufffdx\ufffds\u01a4\ufffd\ufffdL{\ufffd\ufffd\ufffde\ufffde\ufffdSS^1\ufffd\ufffd~j\ufffdZ\ufffdH\ufffd\ue7a3]\u01d4\ufffduW%*\ufffd?\ufffdbp$\ufffdY\ufffd\ufffd	#\ufffd\ufffd\ufffd\ufffd\ufffd=V'*%\ufffdm;Q\ufffde\ufffd=\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdK\ufffd}\ufffd\ufffd\ufffdQ\ufffd>\ufffd\ufffd|e\u07a2R\ufffdb_Q\ufffd	mzS\ufffdf8\ufffd\ufffdO\ufffd]\ufffd\ufffd\ufffd\ufffd/\ufffd%\ufffd
 Y\ufffd\ufffd	z\ufffd8\u028b\ufffdU\ufffd}R7\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdj\ufffd\u0393\ufffd.O,\ufffd\ufffd\ufffd\ufffd"\ufffd\ufffdQ\ufffd"Mmr2\ufffdZ\ufffd>\ufffd\u0677\ufffd\ufffd\ufffd\ufffd\ufffdf\ufffd\ufffdO\ufffd\ufffd\ufffd\ufffd1H\ufffdm\ufffd\u02ad!J\ufffd\ufffd\ufffd
]\ufffd}\ufffdB\ufffds\ufffd#\ufffdr\ufffd\ufffd\ufffdtgH\ufffdgQ\ufffd\ufffdX\ufffdw1\ufffdNiS&\ufffd~V\ufffd@{\ufffd\ufffdI[c\ufffdJz\ufffd\ufffd\u069a\ufffd>]\ufffd\ufffd>\ufffdH\ufffd@u\ufffdX\ufffd\ufffd'y\ufffd-+G\ufffd\ufffd~\ufffd\ufffd'\ufffd\u04d8\u0614\ufffd\ufffdO)\ufffd\ufffd\ufffd1<b_\ufffdJ\ufffdb\ufffd49\u06a7{Q\ufffdUB\ufffd6?M\ufffdr\ufffd\ufffd\ufffdM~\ufffdb\u07d6\ufffd\ufffd%w2\ufffd\ufffd<]S\ufffd\ufffdO\ufffd\u049dyr\ufffd\ufffd>\ufffd\ufffds\ufffd\u013e\ufffdU\ufffd05c\ufffd3\ufffd\ufffd^\ufffd\ufffd>\ufffd\ufffd\ufffdG\ufffdO\ufffdLu\u013e\u0415\ufffdg-\ufffd>'hrm\ufffd6c\u9387i'SS\ufffd\ufffd\ufffd\ufffdU\ufffd\ufffd\ufffd\ufffd\ufffdjD\ufffdST\ufffdT7?\ufffd\ufffdd\ufffdv%\ufffd\ufffd7c\ufffd\u069d:%\ufffd\ufffdQ\ufffd"\\ufffd\ufffd\ufffd\ufffd\ufffdl\ufffd}J5\ufffdb2\ufffd}\ufffdB\ufffds\ufffd\ufffd\ufffd\ufffd\ufffdW\ufffd%*E%0\ufffd\ufffd3r\ufffd\ufffd<Y\u050635ez\ufffd\ufffdXi\ufffdx\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd5~\ufffd\ufffd\ufffd\ufffd}\ufffd\ufffd\ufffdA\ufffd}\ufffd\ufffd\ufffd\ufffd\ufffd}\ufffd+\ufffd\ufffdZ\ufffd}N\u041f\ufffd\ufffd\ufffd\ufffd\u04e2\ufffdU\ufffds\ufffd\ufffd\ufffd>]\ufffd\ufffd\u04f5\ufffd\ufffd\ufffd\ufffd\ufffd~D\ufffd\ufffd\ufffd#c\ufffd\ufffdS\ufffd>GI\ufffdpuG\u05cc\ufffd\L\ufffd\ufffd\ufffd}\ufffd\ufffd\ufffd\ufffds\ufffd\ufffd{\ufffd\ufffd\ufffd\u013e\u0415\ufffdg-\ufffd>'\ufffd\ufffd8j\ufffd\ufffdx\ufffd\ufffd#\ufffd\ufffd\ufffd'\ufffd)\ufffdz
 \ufffdx\ufffd\ufffdx\ufffd\ufffd\ufffd2A{%\ufffdE\ufffdJV\ufffd>ZO\ufffdX\ufffd\ufffd\ufffd\ufffd+o\ufffd5\ufffd\ufffdW\ufffd\ufffd1\ufffd\ufffd\ufffd\ufffdx\ufffd\ufffd\ufffd\ufffddGow\ufffdN<\ufffdM\ufffd>\ufffd\u0394\ufffdg-\ufffd>'h\ufffd8\ufffd\ufffd?5`y\ufffd=B\ufffd\ufffd\ufffdy1\ufffd\ufffd[\ufffdT0vG\ufffd!\ufffd}\ufffd\ufffd\ufffd^\ufffd\ufffd\u0553\ufffd\ufffd\ufffd>\ufffd\ufffd\ufffd\ufffd\ufffd=\ufffd\ufffd/&\ufffdF\ufffds\ufffdBEb\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdM\ufffd\ufffdld~\ufffd\ufffd\ufffd\ufffdh\ufffd\ufffd\ufffd\ufffd\ue376\ufffd\ufffd$\ufffd\ufffd\ufffd\u013e\ufffd\u0498\ufffd<3\ufffd\ufffd\ufffd%\ufffdI\ufffd2\ufffd>yK\ufffdt	\ufffd\ufffd_\ufffd\ufffd\ufffd\ufffdglu\ufffdP7N\ufffd]\ufffd\ufffd\ufffd\ufffd\ufffd>k!\ufffd9A?\u05ec>\ufffdE\ufffd\ufffd\ufffd\u0254W\ufffd7\ufffd\ufffd\ufffdX\ufffd\ufffdF*\ufffdPm\ufffd\ufffdr\ufffd\ufffd:\ufffd\ufffd>\ufffdL\ufffd}\ufffdB\ufffds\ufffd\ufffd"\ufffd.-\ufffd\ufffd~\ufffd�=\ufffd\ufffd\ufffd\ufffdg\ufffd\ufffdt\ufffd\ufffdr\ufffd\ufffd:=\ufffd \ufffd+\ufffd\ufffdZ\ufffd}N\ufffd[\ufffdQ\ufffd\ufffd\ufffd.\u0619\ufffd\ufffd]\ufffd\ufffdV\ufffd>ogxuT& \ufffd\ufffd\ufffdN\ufffd}\u010e\ufffd\u27d9\ufffd\ufffd\ufffd\ufffd\ufffdo\ufffd\ufffdO#\ufffd\ufffd\ufffd\u0607\ufffd>uN\ufffd\ufffd#\ufffd\ufffd=;1\ufffd\ufffd\ufffd\ufffd_\ufffd\ufffd\ufffdq\u0712g\ufffd\ufffdw$\ufffd\ufffd\ufffdj\ufffd3>\ufffd#Vb\ufffd\ufffd\ufffd\u0467\ufffd}J\ufffd\ufffd!\ufffd\ufffd\ufffd	g\ufffd~kW\ufffd\ufffd%;?\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u03d0\ufffd\ufffdCb\ufffd\ufffd\ufffd\u0467\ufffd\ufffd}\ufffd3\u07f8\ufffdg%\ufffd\ufffd\ufffdz\ufffd\ufffd\ufffdy\ufffd?\ufffd\ufffd\ufffd\ufffd\ufffdAb\ufffd\ufffd\ufffd\u0467N\ufffd}J\ufffd\ufffd\ufffd
 \ufffd\ufffd|\ufffd\ufffd\ufffdh\ufffd=\ufffd\ufffd\u91fe\ufffd\ufffd\ufffd\ufffd\ufffdc~KH~\ufffd\ufffd-\ufffd\ufffdZ\ufffd}\ufffd\ufffdS\ufffdc\ufffd\ufffd\ufffd\ufffd[\ufffd\ufffd\ufffde/\ufffd(\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdUWg?)\ufffd\ufffd\ufffdEO\ufffd\ufffdCZb\ufffd\ufffd\ufffd\u0467\ufffd\ufffd>\ufffd\ufffd\ufffdw\ufffd\ufffd\ufffd\ufffd\ufffdE?\ufffd^\ufffdW\ufffd\ufffd\ufffd\ufffd	\ufffd\ufffd;}\ufffd\ufffd\ufffdLL\ufffdCQ\ufffd}\ufffdB\ufffdCD\ufffd\ufffd\ufffd$\ufffdI\ufffd\ufffd\ufffd\ufffd\ufffdm)\ufffd\ufffd$\ufffd3.\u0539!o\ufffdL\ufffd\ufffd\ufffd\ufffd\ufffd\u026f\ufffd\ufffd0D\ufffd\ufffd\ufffd>kQ\ufffd9"\ufffdO\ufffdSm\ufffdj^\ufffd\ufffd\ufffdkp\ufffd>#[NL\ufffd(\ufffdN\ufffd\ufffdbT\ufffd\ufffd\ufffd\ufffdQ\ufffd\ufffd\ufffd\ufffdd\ufffd\ufffd\ufffd\ufffdw\ufffd\u05beGDt\ufffd\ufffd9A"db\u07fd\ufffd\ufffd\ufffd}C\ufffd\ufffd\ufffdb}\ufffdM\ufffd\ufffd[\u05ee\ufffdK\ufffd\u04bc\ufffd\ufffd-'$<\ufffd.w\ufffd\ufffd<\ufffdX\ufffd\u05a2\ufffd?\ufffd\ufffd\ufffd\u0664GH~\ufffd\ufffdk\ufffdbN\ufffd\ufffd\ufffd75m\ufffd\ufffdD	\ufffd,L\ufffdO\ufffdIZU\ufffd\ufffd\ufffd\ufffd|\ufffd\ufffd|B\ufffd5\ufffd\ufffd\ufffd\ue331\ufffd\ufffd\ufffd0N\ufffd]\ufffd\ufffd\ufffdWMk\ufffdSI~\ufffd?\u0110rn\ufffd\u05c1\ufffd9\ufffd!db\ufffd\u04e8\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd:q`z\ufffd\ufffd}\ufffd1\u061d\ufffd\ufffd\ufffd\ufffd\ufffdY\ufffdv\u04861\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdv\ufffd\ufffd3\ufffd>\ufffd\ufffd \ufffd\ufffd\ufffd\ufffd*\ufffd0wf\ufffd\ufffd\ufffdF\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdv}\ufffd\ufffd\ufffd]C\ufffd6>oM\ufffd\ufffd{\ufffd\ufffdzBB\u01c3\u01f7H\ufffd\ufffd9\ufffd\ufffd\ufffd\ufffd(\ufffd\ufffd\ufffd\ufffd`Vz\u03e4]C\ufffd\ufffd\ufffd@u\ufffd\ufffdD\u0568\ufffdoMY\ufffd/*z\ufffd
 	K\ufffdY\ufffdf\u03de='O\ufffd\ufffdX
+\ufffd\ufffd\ufffdH8+++\ufffdY\ufffd\ufffd\ufffd\u010e\ufffd#vo\ufffdOxv\\ufffd\u04e2\ufffd\ufffd\ufffda\ufffd\u03bd\ufffd\ufffd[\ufffd`A\\\JJJFF\u0186
\ufffd\ufffd\ufffd'\ufffdO\ufffd$\ufffd\ufffdu\ufffdj\ufffdrI_aaa\u01a69ik\ufffd\ufffd-\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u7396\ufffd\ufffdv\ufffdS\ufffdCn7\ufffd\ufffd1-\ufffd\u01f2e\ufffd\u05ad[\ufffde\u02d6]\ufffdv<x0''\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd`)!\ufffdVn\ufffd\ufffd\ufffd\ufffd\ufffdzq8"\ufffd\ufffdR(\ufffdm\ufffd\ufffdI2\ufffd\ufffd\ufffd\ufffd\ufffd\u03d7\ufffd\ufffdi\u04e6\ufffd\ufffd\ufffd\ufffd\ufffd\u0504\ufffd\ufffdK>K\ufffd5\ufffd\u0419x\ufffdv\ufffd\u0474}\ufffd\ufffdN\ufffd|�
\ufffd\ufffd\ufffd>u\ufffdTAAAII\ufffd\ufffdY]]M\ufffd\ufffd\ufffd\ufffd\u05f6\ufffdw\ufffdoN1$l\ufffd\ufffdHK\u02d1z\ufffd/++k\u07fe};w\ufffd\u0732e\ufffd\u06b5k\ufffd&\ufffd\ufffd%o\ufffd;\u06e5\ufffd>\ufffdeb\ufffd\ufffdA\ufffdR'\ufffd\u0673G_ii\ufffd\ufffd=i\ufffd\ufffdA db\ufffd\ufffdD!--G\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd$\ufffd\ufffd\ufffd\ufffd=zt�USS;+\ufffd\ufffd`\ufffd\ufffd\ufffd\ufffd=\ufffdW\ufffd>|\ufffd\ufffd\ufffdX\u06a9qc\ufffdB/\ufffd\ufffd\ufffd,\u0463\ufffd\ufffd}.w\U000abbae\ufffd\ufffd\ufffd\ufffd\ufffdWRRr\ufffd\u0109\ufffdu?\ufffdn\ufffd;\ufffd\ufffd:\ufffd\ufffd\ufffdOJx~\ufffd\u018dYYY\ufffd\ufffdA\ufffd\u0607\ufffd\ufffdc\ufffdb\ufffd\u02dd\ufffd\ufffd\ufffd'\ufffdOb\ufffd/\ufffd\ufffd\ufffd\ufffdIx\ufffd=\ufffdyh\ufffd\ufffd\ufffdo\ufffd.\ufffd\ufffd\ufffd\ufffd8b"\ufffd\ufffd\ufffd\ufffd}
+\ufffdJKK\ufffd\ufffd99\ufffd\ufffd\ufffd\ufffd\ufffdl\ufffdB\ufffd\ufffdYf\ufffd\ufffd7|\ufffdt�={\ufffd\ufffd\ufffdo\ufffd\ufffd\ufffd\ufffd \ufffd>\ufffd\u078e\ufffd\ufffd\ufffd\ufffd
V\ufffd\ufffd'W\ufffdNJ|~yf\u04a1C\ufffd\ufffd\ufffd\ufffd3Nb"\ufffd\ufffd\ufffd\ufffd}\ufffd\ufffd\u51cf\ud75c\ufffd\ufffd\u0792$m\ufffd\u04d8\ufffdx\ufffd:sS\ufffd\ufffdiI]7l\ufffd\ufffd\ufffd}`\ufffd>D\ufffd|m\ufffd\ufffd\ufffdVT\ufffd\ufffdnt\u2da1J\ufffd\ufffd\ufffd*\u0164m\ufffd\ufffd&\u067e}\ufffd\u0253'\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd \u01fe\ufffd\ufffd\ufffd#\ufffd\ufffdMN~q_I\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u0295\ufffd\ufffd]\ufffd<q\u07fe}\u02a3[\ufffd0Nb"\ufffd\ufffd\ufffd|\ufffd\ufffdr\ufffd/q\ufffd\ufffdmC\ufffd`\ufffd\ufffd5\ufffd+\ufffd\ufffd\ufffds\ufffd\ufffd\ufffd\u05ef?z\ufffdhII	gx \ufffd\ufffd1|Z\ufffdS\ufffd\u06f2\ufffd\u0216\ufffd\ufffd/\ufffd/Y\ufffdf\ufffd\ufffd\ufffd\\ufffd\ufffd5kgg\ufffd\ufffd\ufffd<\ufffdE>\u02e1>>\ufffd>D\ufffd\ufffdW:*++\ufffd\ufffdO\ufffd\ufffd\ufffd\ufffd\ufffdCS\ufffd`\ufffdq\ufffdj\ufffd\ufffd-\ufffd\ufffd%v]\ufffdj\u0541
+yt\ufffd\ufffd\ufffd\ufffd\ufffd\u013e\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdE\ufffd'o\ufffd\ufffd3\ufffd\ufffd\ufffdE\ufffdD'|\ufffdy\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdR\ufffd\ufffd\ufffd-\ufffd1|B\ufffd\ufffdVVV\ufffd\ufffdm\ufffd\ufffdU\ufffd\ufffdZsv\ufffd[\ufffd\ufffd-\ufffd\ufffd%u]\ufffd\ufffd\ufffdw\ufffd^\ufffd\ufffd6B\ufffdC\ufffd\ufffd\ufffd\ufffd\ufffd'\ufffd\ufffd\ufffd\ufffdb\ufffd\ufffd\u07e6\ufffd\ufffd\ufffd\ufffd8\u0558\ufffdrj~7:'\ufffd\u7084	7n<~\ufffd8\ufffd\ufffd\ufffdF\ufffd}\ufffd\ufffd8"-;\ufffdT\u05a2\ufffd\ufffd7\ufffd>\ufffdTKc\ufffdrI\ufffd\ufffd\ufffd\ufffd\ufffdR_\u075a\ufffd\ufffd\u01c4\ufffdv\ufffd\ufffd
\ufffdgOM\uc591\ufffd\ufffdg\u03de\ufffd\ufffd<\ufffd6B\ufffdC\ufffd\ufffd\ufffd\u830a\ufffd\ua092\ufffd\ufffdCR}N\ufffdU\ufffd\ufffd\ua69a\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd91\ufffd/\ufffd\ufffd\u05ed\ufffd}J\ufffd\ufffdw\ufffd\ufffd\ufffd\ufffd/\ufffd\ufffd7A\ufffd\ufffd4nT\u036d\u0658]\ufffd\ufffdL\ufffd8q\u05a6M\ufffd\ufffd?\ufffd<\ufffd\ufffd\ufffdvA\ufffdC\ufffdh]\ufffdU\ufffd\ufffd|\ufffd\ufffd\ufffd\u0127	\ufffd\ufffd\ufffd\ufffd|V\ufffd\ufffd|\ufffd&\ufffdY\ufffd\ufffds\ufffd\ufffd\ufffd%MN~\ufffd3\ufffd\ufffdN\ufffd&\ufffdi\ufffd\ufffd\ufffd\ufffdAff\ufffd}\ufffd\ufffd\ufffd\ufffd9\ufffd\ufffdB\ufffdC\ufffdh]8K\ufffd|\V\ufffd\ufffdl\ufffdG\ufffd\ufffd\ufffd\ufffd$\ufffd\ufffdq#\ufffdd~\ufffdx\ufffd\ufffd1\ufffd\ufffd\ufffd8\ufffd'I\ufffdJ\ufffdx\uc4d4\ufffd<\ufffdo\u5d99\ufffd\ufffdv\ufffd\ufffd\ufffd\ufffd6\ufffd\ufffd\ufffd\ufffd-\ufffdsOJ|)!y\u0456-[\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdE\ufffdO9�\ufffdXa\ufffdAKm\ufffdG\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd?P\ufffd,\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd^\ufffd=a\ufffd\ufffd.\ufffd\ufffd
 \ufffd0\ufffd)\ufffd\ufffd\ufffd\ufffd0~\ufffd73\ufffdw;P\ufffd\\ufffdL<^\ufffd\u06d4\ufffd\u05e2\ufffd~X\ufffdv\ufffd\ufffd\ufffd
+
+\ufffd\ufffdl\ufffd\u0607N\ufffdc\ufffdZ\ufffdG]\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdE?\ufffd\ufffd\ufffd=}n7\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd^\ufffd\ufffd;\ufffd\ufffdC\ufffd+f\ufffd\ufffd`\ufffd\u075e\ufffd|~\ufffd\ufffd\ufffd\ufffd\u07f0z\ufffd \ufffd\ufffd\ufffd\ufffd,\ufffd\ufffd\ufffdj\ufffd\ufffd!\ufffd+\ufffd\ufffd\ufffdV\ufffd6|1=\ufffd\ufffd\ufffd\ufffd\ufffd;w\ufffd8q\ufffd\ufffd\ufffd\ufffdC}`;\ufffd>t\ufffd\ufffd$\ufffd\ufffdq
+\ufffd\ufffdZM\ufffd\ufffd\ufffd\ufffd\u04fb\ufffd\ufffd\ufffd\u0558\ufffd\ufffdu\u03eaZ\ufffd\ufffdyb\u066e\ufffd\ufffd\ufffd?\ufffd\ufffdn\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd:\ufffd9\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdH\ufffd\ufffd\ube8f\ufffd\ufffdxv'k\ufffdys\u057e\u0253^IJN\u0638q\ufffdc\u01ca\ufffd\ufffd\ufffd\ufffd\ufffd8\ufffd\ufffdC\ufffdC\ufffd\ufffdKr\ufffd\ufffdY\ud07a\ufffd\ufffd\u01fd\ufffd>\ufffd1t\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd_\ufffdr\ufffd\u0766�\ufffdi\ufffd\ufffdNHxq\ufffd\ufffd.\ufffd$\ufffd)\ufffd\u03df\ufffd\ufffdL\ufffd\ufffd=GW\ufffd_\ufffd\U0005c31e\ufffdscM\ufffd\ufffd\ufffd\ufffdF\ufffdf\ufffdL\ufffd~a\ufffd\u0335k\ufffd8p\ufffd;9\ufffd9\ufffd\ufffd)\ufffdLru\ufffdC^\ufffd|\ufffd\ufffd;`\ufffd\ufffdK65\ufffd<q\ufffdev9U\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffde]\ufffd\ud69f\ufffd\ufffd_\ufffd\UUU\ufffd\ufffd\ufffd\ufffdQ^<}_i\ufffd\u0583K\ufffd\ufffd6|r\ufffdK\ufffd~?:\ufffd$\u061dq\ufffd\ufffd3,\\ufffdc\ufffdK\u044b'edd\ufffd\u06b5\ufffd\u04fb\ufffd(\ufffd}\ufffdM\ufffd\ufffdfn\u03e9\ufffd\ufffd\ufffd*w\ufffd>?x\u04a4\ufffd\ufffd\ufffd\ufffd\ufffdn{\ufffd\ufffd\ufffdG\ufffd\ufffd\ufffd5-\ufffd\ufffd\ufffd
\u07ec\ufffd\ufffd\ufffdc\u0181\ufffd\u07f5\ufffd+\ufffd\ufffd\ufffd\U00083249\ufffd6|\ufffd\ufffd\ufffd\u0323\ufffdk\u0343\ufffd\u06dd=\\ufffdfJ\ufffdk\ufffd}\ufffd\ufffd\ufffd\ufffdm\u06f6\ufffd\ufffd\ufffd\ufffd\ufffdN\ufffd\ufffds \ufffd\ufffdS\ufffd\ufffdy\u0767w\ufffd
X8f\ufffd\ufffd\u03ae\ufffdevbV\ufffd\ufffd\ufffdq\u9eff]\ufffd\ufffd\ufffd\ufffd7U^\u071e\ufffd\ufffd\ufffd`w\ufffdf\ufffdj\ufffdY\ufffd>R\ufffdfj\ufffdk3~\ufffd\ufffd\ufffd\ufffdy\ufffd\ufffdG\ufffdq\ufffd.8
+b:E\ufffd\ufffd(o\ufffd4a\ufffdVcH\ubf93#\ufffdq_\ufffd[\ufffda\ufffd\ufffd\ufffd\ufffd\ufffd;\ufffd`\ufffd\ufffd=W*\ufffd/%%e�
G\ufffd)((\ufffd>p\ufffd>t\ufffd\ufffd\ufffd\ufffd\ufffd]\ufffdW\ufffd\ufffd1\ufffdu\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd		/*\u03b41\ufffd)\ufffd{\ufffd@\ufffd\ufffd\ufffd^\ufffd3J2\ufffd\ufffd\ufffd~\ufffd\ufffd!\ufffd6.\ufffd\ufffdA\ufffdC\ufffd\ufffdKr\ufffdE\ufffd\ufffdjn3\ufffd\ufffd\ufffd\ufffd\ufffd*\ufffd\ufffd^\ufffd\ufffd\ufffd\ufffd{\ufffdS\ufffd
+v\ufffdu\ufffd5Z\ufffd\u06bb\ufffd\ufffdI\ufffd/\ufffd^\ufffd\ufffd\u04a5K%\ufffd<xP2_yy9\ufffd\ufffd\ufffd\ufffd\ufffd`\ufffd[
\ufffd\ufffd5j51\ufffd\ufffd\ufffd\ufffd\ufffd-n\ufffd\u07ac\ufffd\ufffd\ufffd%/d\ufffd\ufffd`w\ufffd}:OTn]\ufffda\ufffd\ufffd\ufffd7\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdq\ufffdF\ufffd8\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdW\u045b\ufffd5\ufffdFi\ufffd\ufffdW\ufffd\ufffd1Tu\ufffd\ufffd\u0476\u07e26\ufffdg\ufffd\ufffd\ufffd\ufffd\ufffdo~\ufffd\u057cW\ufffd\ufffd\ufffdX\ufffd\ufffd\ufffd|\ufffd\ufffdN\ufffd~\ufffd{O-\ufffdii\ufffdi\ufffd?\\ufffd --m\u04e6M\ufffdV3\ufffd\ufffd\ufffd3!\ufffd!\ufffdsU\ufffd\ufffd\ufffdD\ufffd\ufffd1\ufffd\ufffdk\ufffd\ufffd\ufffd\ufffd\ufffd^\ufffdt\ufffd\ufffd\ufffd]OV\ufffd4\u061d\ufffdj\ufffd\u06d3\ufffd\ufffd7\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdc\ufffd\ufffd\ufffd222\ufffdm\ufffdv\ufffd\ufffd\u0442\ufffd\ufffd\ufffd\ufffd\ufffd!\ufffd!\ufffd\ufffdu\ufffd\ufffd\u0476\u07e2\ufffd\u079f#\ufffd\ufffd.c\ufffd~q\ufffd\ufffd\ufffd\ufffd?\ufffd\ufffd\ufffd\ufffd\u071egE\ufffd;\ufffdA\ufffd\ufffd\ufffd5)\ufffd\ufffdi1\ufffd\ufffduNRR\u049a5kv\ufffd\u0695\ufffd\ufffdUTT\ufffd=\ufffd|\ufffd}\ufffd\ufffdh\ufffd8\ufffd\ufffd\ufffd \ufffd\ufffd^\ufffd[\ufffd9\ufffd\ufffdWF\ufffd\ufffd\ufffd\ufffdG{\ufffd1\ufffd\u055f\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd;\ufffd\ufffdt\ufffdU\ufffd\ufffd75\ufffd\ufffdq\ufffdg\ufffd2.666==}�
\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd-))Q\ufffd\ufffd\ufffde\ufffd\ufffd>Dt\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u06bc7\ufffdU\ufffd)\ufffd\ufffd\ufffd\ue797G4}\ufffd\ufffd'z\ufffd7(\ufffd\u02e4\ufffd\ufffd\ufffd\ufffd~\ufffdr{\ufffd\ufffd\ufffd\ufffd�Ens\u02b6\ufffd\ufffd59\ufffd\u5a71\ufffdDE\ufffd]\ufffdparr\ufffd5kv\ufffd\ufffdq\ufffd\ufffd\ufffd\ufffd
 \ufffd\ufffd\ufffd2\ufffd\ufffd
+\ufffd>D\ufffdw\ufffd*\ufffd\ufffd\ufffd\ufffdK\ufffdwg\ufffd\ufffd>\ufffd.c\ufffd\ufffd\uf2c7\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd?='\ufffd\ufffd\ufffd\ufffd\ufffd'+w\ufffd\ufffd<yD\ufffd\ufffdo\ufffd,X\ufffd\ufffd\u0117\ufffd.\ufffd;\ub5c9\ufffdW\ufffd\\ufffdy\ufffd\ufffd\ufffd\ufffd\ufffd'v\ufffd|*\ufffd1D\ufffd\ufffd\ufffd>\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd<\ufffdAt\ufffdw\ufffdZv;\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd_\ufffda\ufffd3\ufffd\ufffdV\uc7b4-+V\ufffd\ufffd`gT\ufffd\ufffd|,&m\ufffdw?/\ufffd.io\u02a2\ufffdQ\ufffdc\ufffd\ufffd\ufffd-Z\ufffd\ufffd\ufffd$\ufffdo\ufffd\u018d{\ufffd\ufffd\ufffd\ufffd\ufffd*((\ufffd \ufffd"\ufffd>D)\u03c4\ufffd\ufffd\ufffd|?Z\ufffdp\ufffdy\ufffdZu\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdr]\ufffd\ufffd7>\ufffd$\ufffd)L\ufffd{\ufffd\u01c4W~LzIR\ufffdb\ufffd\ufffd3vOr\ufffd\ufffd\ufffd1\ufffd>\ufffd\ufffd$\ufffd6.\ufffd\ufffd\u0249]\ufffd.\ufffd3-z\ufffd\ufffdy\ufffd~\ufffd\u55d8\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd5k\ufffdl\u0672e\u07fe}\u01cf\ufffd\ufffd\ufffd/--U\ufffd\ufffd#\ufffd@\ufffdA\ufffdC\ufffd\ufffd\ufffd\ufffd$^�r\ufffdM\ufffd\ufffd=\ufffd\ufffd\ufffd\u07bd\ufffd\ufffd7\ufffdyS\u06e2E\ufffd,X=w\ufffd\ufffd\ufffd?H\ufffd>w\ufffd\ufffd\ufffdJT\ufffd9\ufffd[y}\ufffd\u071f\ufffd\u035b'Q\ufffd\ufffd_\ufffd\ufffd\ufffdMJJJOO_\ufffdz\ufffd\u018dw\ufffd\ufffdu\ufffd\u0421\ufffd\ufffdl%\ufffdqVBb"\ufffd\ufffd\ufffd\u04fe\ufffd=\ufffd\ufffd\u06de\ufffd\ufffd\ufffd\ufffdnm\ufffd\ufffd\ufffdM\ufffd\u05ae]\ufffdr\ufffd\u02b4\ufffd\ufffd\ufffdK\ufffd&''K\\ufffddI\\\\ufffd\ufffd\ufffd\ufffd\ufffd\U00049249)))\ufffd\ufffd\ufffd\ufffd233\u05ef_\ufffdu\ufffd\ufffd\u077bwK\ufffd\ufffd\ufffd
 :u\ufffdTQQQYYG\ufffd  \ufffd!b\ufffd\ufffdG\ufffd;}\ufffd\u01dd\ufffd
\ufffd\ufffd\u04d7\ufffd?\ufffdYvv\ufffd\ufffd#G8\ufffdg\u03de\ufffd;wn\u06f6m\ufffd\ufffd\ufffd6lX\ufffd\ufffd\ufffd\ufffd\u07f8q\ufffd\ufffd.\ufffd\ufffd4{\ufffd\ufffd=x\ufffd\ufffdc\ufffdrss\ufffd\ufffd\ufffdWQQQUUE\ufffd\ufffd\ufffd\u0607\ufffda\ufffd\ufffd$\ufffd\ufffd5}ah\ufffd\ufffdHb+))\ufffd\ufffd&\ufffd\u0529S'N\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd:~\ufffd\ufffd\ufffd3\u023f\ufffdy\ufffd\ufffd\u0253yyy2}iiiyyyee\ufffd\ufffd\ufffd|6\ufffd1|tW\ufffdab\ufffd\ufffdn\ufffd***$\u0255\ufffd)=yE\u0792	\ufffd\ufffdG\ufffd\ufffd\ufffd\u0607\ufffd\ufffdZ(\ufffd\ufffdQ\ufffd\ufffd\ufffd\ufffd	l,qA\ufffd\u0607\ufffd\ufffd\ufffdi\ufffdy\ufffd\ufffd\ufffdNYg\ufffd`\ufffd\ufffd\ufffd3*\ufffd\ufffdJ*:I\ufffd}0>\ufffd\ufffd@\ufffd\ufffd\ufffdj\ufffd\ufffdU\ufffd\ufffd\ufffd?cY\ufffd\ufffd\ufffdO\ufffd\ufffd\u06f7.\ufffdX\ufffd\ufffd�}\ufffd\ufffd>\ufffd}\ufffda\ufffd\ufffd>\ufffd\ufffd\ufffd7\u06fb`ml\ufffdi=:Vb\ufffd	\u013e\ufffd\u043a\ufffd3c\ufffdv<Jw.k\ufffd\ufffd\ufffd\ufffdLb\ufffd	\u013e\ufffd0\ufffdc\ufffd\ufffd\ufffd=\ufffd\ufffdLb\ufffd	\u013e\ufffd\ufffd\ufffdv=j\ufffdu\ufffd\ufffd=V\ufffda\ufffd\ufffd@M\ufffdS\ufffd\ufffd\u05feYa\ufffd}\ufffd19\ufffd\ufffd\ufffd\ufffd(\ufffd\ufffd3\ufffd\ufffd\u023fw\ufffdW'S^1\ufffdSoASi\ufffd[S\ufffd\ufffd\ufffd\u061d\u04a6L\ufffd\ufffd\ufffd:\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdY\ufffd\ufffd\ufffd\ufffdL \ufffd\ufffd\ufffd\ufffd\ufffd6\ufffd)\ufffd\ufffd\ufffd\ufffd\ufffd\u0526
-\ufffdfl_\ufffdK\ufffd3	f\ufffd\ufffd|\ufffd{>c\ufffd\ufffd\ufffd67\ufffd\ufffdm\u029fQy\ufffdh[\ufffd\ufffd>\ufffdq2\ufffd\ufffd-]S\ufffd_
 \u06ec\ufffdB\ufffdL\ufffd}&\ufffdBC\ufffdv\ufffdx\ufffdK2\ufffd\ufffd$W\ufffd\ufffdu\ufffd\ufffd\ufffd\ufffd\ufffd)\ufffdW\ufffd\ufffdO{\u02c52\ufffd1\ufffd(\u07e6:\ufffd\ufffd\ufffd\ufffdWL\ufffd\ufffd3\ufffd!\ufffd\ufffd\ufffd\ufffd\ufffd\u03e8\ufffdE4\ufffdjG\ufffdN\ufffd4\ufffd\ufffds\u06ec\ufffdB\ufffdX\ufffd}&\ufffdBC\ufffdI.P\ufffdT\ufffd\ufffd\ufffdN\ufffd\ufffdsm\ufffdq%\ufffdh\ufffdQi\ufffdP#\ufffd\ufffd;yu\ufffd\ufffdv\ufffd\ufffdv\ufffd\ufffd\u06f9W\ufffd\ufffd\ufffd\ufffd<Y\ufffd^M\ufffd\ufffd\ufffd\ufffd\ufffdf\ufffd\ufffd\ufffd\ufffd\ufffdb_hhr\ufffd\u0598r\ufffd9\ufffdV\ufffd\ufffd.\ufffdx\ufffd}\u01b3\ufffd\ufffd\ufffd>\ufffd\ufffdc\ufffdn\ufffd\ufffd+\ufffd\ufffd\ufffd0\ufffd\ufffd\ufffd\ufffd\ufffdQY\ufffd\ufffd\ufffd\ufffdq\ufffd\ufffd\ufffdZ-4b_;b\ufffd)\u013e\ufffd\u0416[:\ufffd\ufffd;oG\ufffd\ufffdZ\ufffdc\ufffd\ufffdP\ufffd\ufffd\ufffdQ1\ufffd\ufffdS\ufffd3*b_\ufffdI\ufffd0\ufffd\ufffd\ufffdl\ufffd\ufffd\ufffdc\ufffd\ufffd\ufffdZM\ufffd\ufffd<\ufffd1\ufffd)a\u0158\ufffd\ufffd\ufffd\ufffdcV\ufffd\ufffd\ufffdd\ufffd\ufffd/\ufffd$\ufffd\ufffd@\ufffd
\u0377\ufffd4\ufffd\ufffd\ufffdb~m\ufffd\ufffdV\ufffdk\ufffd\ufffdo11^\ufffd-r\ufffd\ufffd\ufffd!\ufffd\ufffdYh\ufffd)\ufffd\ufffdb_h\ufffd\u06ee\ufffd\ufffd\ufffdVz\ufffd.\ufffd\ufffdX\ufffd\ufffdQ\ufffdM\ufffd\ufffd[h\ufffdW<\ufffd6\ufffdl\ufffd\ufffd\ufffd=>2F\ufffd\ufffd\ufffd\u0254W\ufffdUH\u013e\ufffd-\ufffd\u0214\ufffd`\ufffd/4\ufffd\ufffdt\ufffd\ufffd\ufffd}\ufffd\ufffdLl\\ufffd\ufffd&\ufffds\ufffd\ufffd\ufffd\ufffdY\ufffd\ufffd<\ufffd\u03df\ufffd\ufffd\g\u07f1\ufffd-\ufffd\ufffd\ufffd]\ufffd80\ufffdNLF*\ufffd\ufffdn-%\ufffd\ufffd@\ufffd
M\ufffd\ufffd\ufffd#\ufffdM&6.p\ufffdE\ufffd\u0370\ufffd_\ufffd
 ?\ufffdv\ufffd\ufffd%\ufffd\ufffdx\ufffdW\ufffd#j\ufffd\ufffd\ufffd\ufffd-\ufffd(\ufffdu\ufffdv\ufffd\ufffd\ufffd\ufffdB"\ufffd\ufffdy\ufffdE\ufffd\ufffd>\ufffd}$\ufffd]\ufffd\ufffd,\ufffdJ\ufffd0\ufffd\u0607A\ufffd\ufffdB\ufffd\ufffd>\ufffd}$I0,\ufffd H\ufffd0\ufffd\u0607A\ufffd\ufffdB\ufffd\ufffd>\ufffd}\ufffd>\ufffdL \ufffd!b\ufffdH\ufffd0\ufffd\u0607\ufffd\ufffd#\ufffd\ufffdb_\ufffd\ufffdtZ\u06c7\ufffda,\ufffd\ufffdL \ufffd\ufffd\u06c1IO\ufffdc\ufffd\ufffd\ufffd
3Z!\ufffd\ufffd\ufffdL \ufffd\ufffd\ufffd\ufffd\ufffdO\ufffd\ufffd\ufffd\u012d\ufffd\ufffdC\ufffd\ufffd	\ufffd\ufffd8Y\ufffdj%\ufffd\ufffdb_\u0755M\ufffd\ufffd\ufffd?\ufffdm\ufffdk\ufffd[\ufffd\ufffdD\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdV"\ufffdXm%\ufffd\ufffd@\ucae3l\ufffdG\ufffd\ufffd\ufffd\ufffd\ufffdR=\ufffdU\ufffdV \ufffdX$\ufffd\ufffd@\ucacb\ufffd\ufffd\ufffd\ufffd\ufffdN\ufffd\ufffdXY\ufffd\ufffd&\ufffd\ufffdb_\ufffdU\ufffd\ufffd]\ufffd\ufffd\ufffd\ufffd\ufffdh\ufffd\ufffdXY\ufffd\ufffd,\ufffd\ufffd\ufffd\u040b}6\ufffd�\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd7\ufffd\ufffdu\ufffd(\ufffdd2\ufffd|\ufffd\ufffdac\ufffd:\ufffdXN$db_\ufffdWG\u06be!\ufffdn\ufffdg\ufffd|\ufffdVk-\ufffdX\ufffd\ufffd\ufffdb8\ufffd\ufffd\ufffd}\ufffdb2m\u0790\ufffd\ufffd\ufffd-\ufffdO\ufffd\ufffdiV\ufffd\ufffdOe\ufffdl\ufffd\ufffdOY\ufffd\ufffd)	vW,'2\ufffd\ufffd^\ufffd\ufffd\ufffd+**~\ufffdv\ufffd\ufffd\ufffd]sr]\ufffdR>"\ufffd\ufffdK#v\ufffd8\ufffd1\ufffdb\ufffdo\ufffd\ufffd\ufffd\ufffd5\ufffd\ufffd\ufffd\ufffd\ufffd*\ufffd	\ufffdc\ufffd}>P\ufffd\ufffd\ufffd\ufffd}\ufffdUg\ufffdc\ufffd^`\ufffd\ufffd@\ufffd3C\ufffd=\ufffd\u512b\ufffd
 \ufffdU#\ufffdc4\ufffd}^Q\ufffd\ufffd\ufffd\ufffd5\ufffd\ufffd+ \ufffd\ufffdV4\ufffd\ufffd@0!\ufffdyF\ufffd=\ufffd\ufffd\ufffd+\ufffd\ufffdU\ufffd12\ufffd>\ufffd\ufffd\ufffd>+v-<\ufffd
+\ufffd}\ufffd*G<\ufffdc|\ufffd}z\ufffd\ufffd\u3613.\ufffdd\ufffd\u0270\ufffd\ufffd-\ufffd\ufffdB\ufffd=^t\ufffde\ufffdl\ufffd#\ufffd1\ufffdb\u07df\ufffd\ufffd\ufffdV\ufffd=\ufffd
+\ufffd\ufffdU\ufffd0X\ufffd\ufffdF\ufffd}\ufffd\ufffd\u01ddtM\ufffd\u0291\ufffd\ufffd\ufffd\ufffd4\ufffd\ufffdx\ufffd\ufffd\ufffd}W\ufffdZr\ufffdd\ufffd\ufffd\ufffdl\ufffd\ufffd\ufffd1\ufffdb\ufffd\ufffd\ufffd\ufffdF\ufffd\u01dft\u0662\ufffdU\ufffd\ufffd\u063d< \ufffd\ufffd\ufffd\ufffd\ufffd'\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffde\ufffd\ufffd\ufffd\ufffd9\ufffd\ufffd#\ufffd\ufffd\\ufffdT1\ufffdB �\ufffd\ufffdU3X\ufffd\ufffd!Dz\ucaea\ufffd*))\ufffdi\u074eo\ufffd\ufffd\ufffd$\ufffd)\u034d\ufffd`Vl\ufffd\ufffd\ufffd\u07df\ufffdH\ufffd\ufffdy\ufffdS\ufffd\ufffd%\ufffdr\ufffdY\ufffd\ufffd4\ufffdmS\ufffd\ufffd\ufffd\ufffd;\ufffdT\ufffd\ufffd\ufffd0d02$\ufffd\ufffd
+\ufffd1p\ufffd\ufffd\ufffd0\ufffd\ufffd\ufffd\ufffd\u07b4iSzz\ufffd\ufffd%K.\\ufffd\ufffd\ufffd|7\ufffd\ufffd\ufffds\ufffd\ufffd\ufffd\ufffdK\ufffd\u053dy\u0267\uV>.\ufffdHS\u04a0\u04b2\u048bt'\ufffdJ\ufffd2\ufffd\ufffd\ufffd1\ufffd\ufffd8b\ufffd\ufffdM\ufffdc\ufffdv\ufffd\u0631~\ufffd\ufffdU\ufffdV\ufffd\\ufffd2\ufffd+V\ufffdHKKKHHxu\ufffd
+\u0666\ufffd\ufffdr\ufffdY\ufffd\ufffd4"MI\ufffd\u04ac\u0685t'\ufffdJ\ufffd2\ufffd\ufffd0\ufffdu\ufffdC\ufffd\u01fe\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd�<x\ufffd\ufffd{\ufffd\u0296r\ufffd\u06b5]\ufffd\ufffd\ufffd/oi\ufffd\ufffd\ufffd\ufffd\u01e5iJ\ufffdf\ufffd\ufffdH\ufffd\u04b5@\ufffd!\ufffd\ufffd!\ufffdIX\ufffd\ufffd9Dt\ufffds\ufffd\ufffd*\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdM~~~vv\ufffdlD_\ufffd\ufffd\ufffdi_^j\ufffd\ufffd\ufffd\ufffd\u01e5iJ\ufffdfuI\ufffd2\ufffd\ufffd\ufffduB\ufffd\ufffd>\ufffd{\ufffd,TWWW\ufffdmdAA\ufffd\ufffd}\ufffd\ufffdX\ufffdj\ufffd\ufffd\ufffdey\ufffd:+\ufffdF\ufffd)iP\ufffd\ufffd\ufffd(#\ufffd{y@\ufffda'@\ufffd3C\ufffd\ufffdEEEP6\ufffdiy\ufffd:\ufffdl\ufffd\ufffd)i\ufffd\ufffd(A\ufffdu\ufffd\ufffd\ufffd\ufffd&\ufffd\ufffd\ufffdy\ufffd\ufffd\ufffd:+g\ufffdFX\ufffd h\ufffd\ufffd`\ufffdV\ufffd:A\ufffd\ufffdg\ufffdv\ufffd\ufffd?oy\ufffd\ufffd\ufffdF\ufffdIO\ufffd\ufffd@\ufffd \ufffd\ufffd\ufffd\ufffd$\ufffd\u061f\ufffd"\ufffdUgg\ufffdIO\ufffd\ufffd@\ufffd \ufffd\ufffd\ufffdn\ufffd\ufffd\ufffd7\ufffd\ufffd:+\ufffd\ufffd&\ufffd\ufffd@\ufffd \ufffd\ufffd\ufffd\ufffd$\ufffd\u071f\ufffd\ufffd\ufffdUgg\ufffdIO\ufffd\ufffd@\ufffd \ufffd\ufffd\ufffd\ufffd$\ufffd\u069f\ufffdY\u0ab3\ufffd\ufffd$\ufffd'X\ufffd h\ufffd\ufffd\ufffdn\ufffdg\ufffd\ufffd[U\u0ab3\ufffd\ufffd$\ufffd'X\ufffd h\ufffd\ufffd8k\ufffd| ou\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd$\ufffd\ufffd1\ufffd>3\ufffd\ufffd\ufffd9\ufffd\ufffd\ufffd\ufffd\ufffd6\ufffd\ufffd	\ufffd1\u013e\ufffd\ufffdx\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdp\ufffd\ufffd\ufffd\ufffd5\ufffd{ om\ufffd\ufffd\ufffd\ufffduo\ufffd\ufffd)iP
 \ufffd\u05a3\ufffdK\ufffd\ufffdul'\ufffdc\ufffdl\ufffd\ufffd\ufffd\ufffd\ufffdL\u0778_q\u0286}\ufffd\ufffd\ufffd;a\ufffd\ufffdo\ufffd7<3?c\u0781\ufffdu\ufffd\ufffd:+\ufffdF\ufffd)iP\ufffd\ufffd\ufffd\ufffdv-�\ufffd\ufffda3X\ufffd\ufffd!Dz\ufffdM`EE\ufffd\ufffd\ufffd;/\ufffd}\ufffd\ufffd\ufffd&\ufffd\u022b\ufffd\ufffd\ufffdUg\ufffd\ufffd\ufffd\ufffd\ufffdd2\ufffd\ufffdK	\ufffd8\ufffd\ufffd\ufffd}555UUU\ufffd\ufffd\u0179\ufffd\ufffd\ufffdm\ufffdqG\ufffd\ufffd"\ufffd-J\ufffd2\ufffdF\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdu\ufffdC\ufffd\ufffd>\ufffd\u02aa#G\ufffdl\u077a\ufffd\ufffd\ufffd5\ufffdwd\ufffd^\ufffd
+\ufffd\u04a9t-\ufffda\ufffdWe\u067dl 0\ufffd\ufffd\ufffds\ufffd\ufffd\u0627\ufffdGy\ufffd\ufffd\ufffd-[\ufffd,_\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdP\ufffd
+\ufffd\u049dt*]\ufffdd\ufffd=\ufffdl\ufffd\ufffd\ufffd1p\ufffd\\ufffd\ufffd\ufffd\ufffd\ufffdN\ufffd<\ufffdo\u07fe\ufffdk\ufffd&&&\ufffd\ufffd m\u028e\ufffd\ufffd\u016e (Iw\u04a9t-\ufffda\ufffd`\ufffd\ufffd*\ufffd`\ufffd\ufffdO9SZZ\ufffd\ufffd\ufffd\ufffdg\u03de\u056bW/Y\ufffd\ufffd\u05c2e\ufffd\ufffd\ufffdT\ufffdT\ufffdB:\ufffd\ufffdS\ufffdZ \ufffd\ufffd0L\ufffd\ufffd:!\ufffdc\ufffd\ufffd\ufffdV\ufffd\ufffd\ufffdD6\ufffd\ufffdw\ufffd^\ufffdj\ufffd\ufffdU\ufffd\ufffd#ks\ufffd\ufffd"\ufffd\ufffd\ufffdKw\u04a9t-`{\ufffd\ufffd\ufffd\ufffd \ufffd\ufffd\ufffd\ufffdVy\u068e\ufffd-\u016e\ufffd;\ufffd\ufffdq\ufffd\ufffd:\ufffdC\ufffd\ufffd\ufffd[\ufffdY[K\Td{\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdV\ufffd\ufffd\ufffdY\ufffdJ\\ufffd'\ufffd\u01d1
\ufffd\ufffd\ufffd\ufffd,<n\ufffd\ufffdY\ufffdl\ufffd\u03ac\ufffd%\ufffdz*\ufffd\ufffd\ufffd\ufffd8\ufffda\ufffd \ufffd\ufffd1\ufffd*\ufffd(q\ufffdY\ufffd\u01e0\ufffd:\ufffd@\ufffd\ufffd\u05ed\U000aeb1d\ufffd\ufffd:(d{ZX\ufffd \ufffd\ufffd<\ufffdm\ufffd\ufffd\ufffd]\ufffd\ufffdZ\ufffd3\ufffdc\ufffd\ufffdb\ufffdWL\ufffd\u02bbK]~\ufffd\ufffdL`\ufffd`B\ufffd3\ufffd\ufffdV9jW\u059eR\ufffdO\ufffd\ufffd\ufffd/X\ufffd h\ufffd|\ufffdm\ufffd<cW\ufffd\ufffd2\ufffd\ufffd3\ufffd\ufffd\ufffd\ufffd@p \ufffd\ufffdf\ufffd\ufffdv\ufffd\ufffdf\ue778p\u0768\ufffd_\ufffd0\ufffd\ufffd\ufffd)~\ufffd\ufffd\ufffd\ufffd\u063e2\ufffdG\ufffd-\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdj\ufffd|D>8-~\ufffd4"M\ufffd,,\ufffd{\ufffdB\ufffdu\ufffdr_\ufffdvE\ufffd\u03d2#�IO|\ufffd\ufffdX\ufffd\ufffdG\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdo|w\ufffd\ufffdC\ufffd~\u0454\ufffd^\ufffd1yK&\ufffd\ufffddb\ufffd\ufffd|P>.\ufffdHS\ufffd\u03ce\ufffd
 j\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd/\ufffd!\ufffd\ufffd\u0261\ufffd\ufffd\ufffdm\ufffd3S\ufffd~\ufffd{\ufffdi\ufffdu\ufffdn\ufffd\u03ed\ufffd\u052d\ufffd\ufffd\ufffd\ufffdtN\ufffdc{\ufffd\ufffd\ufffdt\ufffdB\ufffd\ufffd\ufffd6\ufffd{\ufffd\ufffd\ufffdw\ufffd\ufffdlA5\ufffd\ufffdX$\ufffda\ufffdR\ufffd\ufffd_'\u0471o\u04fe\ufffdW\ufffda\ufffdv\ufffd_u\ufffd*O\ufffdz\ufffd@\ufffdKuZ=\ufffd\ufffd\ufffd\ufffdV#C\ufffd\ufffd\u067dl\ufffd\ufffd\ufffd\ufffd`\ufffd\u05afc\ufffd\ufffd\ufffd\ufffd/\ufffd\ufffd\ufffd\ufffdw(\ufffdXr\ufffdgQ\ufffdw\ufffd\u051f\ufffd\ufffdL\ufffd\ufffd\ufffd\ufffds\ufffd\ufffd=Q)\ufffdf$mO\ufffdmwl\ufffd\ufffd\ufffdM\ufffd\ufffduN\u028c\ufffd\ufffd\ufffd\ufffdD\ufffd\ufffd\ufffd\ufffd\ufffd(o\ufffd2\u066f\ufffdw\ufffd\ufffd\ufffd\ufffd=3S\ufffd*\ufffd\ufffd\ufffdR&\ufffd\ufffd\ufffd\ufffd\ufffd<\ufffd\ufffd\ufffd=D\ufffd\ufffd\ufffd\ufffdu~\ufffdv\ufffd\ufffd\ufffd\ufffd?o\ufffd\ufffd\ufffdiR\ufffd
\ufffd%\ufffdN\ufffd2\u076d(B\ufffd\ufffd\ufffd\ufffd\u0782\ufffd\ufffd)\ufffd)6BH\ufffd\ufffd\ufffddK,\ufffd\\ufffd[\ufffd\ufffd6a\ufffdX\ufffd\ufffd8\ufffd168\ufffd\ufffd\ufffd\ufffdl\ufffd\ufffd\ufffdxt\ufffd\ufffd\ufffdsvvwv\ufffd\ufffd\ufffd\ufffd\ufffd)\ufffd\ufffdx\ufffd\ufffd\ufffdY\ufffd\ufffd\u0319\ufffd\ufffd6\ufffd_\ufffd\ufffd\ufffd*g\ufffd\ufffd\ufffdJ\ufffdG\ufffd\ufffd\ufffdJu\ufffd?ox\ufffd\ufffd{n\ufffdu\ufffd\ufffdW\ufffd\ufffd\ufffd\ufffdb{\ufffd\u07fc7\ufffd\ufffd+\u06ffS\ufffd\ufffdR$\ufffd\ufffd\ufffd\ufffd\ufffd?\ufffdP\ufffd+\ufffd\u0151'\ufffd[\ufffdF\ufffd\ufffd\ufffdqQ\ufffd\ufffd;\ufffd6VN\ufffdm6\ufffd\ufffd\ufffd\u0637\ufffd\ufffd\u0755\ufffd\ufffd\ufffdb\u3524@\ufffdS\ufffd$~\ufffd_i\ufffd'&&\ufffdS\ufffd\ufffdM~\ufffd?v\ufffd\ufffdg\ufffd\ufffd$
=Jx-\ufffd\ufffd_
 \ufffd\ufffd\u07b51\ufffd\ufffd\ufffdl\ufffd%\ufffd\ufffdO\ufffd\ufffd\ufffd^\ufffdK9\ufffdt%\ufffd\ufffd\ufffd\ufffd{\ufffd_~\ufffdenn\ufffd\ufffd\ufffd\ufffd3\ufffd\ufffdXb\ufffdg\ufffd\ufffd\ufffd\ufffdi\ufffd%\ufffdshc&\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd7\ufffd\ufffd\ufffdJ\ufffd*\ufffd\ufffd\ufffdg8N\ufffdz\ufffd?\ufffd\ufffdccc\ufffd\ufffd\ufffd\ufffd3\ufffd\ufffdx\ufffd\ufffd\u0269\u0449`\ufffd\ufffd\ufffdd\u072c>\ufffdX\ufffd\ufffd\u03b3\ufffd\ufffdA\ufffdS\ufffdo\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u057d^|\ufffd\ufffd\ufffd\ufffdz\ufffd\ufffd?\ufffd|\ufffd\ufffd\ufffd \ufffd\ufffd],\ufffd\ufffdR]
+-F\ufffd\ufffdkr\ufffd/\ufffdw\ufffd\ufffd6\ufffd\ufffdh6\ufffda'\ufffd\ufffd\u6dc3yH\ufffd\u042d\ufffdg\ufffd\ufffd7\ufffdt\ufffdGGG\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdg\ufffd\ufffd\ufffdzc|v+\ufffd"x\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd*\ufffd\ufffd\ufffd/\ufffd
x\ufffd}\ufffd+\ufffdu\ufffdw\ufffd\ufffd\ufffd\u050e9\ufffd\ufffdXrmp:\ufffd\ufffd\ufffdK\ufffd\ufffd\ufffdAE\ufffd\ufffd\ufffdC\ufffd\ufffd/\ufffd\ufffd\ufffd\\ufffd\ufffdf\ufffdF\ufffd9\ufffd7$\ufffd\ua7ff\ufffd\ufffde\ufffd\ufffd\ufffd\ufffd\ufffdG\ufffd\u01feO_X\ufffdJo\ufffd\ufffd;	\ufffds\ufffd\ufffd\ufffd\ufffd7:@\ufffd\ufffd\ufffd\ufffd}\ufffd\ufffd=\ufffd\ufffd\ufffd.N\ufffd\ufffd\ufffd\ufffd\ufffd~\ufffd\ufffd\ufffd
x\ufffdw\ufffd5\ufffd\ufffd\ufffd\ufffds\ufffd/\ufffd\ufffd\ufffd\ufffdz6*\u0565\ufffd\u02d2\ufffdot\ufffdf\ufffd\ufffd\ufffdem\ufffd;E\ufffd\ufffdx\u02db\ufffd\ufffd*\ufffd\u02d2\ufffdot\ufffdf\ufffd\ufffd\ufffdML\ufffdw\ufffd]\ufffdc\ufffdR\ufffdg\ufffd.\ufffd
\ufffd<\ufffd;\ufffd\ufffd\ufffd\ufffdK\ufffd\ufffd#K}\ufffd\ufffd\ufffd 74\ufffd0\ufffd'V\ufffd.K\U000422da\ufffd.K,\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdw\ufffd�\ufffd\ufffdz\ufffd\ufffd)\ufffda\ufffd(\ufffd\ufffd\u07a2\ufffd\ufffdKuAnh6\ufffda$\ufffd\ufffdv\ufffdr\ufffd\ufffd\ufffdO2\ufffd[\ufffdk\ufffd\u03f3T\ufffdfvb\ufffd&\ufffdR=\ufffdC\ufffd\ufffd\ufffdg\ufffd\u03f3T\ufffdfFb\u07c9w\ufffd\ufffdSE\ufffd+?W\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdY\ufffdrC\ufffd#\ufffdO\u048fK~\ufffd\ufffd\ufffd<-\ufffd]\ufffd\ufffdZ\ufffd\ufffd\ufffd\ufffdG\ufffd\ufffd'y\ufffdR\ufffdg\ufffd.\ufffd
\ufffd<\ufffd\ufffd>\ufffdy\ufffd\u5ef3\ufffd\ufffd1H\ufffd\ufffd\ufffd\ufffd\ufffdA\ufffdQt136\ufffd\ufffd\ufffd
 \ufffd\ufffd\ufffd)\ufffd\ufffd\ufffd\ufffd<KuAnh6\ufffda'\ufffd\ufffd\u0469
\ufffd\ufffd^7\ufffd[\ufffd.-o\ufffd.\ufffd\ufffd\ufffd\ufffd\u076f\ufffd\ufffdBS\ufffdR\ufffd\ufffd\ufffdm-\ufffdy\ufffd\ufffd\ufffd\ufffdl\ufffd\ufffdZ\ufffd\ufffd\ufffd^\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdIH}7\ufffd+\ufffdu\ufffd\ufffdzh \ufffd_\ufffd\ufffdnh\ufffd>\ufffdR]\ufffd\ufffd
x\ufffd}J\ufffd\ufffd\ufffd\u0506{z[h;\ufffd\ufffd\ufffdg\ufffd\ufffd\ufffd\ufffd/\ufffdI\ufffd.\ufffd<	^\ufffd\\ufffd,U\ufffd
+F\ufffdR\ufffdg\ufffd.\ufffd
\ufffd<\ufffd\ufffd>\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdbl\ufffd\ufffdI\ufffds\ufffd
N\ufffd\ufffd\ufffdn8,\ufffd6\ufffd=T[\ufffd\ufffd\ufffdF=\ufffdV<}\ufffd9\ufffd\ufffd>\ufffdR]z\u1bff\ufffd\ufffd\uaaef>\ufffd\ufffd\ufffd\ufffd~\ufffd\ufffd\ufffd#4\ufffd\ufffd\ufffdA\ufffd1\ufffd\ufffds\ufffd\ufffdr\ufffdQ\ufffd\u06d9\ufffd3\ufffd\ufffd\ufffd\ufffd\ufffdu\ufffd$2.\ufffd\ufffd*\ufffdAA)\ufffdP\ufffd\u0469
9\ufffd|P\ufffd\ufffdmp\ufffd\ufffd)\ufffdM
+;\ufffdb\ufffd\u03f3T\ufffd^\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdO\ufffd\ufffd4\ufffd}\ufffd\ufffd\ufffd\ufffd\ufffdO>+\ufffd<\ufffd\ufffd\ufffdv\ufffd\ufffd\ufffd\ud071\ufffd\ufffd;\ufffd\ufffd\ufffd\ub3c2\ufffd\ufffdH
\ufffd\ufffdM^\ufffd\ufffd\ufffdg\ufffd\ufffdpG\ufffd\ufffd\u06fd\ufffd\ufffd\ufffd>/M]n\u07bc\ufffd\ufffd'\ufffd\ufffdf\ufffdK\ufffd.\ufffd\ufffd\ufffd\ufffd\ufffdcf\ufffd\u0119\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd>\ufffd\ufffd\u043b\ufffda6\ufffd\ufffd/\ufffdx\ufffd\ufffd\ufffd\ufffd\ufffd;&\ufffd\ufffdK\ufffdA"xL\ufffd\ufffd\u0253\ufffdB&I\ufffdt\ufffd\ufffd\ufffdv\ufffdm\ufffd\ufffd\ufffd\ufffdd\ufffd\ufffd\ufffd/H\ufffd\ufffdF\ufffd6\ufffd\ufffd\ufffdn;U\ufffd/9O\ufffd\u20e7/\ufffdy\u0408\ufffd>/M]4'E\ufffd\ufffd[-SR\ufffdj\ufffdB\ufffd4\ufffd\ufffd/6\ufffdv\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdp\ufffd\ufffd\ufffd\u059f\ufffdy\ufffd\ufffd\ufffd\ufffdvc\ufffd\ufffd?:su&\ufffdx\ufffd\ufffdz\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdQV\ufffd\ufffd\ufffd\u796c\ufffdf\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd4\ufffd)v\ufffd\ufffdhh\ufffd\ufffd>\ufffd+_~\ufffdeR!\ufffdGH\ufffd�-gx\ufffdL\ufffd\ufffd}m\ufffdD\ufffdW\ufffdm|v+:\ufffd;:\ufffd\ufffdM\ufffd|Jh\ufffd\ufffdKY\ufffd\ufffd\ufffd/~\ufffd\ufffd7\u0477B1\ufffd\ufffd\ufffd}\ufffd\ufffd\ufffd\u056a|h\ufffd:\ufffd}:S\ufffd~\ufffd\ufffd\ufffdK'$e]4\u0584\ufffd\u04a5K\ufffd\\ufffd
+%\ufffd\ufffd\ufffd
\ufffdu\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdd\u01f1/6\ufffdi\u048dN(w\ufffd2\ufffd\u0621\ufffd\ufffdG\ufffde7=B\ufffd\ufffdf\ufffd|w\ufffd\ufffd\\ufffd\ufffdV\ufffd<,} s\ufffd>S,\ufffd\ufffd\ufffdu\ufffd\ufffd\ufffd\u0105\ufffd\ufffd\ufffd\ufffd\u0637\ufffd\ufffdt\ufffd\ufffdE{\ufffd\ufffd\ufffd\ufffd\ufffdu\ufffdB\u0275\ufffdq\ufffd%'\ufffd\u072f\ufffd\ufffdZ\ufffd[\ufffd>\ufffd1
\ufffdI-@\ufffd\ufffd9)\ufffduP6K_\ufffd\ufffd\ufffdK'$}]b\ufffd4\ufffd\u013e\ufffdfE4vD\ufffd\ufffd_5\ufffd\ufffd8\ufffd5?^A\ufffdVa\ufffdq*)\ufffd_\ufffd
+\u017eP\ufffd\ufffd$\ufffd\ufffdJ%c\ufffd9\ufffdr\ufffdg\ufffd/)\ufffduP6K_\ufffd\ufffd\ufffdK'$}]B\ufffd\ufffdnv\ufffd\ufffd\ufffd]\ufffdB\ufffdnb_\ufffd<\ufffd\ufffd'\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd]\ufffd\ufffd\ufffd\u0371\ufffd`\ufffd+\ufffd\ufffdb_4lE\ufffd\ufffd\ufffd{\ufffd\ufffdb_e\ufffd\ufffd\ufffd\ufffd\ufffdL\ufffdtB\ufffd\ufffd%\ufffd\ufffdBoi4\ufffd\ufffdu\ufffd\ufffd\ufffdUt\u042be\ufffdk~|\ufffd\ufffd\ufffd&yco\ufffd\ufffd\u06e2\ufffd+\ufffdB\ufffd4\ufffd\u0771ke<\ufffd\ufffd\u0691\ufffd\ufffd\ufffdA\ufffd<,} s\ufffd>S,\ufffd\ufffd\ufffd\ufffd\ufffd�\ufffd\ufffd`\ufffd\ufffd\ufffdrAnT\ufffd>\ufffd\ufffdE\ufffd\ufffd}\ufffd\ufffd;\ufffd}\ufffd\ufffd,\ufffdp;\ufffd"\ufffdE\ufffd\u04f2\ufffd\ufffd>\ufffd\ufffd\ufffdK'\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd
\ufffdH
\ufffdnb_h1o\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdv}n\ufffd\ufffd\ufffd\ufffd>\ufffdC\ufffd3\ufffd\ufffd	i\ufffd.n\ufffditt44\ufffdE\ufffdf\ufffd}J \ufffd\ufffd\ufffdvc_\ufffd\ufffd\ufffd\ufffdbS\ufffd\ufffd\ufffd\ufffdp\ufffdf\ufffd\ufffd\ufffd 7\ufffd>S,\ufffd\ufffd\ufffd\ufffd|F(y\ufffdj\ufffd~m_p\ufffd\u812c\ufffd0I\ufffdi\ufffd[\ufffd+I!)\ufffd\ufffd\ufffdf\ufffd\ufffd\ufffdO3_\ufffdI7\ufffd!\ufffd@\ufffd\ufffd}\ufffdX:!\ufffd\ufffd\ufffd\ufffdL.\ufffd<ou\ufffdL\ufffd4g\ufffd\ufffd+\ufffdE\ufffd\u76e4%\ufffd\ufffd\ufffdsq-\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdA\ufffd\ufffd\ufffdX:\ufffd\ufffd>(\ufffd\ufffdK'\ufffd\u077a\ufffd\ufffd\ufffdr\ufffdJ\ufffd5\u013ev\ufffd\ufffd\ufffd\ufffd)c_\ufffd\ufffd\ufffdx\ufffdW\ufffd\ufffd/\ufffd\ufffdI>2\ufffd\ufffd
+\ufffd\ufffdK'\ufffdR]\ufffd\ufffdQ4\ufffd \ufffd\ufffdb\ufffdX\ufffdK\ufffd\ufffdwD,\ufffd
x\ufffd=\ufffd\ufffd\u73d2f[\ufffd\ufffd+\ufffdb\ufffdi\ufffd\ufffdX\u0770\ufffd\ufffdY\ufffdK\ufffd\u069a\ufffd,9\ufffd
x\ufffd|\ufffd\ufffdZ\ufffd\ufffd\ufffdT0,\u0186\ufffd\ufffduQ\ufffd\ufffd\ufffde\ufffd\u03f3T\ufffdf\u013e\u05b1/\ufffd\ufffd\ufffd\u49e9\ufffd\ufffd\ufffdO:r\ufffdJvw\ufffd.\ufffd\ufffd,\ufffdy\ufffd\ufffd\ufffd\ufffdl\ufffd\ufffd\ufffd\ufffdv\ufffdS\ufffd\ufffd\ufffd\u079a\ufffd\ufffd\ufffd}|j3ac\u02c7\ufffda\ufffd\u03f3T\ufffdf\u013ec_\ufffd\ufffd\ufffd\ufffd5\ufffd%%9O\ufffd\ufffdr\ufffd\ufffdR\ufffdg\ufffd.\ufffd
\ufffd<\ufffd}\u01bef�\ufffd\ufffd`\ufffd\ufffd\ufffdZ\ufffd\ufffd}\ufffd'}u\ufffdR\ufffdg\ufffd.\ufffd
\ufffd<\ufffd}\ufffd\u01fe\ufffd\ufffdzjj\ufffd\ufffd\ufffd}\ufffdWg,\ufffdy\ufffd\ufffd\ufffd\ufffdl\ufffd\ufffd\u0617e\ufffd\ufffd\ufffd\ufffd\ufffd4\ufffdW\ufffdv9\ufffd\u05f4\ufffd\ufffdY\ufffdrC\ufffdb_\ufffd\ufffdO'jCk8\ufffd;bc_&w\ufffd\ufffd\ufffdY\ufffdrC\ufffdb_\ufffd\ufffd\ufffd%=\ufffd>\ufffd[&\ufffdvcY\ufffd\ufffd,\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd/\ufffd\ufffd\ufffdIS\ufffd\ufffd[1\ufffd\u04b0T\ufffdf\u013e\ufffd\ufffd\ufffd|+v\ufffdF3\ufffd4.\ufffd/
KuAnh6\ufffdA\ufffdk;\ufffd\ufffd\ufffd\ufffd\\u04bdZ\ufffd&B7\ufffdK\ufffdK\ufffdR]\ufffd\ufffd
x\ufffd\u27fa\ufffd\ufffd,\ufffd3y\ufffdIN\ufffd\ufffdB!\ufffd/
KuAnh6\ufffdA\ufffd\ufffd\u017e\ufffd\ufffd^R\ufffdSI3\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd}iX\ufffdrC\ufffd\ufffd\ufffd\ufffd>c,\ufffdKuAnh6\ufffdA\ufffd3\ufffd\ufffd	\ufffdT\ufffdf\ufffd>S,\ufffdKuAn

<TRUNCATED>

[44/44] isis-site git commit: ISIS-1594: provide an 'edit' button

Posted by da...@apache.org.
ISIS-1594: provide an 'edit' button


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

Branch: refs/heads/asf-site
Commit: 83a3755a5b0fc90b5b840e683e1942013a9f304f
Parents: 7213646
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Mar 7 23:57:00 2017 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Mar 7 23:57:00 2017 +0000

----------------------------------------------------------------------
 content/articles-and-presentations.html         |   604 +-
 content/asf.html                                |   342 +-
 content/books.html                              |   478 +-
 content/cheat-sheet.html                        |   320 +-
 content/common-use-cases.html                   |   459 +-
 content/documentation.html                      |   765 +-
 content/downloadable-presentations.html         |   337 +-
 content/downloads.html                          |   596 +-
 content/guides/cgcom.html                       |  7755 ++-
 content/guides/cgcom.pdf                        | 29662 ++++-------
 content/guides/dg.html                          |  7922 ++-
 content/guides/dg.pdf                           |  5365 +-
 content/guides/rgant.html                       | 22324 +++++----
 content/guides/rgant.pdf                        | 42566 +++++++++++-----
 content/guides/rgcfg.html                       |  3773 +-
 content/guides/rgcfg.pdf                        |  1823 +-
 content/guides/rgcms.html                       | 12161 +++--
 content/guides/rgcms.pdf                        | 39324 +++++++++++----
 content/guides/rgfis.html                       |  2890 +-
 content/guides/rgfis.pdf                        |  4216 +-
 content/guides/rgmvn.html                       |  1797 +-
 content/guides/rgmvn.pdf                        |  6874 ++-
 content/guides/rgsvc.html                       | 20463 ++++----
 content/guides/rgsvc.pdf                        | 43882 +++++++++++------
 content/guides/tg.html                          |  4316 +-
 content/guides/tg.pdf                           |  5852 +--
 content/guides/ugbtb.html                       |  9130 ++--
 content/guides/ugbtb.pdf                        | 25537 +++++-----
 content/guides/ugfun.html                       | 13869 +++---
 content/guides/ugfun.pdf                        | 32316 ++++++++----
 content/guides/ugodn.html                       |  1440 +-
 content/guides/ugodn.pdf                        |  2831 +-
 content/guides/ugsec.html                       |  2892 +-
 content/guides/ugsec.pdf                        | 15444 +++---
 content/guides/ugtst.html                       |  5052 +-
 content/guides/ugtst.pdf                        | 13826 ++++--
 content/guides/ugvro.html                       |  2543 +-
 content/guides/ugvro.pdf                        |  5003 +-
 content/guides/ugvw.html                        |  5439 +-
 content/guides/ugvw.pdf                         | 14603 +++---
 content/help.html                               |   478 +-
 content/how-isis-works.html                     |   329 +-
 content/icons.html                              |   352 +-
 .../common-use-cases/common-use-cases.html      |   305 +-
 .../isis-in-pictures/isis-in-pictures.html      |   305 +-
 content/isis-in-pictures.html                   |  1076 +-
 content/migration-notes.html                    |  3377 +-
 content/more-thanks.html                        |   443 +-
 content/powered-by.html                         |  1154 +-
 content/quotes.html                             |   700 +-
 content/release-notes.html                      |  9682 ++--
 content/screencasts-older.html                  |   959 +-
 content/screencasts.html                        |  6868 ++-
 content/support.html                            |   466 +-
 54 files changed, 246918 insertions(+), 196367 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/articles-and-presentations.html
----------------------------------------------------------------------
diff --git a/content/articles-and-presentations.html b/content/articles-and-presentations.html
index 7472fac..39e00a1 100644
--- a/content/articles-and-presentations.html
+++ b/content/articles-and-presentations.html
@@ -1,12 +1,10 @@
 <!doctype html>
 <html class="no-js" lang="en">
-<head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-
-    <title>Articles, Conference Sessions, Podcasts</title>
-
-    <!--
+ <head> 
+  <meta charset="utf-8"> 
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"> 
+  <title>Articles, Conference Sessions, Podcasts</title> 
+  <!--
         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
@@ -23,31 +21,21 @@
         KIND, either express or implied.  See the License for the
         specific language governing permissions and limitations
         under the License.
-    -->
-
-    <!-- No caching headers -->
-    <meta http-equiv="cache-control" content="no-cache" />
-    <meta http-equiv="pragma" content="no-cache" />
-    <meta http-equiv="expires" content="-1" />
-
-
-    <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
-    <link href="./css/foundation/5.5.1/foundation.css" rel="stylesheet" />
-    <script src="./js/foundation/5.5.1/vendor/modernizr.js"></script>
-    <link href="./css/asciidoctor/colony.css" rel="stylesheet">
-    <link href="./css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-
-
-
-    <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
-    <!--[if lt IE 9]>
+    --> 
+  <!-- No caching headers --> 
+  <meta http-equiv="cache-control" content="no-cache"> 
+  <meta http-equiv="pragma" content="no-cache"> 
+  <meta http-equiv="expires" content="-1"> 
+  <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line --> 
+  <link href="./css/foundation/5.5.1/foundation.css" rel="stylesheet"> 
+  <script src="./js/foundation/5.5.1/vendor/modernizr.js"></script> 
+  <link href="./css/asciidoctor/colony.css" rel="stylesheet"> 
+  <link href="./css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet"> 
+  <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet"> 
+  <!--[if lt IE 9]>
       <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
-    <![endif]-->
-
-
-
-    <style type="text/css">
+    <![endif]--> 
+  <style type="text/css">
         pre code {
             background-color: inherit;
             border-style: none;
@@ -192,9 +180,8 @@ table.CodeRay td.code>pre{padding:0}
         color:#fff;
         font-size: 1.1em;
     }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         @media only screen and (min-width: 40.063em) {
           .top-bar {
             .contain-to-grid .top-bar {
@@ -205,9 +192,8 @@ table.CodeRay td.code>pre{padding:0}
         .row {
             max-width: 80rem;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .extended-quote,
         .extended-quote-first {
             margin-left: 40px;
@@ -231,9 +217,8 @@ table.CodeRay td.code>pre{padding:0}
             text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
         }
         
-    </style>
-
-    <style>
+    </style> 
+  <style>
         body {
           position: relative;
         }
@@ -255,6 +240,7 @@ table.CodeRay td.code>pre{padding:0}
 
         div#doc-content {
             margin-top: 30px;
+            padding-top: 30px;
         }
 
         div.documentation-page table.frame-all {
@@ -286,9 +272,8 @@ table.CodeRay td.code>pre{padding:0}
             min-height: 2000px;
         }
 
-    </style>
-
-    <style>
+    </style> 
+  <style>
 
         @media only screen and (min-width: 768px) {
           #toc.toc2 ul ul { margin-left: -10px; }
@@ -316,15 +301,13 @@ table.CodeRay td.code>pre{padding:0}
         body div#toc2 li.tocify-item.active a {
             color: red;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         footer {
             margin-top: 1000px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* overriding colony.css stylesheet */
         .literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
            /*padding: 1.25em 1.5625em 1.125em 1.5625em;*/
@@ -372,9 +355,8 @@ table.CodeRay td.code>pre{padding:0}
         .imageblock img {
             margin-bottom: 10px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* from http://ben.balter.com/2014/03/13/pages-anchor-links/ */
         .header-link {
           position: absolute;
@@ -395,9 +377,8 @@ table.CodeRay td.code>pre{padding:0}
         h6:hover .header-link {
           opacity: 1;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .top-bar
         {
             -webkit-transition-duration: .5s;
@@ -425,303 +406,213 @@ table.CodeRay td.code>pre{padding:0}
             -webkit-transition-property: -webkit-transform;
             transition-property: transform;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         #doc-content a.guide {
             color: white;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
+        .tocify {
+            margin-top: 80px;
+        }
+    </style> 
+  <style>
         .tocify {
             margin-top: 80px;
         }
-    </style>
-
-
-</script>
-
-</head>
-<body>
-
-<<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
-    <div class="github-fork-ribbon">
-        <a href="https://github.com/apache/isis#fork-destination-box">Fork me on GitHub</a>
-    </div>
-</div>
-
-
-<div class="row">
-
-    <div class="fixed contain-to-grid header">
-        <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
-            <ul class="title-area">
-                <li class="name">
-                    <h1>
-                        <a href="/index.html">Apache Isis&trade;</a>
-                    </h1>
-                </li>
-                <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
-                <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
-            </ul>
-
-            <section class="top-bar-section">
-                <ul class="right">
-
-                    <li class="has-form">
-                       <FORM class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
-                        <div class="row collapse">
-                            <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
-                            <INPUT type="hidden" name="cof" value="FORID:0">
-                            <INPUT class="form-control" name="q" type="text" placeholder="Search">
-                        </div>
-                    </FORM>
-                     </li>
-
-                </ul>
-
-                <!-- Left Nav Section -->
-                <ul class="left">
-
-                    <li><a href="/documentation.html">Documentation</a></li>
-                    <li><a href="/downloads.html">Downloads</a></li>
-                    <li><a href="/help.html">Help</a></li>
-                    <li><a href="/asf.html">@ASF</a></li>
-
-                </ul>
-
-            </section>
-        </nav>
-    </div>
-</div>
-
-<div class="row">
-
-    <div id="doc-content-left" class="large-9 medium-9 columns">
-
-
-        <div id="doc-content">
-          <div id="preamble">
-<div class="sectionbody">
-<div class="paragraph">
-<p><br/><br/></p>
-</div>
-<div class="paragraph">
-<p>Some articles and recorded material relating to either Apache Isis (or its predecessor, the Naked Objects framework), or its 'sister' open source project on the .NET platform, Naked Objects .NET. We&#8217;ve <strong>highlighted</strong> some of the better ones\u2026</p>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_2014">2014</h2>
-<div class="sectionbody">
-<div class="ulist">
-<ul>
-<li>
-<p>Presentation, BDD Exchange: <a href="https://skillsmatter.com/skillscasts/5638-to-those-whom-much-is-given-much-is-expected">To those whom much is given, much is expected\u2026 </a> (45 min. video)</p>
-</li>
-<li>
-<p>Presentation, JEEConf: <a href="https://www.youtube.com/watch?v=BNGUqZ6YE-M">Extremely rapid application development with Apache Isis</a> (50 min. video)</p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_2013">2013</h2>
-<div class="sectionbody">
-<div class="ulist">
-<ul>
-<li>
-<p>Presentation, Oredev: <a href="http://oredev.org/2013/wed-fri-conference/rrraddd-ridiculously-rapid-domain-driven-and-restful-apps-with-apache-isis">RRRADDD! Ridiculously Rapid Domain-driven (and Restful) Apps With Apache Isis</a> (50 min. video)</p>
-</li>
-<li>
-<p><strong>Article, Methods and Tools : <a href="http://www.methodsandtools.com/PDF/mt201302.pdf">Introducing Apache Isis</a></strong></p>
-</li>
-<li>
-<p>Article, SDJournal : <a href="http://sdjournal.org/software-developers-journal-open-012013-2/">Introducing Apache Isis</a></p>
-</li>
-<li>
-<p>Article, SDJournal: <a href="http://sdjournal.org/software-developers-journal-open-012013-2/">Restful Objects on Apache Isis</a></p>
-</li>
-<li>
-<p>A Prezi <a href="http://prezi.com/cunfhjsf8dqg/braiv-apache-isis/">presentation on Naked Objects and Apache Isis</a>, mixed by Thomas Eck</p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_2012">2012</h2>
-<div class="sectionbody">
-<div class="ulist">
-<ul>
-<li>
-<p><strong>Article, InfoQ: <a href="http://www.infoq.com/articles/Intro_Restful_Objects">Introducing Restful Objects</a></strong></p>
-</li>
-<li>
-<p>Presentation, Skillsmatter: <a href="http://skillsmatter.com/podcast/java-jee/restful-objects">Restful Objects - A Hypermedia API For Domain Object Models</a></p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_2011">2011</h2>
-<div class="sectionbody">
-<div class="ulist">
-<ul>
-<li>
-<p><strong>Presentation, InfoQ: <a href="http://www.infoq.com/presentations/Large-scale-Pure-OO-Irish-Government">Case study: Large-scale Pure OO at the Irish Government</a></strong> (1 hr video)</p>
-</li>
-<li>
-<p>Article, InfoQ: <a href="http://www.infoq.com/articles/haywood-ddd-no">Interview and Book Excerpt: Dan Haywood&#8217;s Domain Driven Design using Naked Objects</a></p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_2010">2010</h2>
-<div class="sectionbody">
-<div class="ulist">
-<ul>
-<li>
-<p>Presentation, Skillsmatter: <a href="http://skillsmatter.com/podcast/java-jee/have-your-ddd-cake-eat-it-too">How to have your domain-driven design cake and eat it, too</a> (1 hr video)</p>
-</li>
-<li>
-<p>Article, InfoQ: <a href="http://www.infoq.com/articles/Nacked-MVC">Fulfilling the Promise of MVC</a> (Naked Objects .NET)</p>
-</li>
-<li>
-<p><strong>Podcast, Hanselminutes: <a href="http://www.hanselman.com/blog/HanselminutesPodcast233InsideTheNakedObjectsFrameworkWithRichardPawson.aspx">Inside the Naked Objects Framework with Richard Pawson</a></strong> (Naked Objects .NET) (30 min)</p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_2009">2009</h2>
-<div class="sectionbody">
-<div class="ulist">
-<ul>
-<li>
-<p><strong>Article, Methods and Tools: <a href="http://www.methodsandtools.com/archive/archive.php?id=97">An Introduction to Domain Driven Design</a></strong></p>
-</li>
-<li>
-<p>Presentation, Skillsmatter: <a href="http://skillsmatter.com/podcast/design-architecture/exploring-domains-and-collaborating-with-domain-experts">Exploring Domains and Collaborating with Domain Experts</a> (1 hr video)</p>
-</li>
-<li>
-<p>Presentation, Devoxx: <a href="http://www.parleys.com/#id=1671&amp;st=5">Introducing Scimpi</a> (30 min video)</p>
-</li>
-<li>
-<p>Article, PragPub: <a href="http://pragprog.com/magazines/2009-12">Going Naked</a></p>
-</li>
-<li>
-<p><strong>Book: <a href="./books.html">Domain Driven Design using Naked Objects</a>, Dan Haywood</strong></p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_2008">2008:</h2>
-<div class="sectionbody">
-<div class="ulist">
-<ul>
-<li>
-<p>Article, InfoQ: <a href="http://www.infoq.com/articles/RAD-Naked-Objects">Rapid Application Development using Naked Objects for .NET</a> (Naked Objects .NET)</p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_2004">2004:</h2>
-<div class="sectionbody">
-<div class="ulist">
-<ul>
-<li>
-<p><strong>Richard Pawson&#8217;s <a href="./Pawson-Naked-Objects-thesis.pdf">PhD thesis on Naked Objects</a></strong></p>
-</li>
-<li>
-<p>Article series, TheServerSide</p>
-</li>
-<li>
-<p>Part 1 - <a href="http://www.theserverside.com/news/1365562/Part-1-The-Case-for-Naked-Objects-Getting-Back-to-the-Object-Oriented-Ideal">The Case for Naked Objects - Getting Back to the Object-Oriented Ideal</a></p>
-</li>
-<li>
-<p><strong>Part 2 - <a href="http://www.theserverside.com/news/1365568/Part-2-Challenging-the-Dominant-Design-of-the-4-Layer-Architecture">Challenging the Dominant Design of the 4-Layer Architecture</a></strong></p>
-</li>
-<li>
-<p>Part 3 - <a href="http://www.theserverside.com/news/1365570/Part-3-Write-an-application-in-Java-and-deploy-it-on-Net">Write an application in Java and deploy it on .Net</a></p>
-</li>
-<li>
-<p>Part 4 - <a href="http://www.theserverside.com/news/1366868/Part-4-Modeling-simultaneously-in-UML-Java-and-User-Perspectives">Modeling simultaneously in UML, Java, and User Perspectives</a></p>
-</li>
-<li>
-<p>Part 5 - <a href="http://www.theserverside.com/news/1366871/Part-5-Building-Rich-Internet-Applications-with-Naked-Objects">Building Rich Internet Applications with Naked Objects</a></p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_2002">2002:</h2>
-<div class="sectionbody">
-<div class="ulist">
-<ul>
-<li>
-<p><strong>Book: <a href="./books.html">Naked Objects</a>, Richard Pawson and Robert Matthews.</strong></p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-        </div>
-
-        <footer>
-          <hr>
-          <p class="small">
-          Copyright &copy; 2010~2016 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0.
-          <br/>
-          Apache, the Apache feather logo, Apache&nbsp;Isis, and the Apache&nbsp;Isis project logo are all trademarks of The&nbsp;Apache&nbsp;Software&nbsp;Foundation.
-          </p>
-        </footer>
-
-    </div>
-
-    <div id="doc-content-right" class="large-3 medium-3 xcolumns">
-        <div id="toc" class="toc2">
-            <div class="fallback-toc">
-                <ul class="sectlevel1">
-<li><a href="#_2014">2014</a></li>
-<li><a href="#_2013">2013</a></li>
-<li><a href="#_2012">2012</a></li>
-<li><a href="#_2011">2011</a></li>
-<li><a href="#_2010">2010</a></li>
-<li><a href="#_2009">2009</a></li>
-<li><a href="#_2008">2008:</a></li>
-<li><a href="#_2004">2004:</a></li>
-<li><a href="#_2002">2002:</a></li>
-</ul>
-            </div>
-        </div>
-    </div>
-
-</div>
-
-
-<script src="./js/foundation/5.5.1/vendor/jquery.js"></script>
-<script src="./js/foundation/5.5.1/foundation.min.js"></script>
-
-
-<link href="./css/jquery.tocify/1.9.0/jquery.tocify.css" rel="stylesheet">
-<script src="./js/jqueryui/1.11.4/jquery-ui.min.js"></script>
-<script src="./js/jquery.tocify/1.9.0/jquery.tocify.js"></script>
-
-
-
-<script type="text/javascript">
+    </style>  
+ </head> 
+ <body> 
+  <div class="row"> 
+   <div class="fixed contain-to-grid header"> 
+    <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem"> 
+     <ul class="title-area"> 
+      <li class="name"> <h1> <a href="/index.html">Apache Isis\u2122</a> </h1> </li> 
+      <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone --> 
+      <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li> 
+     </ul> 
+     <section class="top-bar-section"> 
+      <ul class="right"> 
+       <li class="has-form"> 
+        <form class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse"> 
+         <div class="row collapse"> 
+          <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya"> 
+          <input type="hidden" name="cof" value="FORID:0"> 
+          <input class="form-control" name="q" type="text" placeholder="Search"> 
+         </div> 
+        </form> </li> 
+      </ul> 
+      <!-- Left Nav Section --> 
+      <ul class="left"> 
+       <li><a href="/documentation.html">Documentation</a></li> 
+       <li><a href="/downloads.html">Downloads</a></li> 
+       <li><a href="/help.html">Help</a></li> 
+       <li><a href="/asf.html">@ASF</a></li> 
+      </ul> 
+     </section> 
+    </nav> 
+   </div> 
+  </div> 
+  <div class="row"> 
+   <div id="doc-content-left" class="large-9 medium-9 columns"> 
+    <div id="doc-content">
+     <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/articles-and-presentations.adoc&quot;" style="float: right; font-size: small; padding: 6px;  "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+     <div id="preamble"> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>Some articles and recorded material relating to either Apache Isis (or its predecessor, the Naked Objects framework), or its 'sister' open source project on the .NET platform, Naked Objects .NET. We\u2019ve <strong>highlighted</strong> some of the better ones�\u20ac�</p> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_2014">2014</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_2014.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="ulist"> 
+        <ul> 
+         <li> <p>Presentation, BDD Exchange: <a href="https://skillsmatter.com/skillscasts/5638-to-those-whom-much-is-given-much-is-expected">To those whom much is given, much is expected�\u20ac� </a> (45 min. video)</p> </li> 
+         <li> <p>Presentation, JEEConf: <a href="https://www.youtube.com/watch?v=BNGUqZ6YE-M">Extremely rapid application development with Apache Isis</a> (50 min. video)</p> </li> 
+        </ul> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_2013">2013</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_2013.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="ulist"> 
+        <ul> 
+         <li> <p>Presentation, Oredev: <a href="http://oredev.org/2013/wed-fri-conference/rrraddd-ridiculously-rapid-domain-driven-and-restful-apps-with-apache-isis">RRRADDD! Ridiculously Rapid Domain-driven (and Restful) Apps With Apache Isis</a> (50 min. video)</p> </li> 
+         <li> <p><strong>Article, Methods and Tools : <a href="http://www.methodsandtools.com/PDF/mt201302.pdf">Introducing Apache Isis</a></strong></p> </li> 
+         <li> <p>Article, SDJournal : <a href="http://sdjournal.org/software-developers-journal-open-012013-2/">Introducing Apache Isis</a></p> </li> 
+         <li> <p>Article, SDJournal: <a href="http://sdjournal.org/software-developers-journal-open-012013-2/">Restful Objects on Apache Isis</a></p> </li> 
+         <li> <p>A Prezi <a href="http://prezi.com/cunfhjsf8dqg/braiv-apache-isis/">presentation on Naked Objects and Apache Isis</a>, mixed by Thomas Eck</p> </li> 
+        </ul> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_2012">2012</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_2012.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="ulist"> 
+        <ul> 
+         <li> <p><strong>Article, InfoQ: <a href="http://www.infoq.com/articles/Intro_Restful_Objects">Introducing Restful Objects</a></strong></p> </li> 
+         <li> <p>Presentation, Skillsmatter: <a href="http://skillsmatter.com/podcast/java-jee/restful-objects">Restful Objects - A Hypermedia API For Domain Object Models</a></p> </li> 
+        </ul> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_2011">2011</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_2011.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="ulist"> 
+        <ul> 
+         <li> <p><strong>Presentation, InfoQ: <a href="http://www.infoq.com/presentations/Large-scale-Pure-OO-Irish-Government">Case study: Large-scale Pure OO at the Irish Government</a></strong> (1 hr video)</p> </li> 
+         <li> <p>Article, InfoQ: <a href="http://www.infoq.com/articles/haywood-ddd-no">Interview and Book Excerpt: Dan Haywood\u2019s Domain Driven Design using Naked Objects</a></p> </li> 
+        </ul> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_2010">2010</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_2010.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="ulist"> 
+        <ul> 
+         <li> <p>Presentation, Skillsmatter: <a href="http://skillsmatter.com/podcast/java-jee/have-your-ddd-cake-eat-it-too">How to have your domain-driven design cake and eat it, too</a> (1 hr video)</p> </li> 
+         <li> <p>Article, InfoQ: <a href="http://www.infoq.com/articles/Nacked-MVC">Fulfilling the Promise of MVC</a> (Naked Objects .NET)</p> </li> 
+         <li> <p><strong>Podcast, Hanselminutes: <a href="http://www.hanselman.com/blog/HanselminutesPodcast233InsideTheNakedObjectsFrameworkWithRichardPawson.aspx">Inside the Naked Objects Framework with Richard Pawson</a></strong> (Naked Objects .NET) (30 min)</p> </li> 
+        </ul> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_2009">2009</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_2009.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="ulist"> 
+        <ul> 
+         <li> <p><strong>Article, Methods and Tools: <a href="http://www.methodsandtools.com/archive/archive.php?id=97">An Introduction to Domain Driven Design</a></strong></p> </li> 
+         <li> <p>Presentation, Skillsmatter: <a href="http://skillsmatter.com/podcast/design-architecture/exploring-domains-and-collaborating-with-domain-experts">Exploring Domains and Collaborating with Domain Experts</a> (1 hr video)</p> </li> 
+         <li> <p>Presentation, Devoxx: <a href="http://www.parleys.com/#id=1671&amp;st=5">Introducing Scimpi</a> (30 min video)</p> </li> 
+         <li> <p>Article, PragPub: <a href="http://pragprog.com/magazines/2009-12">Going Naked</a></p> </li> 
+         <li> <p><strong>Book: <a href="./books.html">Domain Driven Design using Naked Objects</a>, Dan Haywood</strong></p> </li> 
+        </ul> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_2008">2008:</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_2008.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="ulist"> 
+        <ul> 
+         <li> <p>Article, InfoQ: <a href="http://www.infoq.com/articles/RAD-Naked-Objects">Rapid Application Development using Naked Objects for .NET</a> (Naked Objects .NET)</p> </li> 
+        </ul> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_2004">2004:</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_2004.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="ulist"> 
+        <ul> 
+         <li> <p><strong>Richard Pawson\u2019s <a href="./Pawson-Naked-Objects-thesis.pdf">PhD thesis on Naked Objects</a></strong></p> </li> 
+         <li> <p>Article series, TheServerSide</p> </li> 
+         <li> <p>Part 1 - <a href="http://www.theserverside.com/news/1365562/Part-1-The-Case-for-Naked-Objects-Getting-Back-to-the-Object-Oriented-Ideal">The Case for Naked Objects - Getting Back to the Object-Oriented Ideal</a></p> </li> 
+         <li> <p><strong>Part 2 - <a href="http://www.theserverside.com/news/1365568/Part-2-Challenging-the-Dominant-Design-of-the-4-Layer-Architecture">Challenging the Dominant Design of the 4-Layer Architecture</a></strong></p> </li> 
+         <li> <p>Part 3 - <a href="http://www.theserverside.com/news/1365570/Part-3-Write-an-application-in-Java-and-deploy-it-on-Net">Write an application in Java and deploy it on .Net</a></p> </li> 
+         <li> <p>Part 4 - <a href="http://www.theserverside.com/news/1366868/Part-4-Modeling-simultaneously-in-UML-Java-and-User-Perspectives">Modeling simultaneously in UML, Java, and User Perspectives</a></p> </li> 
+         <li> <p>Part 5 - <a href="http://www.theserverside.com/news/1366871/Part-5-Building-Rich-Internet-Applications-with-Naked-Objects">Building Rich Internet Applications with Naked Objects</a></p> </li> 
+        </ul> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_2002">2002:</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_2002.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="ulist"> 
+        <ul> 
+         <li> <p><strong>Book: <a href="./books.html">Naked Objects</a>, Richard Pawson and Robert Matthews.</strong></p> </li> 
+        </ul> 
+       </div> 
+      </div> 
+     </div> 
+    </div> 
+    <footer> 
+     <hr> 
+     <p class="small"> Copyright � 2010~2016 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0. <br> Apache, the Apache feather logo, Apache&nbsp;Isis, and the Apache&nbsp;Isis project logo are all trademarks of The&nbsp;Apache&nbsp;Software&nbsp;Foundation. </p> 
+    </footer> 
+   </div> 
+   <div id="doc-content-right" class="large-3 medium-3 xcolumns"> 
+    <div id="toc" class="toc2"> 
+     <div class="fallback-toc"> 
+      <ul class="sectlevel1"> 
+       <li><a href="#_2014">2014</a></li> 
+       <li><a href="#_2013">2013</a></li> 
+       <li><a href="#_2012">2012</a></li> 
+       <li><a href="#_2011">2011</a></li> 
+       <li><a href="#_2010">2010</a></li> 
+       <li><a href="#_2009">2009</a></li> 
+       <li><a href="#_2008">2008:</a></li> 
+       <li><a href="#_2004">2004:</a></li> 
+       <li><a href="#_2002">2002:</a></li> 
+      </ul> 
+     </div> 
+    </div> 
+   </div> 
+  </div> 
+  <script src="./js/foundation/5.5.1/vendor/jquery.js"></script> 
+  <script src="./js/foundation/5.5.1/foundation.min.js"></script> 
+  <link href="./css/jquery.tocify/1.9.0/jquery.tocify.css" rel="stylesheet"> 
+  <script src="./js/jqueryui/1.11.4/jquery-ui.min.js"></script> 
+  <script src="./js/jquery.tocify/1.9.0/jquery.tocify.js"></script> 
+  <script type="text/javascript">
     $(function () {
         $("#toc").tocify({
             scrollTo: 50,
@@ -734,9 +625,8 @@ table.CodeRay td.code>pre{padding:0}
         });
         $(".fallback-toc").hide();
     });
-</script>
-
-<script type="text/javascript">
+</script> 
+  <script type="text/javascript">
 
   /****
 
@@ -846,9 +736,8 @@ table.CodeRay td.code>pre{padding:0}
 
     ***/
 
-</script>
-
-<script type="text/javascript">
+</script> 
+  <script type="text/javascript">
 
 $(document).ready(function(){
     if("Documentation" === "Articles, Conference Sessions, Podcasts") {
@@ -860,10 +749,8 @@ $(document).ready(function(){
 
 });
 
-</script>
-
-
-<script>
+</script> 
+  <script>
 
 $( document ).ready(function() {
 
@@ -954,7 +841,6 @@ $( document ).ready(function() {
 
 
 });
-</script>
-
-</body>
+</script>  
+ </body>
 </html>

http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/asf.html
----------------------------------------------------------------------
diff --git a/content/asf.html b/content/asf.html
index 6c8eb31..e60ef2e 100644
--- a/content/asf.html
+++ b/content/asf.html
@@ -1,12 +1,10 @@
 <!doctype html>
 <html class="no-js" lang="en">
-<head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-
-    <title>Apache Software Foundation</title>
-
-    <!--
+ <head> 
+  <meta charset="utf-8"> 
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"> 
+  <title>Apache Software Foundation</title> 
+  <!--
         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
@@ -23,31 +21,21 @@
         KIND, either express or implied.  See the License for the
         specific language governing permissions and limitations
         under the License.
-    -->
-
-    <!-- No caching headers -->
-    <meta http-equiv="cache-control" content="no-cache" />
-    <meta http-equiv="pragma" content="no-cache" />
-    <meta http-equiv="expires" content="-1" />
-
-
-    <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
-    <link href="./css/foundation/5.5.1/foundation.css" rel="stylesheet" />
-    <script src="./js/foundation/5.5.1/vendor/modernizr.js"></script>
-    <link href="./css/asciidoctor/colony.css" rel="stylesheet">
-    <link href="./css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-
-
-
-    <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
-    <!--[if lt IE 9]>
+    --> 
+  <!-- No caching headers --> 
+  <meta http-equiv="cache-control" content="no-cache"> 
+  <meta http-equiv="pragma" content="no-cache"> 
+  <meta http-equiv="expires" content="-1"> 
+  <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line --> 
+  <link href="./css/foundation/5.5.1/foundation.css" rel="stylesheet"> 
+  <script src="./js/foundation/5.5.1/vendor/modernizr.js"></script> 
+  <link href="./css/asciidoctor/colony.css" rel="stylesheet"> 
+  <link href="./css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet"> 
+  <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet"> 
+  <!--[if lt IE 9]>
       <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
-    <![endif]-->
-
-
-
-    <style type="text/css">
+    <![endif]--> 
+  <style type="text/css">
         pre code {
             background-color: inherit;
             border-style: none;
@@ -192,9 +180,8 @@ table.CodeRay td.code>pre{padding:0}
         color:#fff;
         font-size: 1.1em;
     }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         @media only screen and (min-width: 40.063em) {
           .top-bar {
             .contain-to-grid .top-bar {
@@ -205,9 +192,8 @@ table.CodeRay td.code>pre{padding:0}
         .row {
             max-width: 80rem;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .extended-quote,
         .extended-quote-first {
             margin-left: 40px;
@@ -231,9 +217,8 @@ table.CodeRay td.code>pre{padding:0}
             text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
         }
         
-    </style>
-
-    <style>
+    </style> 
+  <style>
         body {
           position: relative;
         }
@@ -255,6 +240,7 @@ table.CodeRay td.code>pre{padding:0}
 
         div#doc-content {
             margin-top: 30px;
+            padding-top: 30px;
         }
 
         div.documentation-page table.frame-all {
@@ -286,9 +272,8 @@ table.CodeRay td.code>pre{padding:0}
             min-height: 2000px;
         }
 
-    </style>
-
-    <style>
+    </style> 
+  <style>
 
         @media only screen and (min-width: 768px) {
           #toc.toc2 ul ul { margin-left: -10px; }
@@ -316,15 +301,13 @@ table.CodeRay td.code>pre{padding:0}
         body div#toc2 li.tocify-item.active a {
             color: red;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         footer {
             margin-top: 1000px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* overriding colony.css stylesheet */
         .literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
            /*padding: 1.25em 1.5625em 1.125em 1.5625em;*/
@@ -372,9 +355,8 @@ table.CodeRay td.code>pre{padding:0}
         .imageblock img {
             margin-bottom: 10px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* from http://ben.balter.com/2014/03/13/pages-anchor-links/ */
         .header-link {
           position: absolute;
@@ -395,9 +377,8 @@ table.CodeRay td.code>pre{padding:0}
         h6:hover .header-link {
           opacity: 1;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .top-bar
         {
             -webkit-transition-duration: .5s;
@@ -425,156 +406,98 @@ table.CodeRay td.code>pre{padding:0}
             -webkit-transition-property: -webkit-transform;
             transition-property: transform;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         #doc-content a.guide {
             color: white;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
+        .tocify {
+            margin-top: 80px;
+        }
+    </style> 
+  <style>
         .tocify {
             margin-top: 80px;
         }
-    </style>
-
-
-</script>
-
-</head>
-<body>
-
-<<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
-    <div class="github-fork-ribbon">
-        <a href="https://github.com/apache/isis#fork-destination-box">Fork me on GitHub</a>
-    </div>
-</div>
-
-
-<div class="row">
-
-    <div class="fixed contain-to-grid header">
-        <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
-            <ul class="title-area">
-                <li class="name">
-                    <h1>
-                        <a href="/index.html">Apache Isis&trade;</a>
-                    </h1>
-                </li>
-                <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
-                <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
-            </ul>
-
-            <section class="top-bar-section">
-                <ul class="right">
-
-                    <li class="has-form">
-                       <FORM class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
-                        <div class="row collapse">
-                            <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
-                            <INPUT type="hidden" name="cof" value="FORID:0">
-                            <INPUT class="form-control" name="q" type="text" placeholder="Search">
-                        </div>
-                    </FORM>
-                     </li>
-
-                </ul>
-
-                <!-- Left Nav Section -->
-                <ul class="left">
-
-                    <li><a href="/documentation.html">Documentation</a></li>
-                    <li><a href="/downloads.html">Downloads</a></li>
-                    <li><a href="/help.html">Help</a></li>
-                    <li><a href="/asf.html">@ASF</a></li>
-
-                </ul>
-
-            </section>
-        </nav>
-    </div>
-</div>
-
-<div class="row">
-
-    <div id="doc-content-left" class="large-9 medium-9 columns">
-
-
-        <div id="doc-content">
-          <div class="paragraph">
-<p><br/><br/><br/></p>
-</div>
-<div class="paragraph">
-<p>Apache Software Foundation:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://www.apache.org/">Apache Homepage</a></p>
-</li>
-<li>
-<p><a href="http://www.apache.org/licenses/">Licenses</a></p>
-</li>
-<li>
-<p><a href="http://www.apache.org/security/">Security</a></p>
-</li>
-<li>
-<p><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></p>
-</li>
-<li>
-<p><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></p>
-</li>
-<li>
-<p>PMC board minutes <a href="https://whimsy.apache.org/board/minutes/Isis.html">for Apache Isis</a>, <a href="https://whimsy.apache.org/board/minutes/">for all projects</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>Thanks to companies and other third parties that have in one way or another supported Apache Isis' development:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="./more-thanks.html">More thanks</a></p>
-</li>
-</ul>
-</div>
-        </div>
-
-        <footer>
-          <hr>
-          <p class="small">
-          Copyright &copy; 2010~2016 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0.
-          <br/>
-          Apache, the Apache feather logo, Apache&nbsp;Isis, and the Apache&nbsp;Isis project logo are all trademarks of The&nbsp;Apache&nbsp;Software&nbsp;Foundation.
-          </p>
-        </footer>
-
-    </div>
-
-    <div id="doc-content-right" class="large-3 medium-3 xcolumns">
-        <div id="toc" class="toc2">
-            <div class="fallback-toc">
-                
-            </div>
-        </div>
-    </div>
-
-</div>
-
-
-<script src="./js/foundation/5.5.1/vendor/jquery.js"></script>
-<script src="./js/foundation/5.5.1/foundation.min.js"></script>
-
-
-<link href="./css/jquery.tocify/1.9.0/jquery.tocify.css" rel="stylesheet">
-<script src="./js/jqueryui/1.11.4/jquery-ui.min.js"></script>
-<script src="./js/jquery.tocify/1.9.0/jquery.tocify.js"></script>
-
-
-
-<script type="text/javascript">
+    </style>  
+ </head> 
+ <body> 
+  <div class="row"> 
+   <div class="fixed contain-to-grid header"> 
+    <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem"> 
+     <ul class="title-area"> 
+      <li class="name"> <h1> <a href="/index.html">Apache Isis\u2122</a> </h1> </li> 
+      <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone --> 
+      <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li> 
+     </ul> 
+     <section class="top-bar-section"> 
+      <ul class="right"> 
+       <li class="has-form"> 
+        <form class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse"> 
+         <div class="row collapse"> 
+          <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya"> 
+          <input type="hidden" name="cof" value="FORID:0"> 
+          <input class="form-control" name="q" type="text" placeholder="Search"> 
+         </div> 
+        </form> </li> 
+      </ul> 
+      <!-- Left Nav Section --> 
+      <ul class="left"> 
+       <li><a href="/documentation.html">Documentation</a></li> 
+       <li><a href="/downloads.html">Downloads</a></li> 
+       <li><a href="/help.html">Help</a></li> 
+       <li><a href="/asf.html">@ASF</a></li> 
+      </ul> 
+     </section> 
+    </nav> 
+   </div> 
+  </div> 
+  <div class="row"> 
+   <div id="doc-content-left" class="large-9 medium-9 columns"> 
+    <div id="doc-content">
+     <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/asf.adoc&quot;" style="float: right; font-size: small; padding: 6px;  "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+     <div class="paragraph"> 
+      <p>Apache Software Foundation:</p> 
+     </div> 
+     <div class="ulist"> 
+      <ul> 
+       <li> <p><a href="http://www.apache.org/">Apache Homepage</a></p> </li> 
+       <li> <p><a href="http://www.apache.org/licenses/">Licenses</a></p> </li> 
+       <li> <p><a href="http://www.apache.org/security/">Security</a></p> </li> 
+       <li> <p><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></p> </li> 
+       <li> <p><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></p> </li> 
+       <li> <p>PMC board minutes <a href="https://whimsy.apache.org/board/minutes/Isis.html">for Apache Isis</a>, <a href="https://whimsy.apache.org/board/minutes/">for all projects</a></p> </li> 
+      </ul> 
+     </div> 
+     <div class="paragraph"> 
+      <p>Thanks to companies and other third parties that have in one way or another supported Apache Isis' development:</p> 
+     </div> 
+     <div class="ulist"> 
+      <ul> 
+       <li> <p><a href="./more-thanks.html">More thanks</a></p> </li> 
+      </ul> 
+     </div> 
+    </div> 
+    <footer> 
+     <hr> 
+     <p class="small"> Copyright � 2010~2016 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0. <br> Apache, the Apache feather logo, Apache&nbsp;Isis, and the Apache&nbsp;Isis project logo are all trademarks of The&nbsp;Apache&nbsp;Software&nbsp;Foundation. </p> 
+    </footer> 
+   </div> 
+   <div id="doc-content-right" class="large-3 medium-3 xcolumns"> 
+    <div id="toc" class="toc2"> 
+     <div class="fallback-toc"> 
+     </div> 
+    </div> 
+   </div> 
+  </div> 
+  <script src="./js/foundation/5.5.1/vendor/jquery.js"></script> 
+  <script src="./js/foundation/5.5.1/foundation.min.js"></script> 
+  <link href="./css/jquery.tocify/1.9.0/jquery.tocify.css" rel="stylesheet"> 
+  <script src="./js/jqueryui/1.11.4/jquery-ui.min.js"></script> 
+  <script src="./js/jquery.tocify/1.9.0/jquery.tocify.js"></script> 
+  <script type="text/javascript">
     $(function () {
         $("#toc").tocify({
             scrollTo: 50,
@@ -587,9 +510,8 @@ table.CodeRay td.code>pre{padding:0}
         });
         $(".fallback-toc").hide();
     });
-</script>
-
-<script type="text/javascript">
+</script> 
+  <script type="text/javascript">
 
   /****
 
@@ -699,9 +621,8 @@ table.CodeRay td.code>pre{padding:0}
 
     ***/
 
-</script>
-
-<script type="text/javascript">
+</script> 
+  <script type="text/javascript">
 
 $(document).ready(function(){
     if("Documentation" === "Apache Software Foundation") {
@@ -713,10 +634,8 @@ $(document).ready(function(){
 
 });
 
-</script>
-
-
-<script>
+</script> 
+  <script>
 
 $( document ).ready(function() {
 
@@ -807,7 +726,6 @@ $( document ).ready(function() {
 
 
 });
-</script>
-
-</body>
+</script>  
+ </body>
 </html>

http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/books.html
----------------------------------------------------------------------
diff --git a/content/books.html b/content/books.html
index ef3ef83..46cc806 100644
--- a/content/books.html
+++ b/content/books.html
@@ -1,12 +1,10 @@
 <!doctype html>
 <html class="no-js" lang="en">
-<head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-
-    <title>Books</title>
-
-    <!--
+ <head> 
+  <meta charset="utf-8"> 
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"> 
+  <title>Books</title> 
+  <!--
         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
@@ -23,31 +21,21 @@
         KIND, either express or implied.  See the License for the
         specific language governing permissions and limitations
         under the License.
-    -->
-
-    <!-- No caching headers -->
-    <meta http-equiv="cache-control" content="no-cache" />
-    <meta http-equiv="pragma" content="no-cache" />
-    <meta http-equiv="expires" content="-1" />
-
-
-    <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
-    <link href="./css/foundation/5.5.1/foundation.css" rel="stylesheet" />
-    <script src="./js/foundation/5.5.1/vendor/modernizr.js"></script>
-    <link href="./css/asciidoctor/colony.css" rel="stylesheet">
-    <link href="./css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-
-
-
-    <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
-    <!--[if lt IE 9]>
+    --> 
+  <!-- No caching headers --> 
+  <meta http-equiv="cache-control" content="no-cache"> 
+  <meta http-equiv="pragma" content="no-cache"> 
+  <meta http-equiv="expires" content="-1"> 
+  <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line --> 
+  <link href="./css/foundation/5.5.1/foundation.css" rel="stylesheet"> 
+  <script src="./js/foundation/5.5.1/vendor/modernizr.js"></script> 
+  <link href="./css/asciidoctor/colony.css" rel="stylesheet"> 
+  <link href="./css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet"> 
+  <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet"> 
+  <!--[if lt IE 9]>
       <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
-    <![endif]-->
-
-
-
-    <style type="text/css">
+    <![endif]--> 
+  <style type="text/css">
         pre code {
             background-color: inherit;
             border-style: none;
@@ -192,9 +180,8 @@ table.CodeRay td.code>pre{padding:0}
         color:#fff;
         font-size: 1.1em;
     }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         @media only screen and (min-width: 40.063em) {
           .top-bar {
             .contain-to-grid .top-bar {
@@ -205,9 +192,8 @@ table.CodeRay td.code>pre{padding:0}
         .row {
             max-width: 80rem;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .extended-quote,
         .extended-quote-first {
             margin-left: 40px;
@@ -231,9 +217,8 @@ table.CodeRay td.code>pre{padding:0}
             text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
         }
         
-    </style>
-
-    <style>
+    </style> 
+  <style>
         body {
           position: relative;
         }
@@ -255,6 +240,7 @@ table.CodeRay td.code>pre{padding:0}
 
         div#doc-content {
             margin-top: 30px;
+            padding-top: 30px;
         }
 
         div.documentation-page table.frame-all {
@@ -286,9 +272,8 @@ table.CodeRay td.code>pre{padding:0}
             min-height: 2000px;
         }
 
-    </style>
-
-    <style>
+    </style> 
+  <style>
 
         @media only screen and (min-width: 768px) {
           #toc.toc2 ul ul { margin-left: -10px; }
@@ -316,15 +301,13 @@ table.CodeRay td.code>pre{padding:0}
         body div#toc2 li.tocify-item.active a {
             color: red;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         footer {
             margin-top: 1000px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* overriding colony.css stylesheet */
         .literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
            /*padding: 1.25em 1.5625em 1.125em 1.5625em;*/
@@ -372,9 +355,8 @@ table.CodeRay td.code>pre{padding:0}
         .imageblock img {
             margin-bottom: 10px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* from http://ben.balter.com/2014/03/13/pages-anchor-links/ */
         .header-link {
           position: absolute;
@@ -395,9 +377,8 @@ table.CodeRay td.code>pre{padding:0}
         h6:hover .header-link {
           opacity: 1;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .top-bar
         {
             -webkit-transition-duration: .5s;
@@ -425,222 +406,168 @@ table.CodeRay td.code>pre{padding:0}
             -webkit-transition-property: -webkit-transform;
             transition-property: transform;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         #doc-content a.guide {
             color: white;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
+        .tocify {
+            margin-top: 80px;
+        }
+    </style> 
+  <style>
         .tocify {
             margin-top: 80px;
         }
-    </style>
-
-
-</script>
-
-</head>
-<body>
-
-<<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
-    <div class="github-fork-ribbon">
-        <a href="https://github.com/apache/isis#fork-destination-box">Fork me on GitHub</a>
-    </div>
-</div>
-
-
-<div class="row">
-
-    <div class="fixed contain-to-grid header">
-        <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
-            <ul class="title-area">
-                <li class="name">
-                    <h1>
-                        <a href="/index.html">Apache Isis&trade;</a>
-                    </h1>
-                </li>
-                <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
-                <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
-            </ul>
-
-            <section class="top-bar-section">
-                <ul class="right">
-
-                    <li class="has-form">
-                       <FORM class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
-                        <div class="row collapse">
-                            <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
-                            <INPUT type="hidden" name="cof" value="FORID:0">
-                            <INPUT class="form-control" name="q" type="text" placeholder="Search">
-                        </div>
-                    </FORM>
-                     </li>
-
-                </ul>
-
-                <!-- Left Nav Section -->
-                <ul class="left">
-
-                    <li><a href="/documentation.html">Documentation</a></li>
-                    <li><a href="/downloads.html">Downloads</a></li>
-                    <li><a href="/help.html">Help</a></li>
-                    <li><a href="/asf.html">@ASF</a></li>
-
-                </ul>
-
-            </section>
-        </nav>
-    </div>
-</div>
-
-<div class="row">
-
-    <div id="doc-content-left" class="large-9 medium-9 columns">
-
-
-        <div id="doc-content">
-          <div id="preamble">
-<div class="sectionbody">
-<div class="paragraph">
-<p><br/><br/></p>
-</div>
-<div class="paragraph">
-<p>Although it has evolved since, the <em>Apache Isis</em> framework started out as an open source implementation of the naked objects pattern. Indeed, the generic user interfaces provided by Apache Isis <a href="../../components/viewers/wicket/about.html">Wicket</a> viewer and the <a href="../../components/viewers/restfulobjects/about.html">Restful Objects</a> viewer are both "just" naked objects implementations; the first serves up a default generic representation of domain objects for human interaction, the latter serving up representation intended for machine consumption rather than human beings.</p>
-</div>
-<div class="paragraph">
-<p>If the idea of naked objects is of interest, then there are a couple of books on the topic that you might want to read.</p>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_naked_objects">Naked Objects</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Richard Pawson and Robert Matthews, Wiley 2002</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images//books/nakedobjects-book.jpg"><img src="images//books/nakedobjects-book.jpg" alt="nakedobjects book" width="159px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>This book describes the original ideas of Naked Objects. Although based on a very early version of the framework, it&#8217;s still definitely worth a read (and beautifully produced).</p>
-</div>
-<div class="paragraph">
-<p>Amazon quotes: (avg 5 stars)</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Brilliant argument and toolkit for information systems</p>
-</li>
-<li>
-<p>Most thoughtful and beautiful technical book I have read</p>
-</li>
-<li>
-<p>Excellent presentation of an innovative practical idea</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The book is freely available online <a href="http://www.nakedobjects.org/book/">here</a>. Or, you can get a hardcopy of the book at <a href="http://eu.wiley.com/WileyCDA/WileyTitle/productCd-0470844205.html">Wiley (publisher)</a> and <a href="http://www.amazon.com/Naked-Objects-Richard-Pawson/dp/0470844205">Amazon</a>.</p>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_domain_driven_design_using_naked_objects">Domain Driven Design using Naked Objects</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Dan Haywood, Pragmatic Bookshelf 2009</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images//books/dhnako.jpg"><img src="images//books/dhnako.jpg" alt="dhnako" width="167px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>This more recent book draws the parallel between domain-driven design and Naked Objects (4.0). In the spirit of the Pragmatic Bookshelf, it&#8217;s a practical, hands-on sort of book, building up a case study as it goes and encouraging you to build your own app as you go.</p>
-</div>
-<div class="paragraph">
-<p>Amazon quotes: (avg 4.5 stars)</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Important Contribution to Domain-Driven Design</p>
-</li>
-<li>
-<p>The easy-to-learn Naked Objects Framework .. provide[s] a masterful exposition on DDD</p>
-</li>
-<li>
-<p>Clear and passionate book about a great subject</p>
-</li>
-<li>
-<p>Excellent book and a great framework</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>You can find the book at <a href="http://www.pragprog.com/titles/dhnako/domain-driven-design-using-naked-objects">Pragmatic Bookshelf (publisher)</a> and <a href="http://www.amazon.com/Domain-Driven-Design-Objects-Pragmatic-Programmers/dp/1934356441">Amazon</a>.</p>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_restful_objects_specification">Restful Objects Specification</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Dan Haywood</p>
-</div>
-<div class="paragraph">
-<p>The <a href="http://restfulobjects.org">Restful Objects specification</a> defines a set of RESTful resources, and corresponding JSON representations, for accessing and manipulating a domain object model.</p>
-</div>
-<div class="paragraph">
-<p>This is a comprehensive specification, running to over 200 pages in length. It is implemented by Apache Isis' <a href="../../components/viewers/restfulobjects/about.html">Restful Objects</a> viewer, and is also implemented by another (non-Apache) open source project, <a href="http://nakedobjects.codeplex.com">Naked Objects MVC</a>.</p>
-</div>
-</div>
-</div>
-        </div>
-
-        <footer>
-          <hr>
-          <p class="small">
-          Copyright &copy; 2010~2016 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0.
-          <br/>
-          Apache, the Apache feather logo, Apache&nbsp;Isis, and the Apache&nbsp;Isis project logo are all trademarks of The&nbsp;Apache&nbsp;Software&nbsp;Foundation.
-          </p>
-        </footer>
-
-    </div>
-
-    <div id="doc-content-right" class="large-3 medium-3 xcolumns">
-        <div id="toc" class="toc2">
-            <div class="fallback-toc">
-                <ul class="sectlevel1">
-<li><a href="#_naked_objects">Naked Objects</a></li>
-<li><a href="#_domain_driven_design_using_naked_objects">Domain Driven Design using Naked Objects</a></li>
-<li><a href="#_restful_objects_specification">Restful Objects Specification</a></li>
-</ul>
-            </div>
-        </div>
-    </div>
-
-</div>
-
-
-<script src="./js/foundation/5.5.1/vendor/jquery.js"></script>
-<script src="./js/foundation/5.5.1/foundation.min.js"></script>
-
-
-<link href="./css/jquery.tocify/1.9.0/jquery.tocify.css" rel="stylesheet">
-<script src="./js/jqueryui/1.11.4/jquery-ui.min.js"></script>
-<script src="./js/jquery.tocify/1.9.0/jquery.tocify.js"></script>
-
-
-
-<script type="text/javascript">
+    </style>  
+ </head> 
+ <body> 
+  <div class="row"> 
+   <div class="fixed contain-to-grid header"> 
+    <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem"> 
+     <ul class="title-area"> 
+      <li class="name"> <h1> <a href="/index.html">Apache Isis\u2122</a> </h1> </li> 
+      <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone --> 
+      <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li> 
+     </ul> 
+     <section class="top-bar-section"> 
+      <ul class="right"> 
+       <li class="has-form"> 
+        <form class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse"> 
+         <div class="row collapse"> 
+          <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya"> 
+          <input type="hidden" name="cof" value="FORID:0"> 
+          <input class="form-control" name="q" type="text" placeholder="Search"> 
+         </div> 
+        </form> </li> 
+      </ul> 
+      <!-- Left Nav Section --> 
+      <ul class="left"> 
+       <li><a href="/documentation.html">Documentation</a></li> 
+       <li><a href="/downloads.html">Downloads</a></li> 
+       <li><a href="/help.html">Help</a></li> 
+       <li><a href="/asf.html">@ASF</a></li> 
+      </ul> 
+     </section> 
+    </nav> 
+   </div> 
+  </div> 
+  <div class="row"> 
+   <div id="doc-content-left" class="large-9 medium-9 columns"> 
+    <div id="doc-content">
+     <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/books.adoc&quot;" style="float: right; font-size: small; padding: 6px;  "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+     <div id="preamble"> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>Although it has evolved since, the <em>Apache Isis</em> framework started out as an open source implementation of the naked objects pattern. Indeed, the generic user interfaces provided by Apache Isis <a href="../../components/viewers/wicket/about.html">Wicket</a> viewer and the <a href="../../components/viewers/restfulobjects/about.html">Restful Objects</a> viewer are both "just" naked objects implementations; the first serves up a default generic representation of domain objects for human interaction, the latter serving up representation intended for machine consumption rather than human beings.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>If the idea of naked objects is of interest, then there are a couple of books on the topic that you might want to read.</p> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_naked_objects">Naked Objects</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_naked_objects.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>Richard Pawson and Robert Matthews, Wiley 2002</p> 
+       </div> 
+       <div class="imageblock"> 
+        <div class="content"> 
+         <a class="image" href="images//books/nakedobjects-book.jpg"><img src="images//books/nakedobjects-book.jpg" alt="nakedobjects book" width="159px"></a> 
+        </div> 
+       </div> 
+       <div class="paragraph"> 
+        <p>This book describes the original ideas of Naked Objects. Although based on a very early version of the framework, it\u2019s still definitely worth a read (and beautifully produced).</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>Amazon quotes: (avg 5 stars)</p> 
+       </div> 
+       <div class="ulist"> 
+        <ul> 
+         <li> <p>Brilliant argument and toolkit for information systems</p> </li> 
+         <li> <p>Most thoughtful and beautiful technical book I have read</p> </li> 
+         <li> <p>Excellent presentation of an innovative practical idea</p> </li> 
+        </ul> 
+       </div> 
+       <div class="paragraph"> 
+        <p>The book is freely available online <a href="http://www.nakedobjects.org/book/">here</a>. Or, you can get a hardcopy of the book at <a href="http://eu.wiley.com/WileyCDA/WileyTitle/productCd-0470844205.html">Wiley (publisher)</a> and <a href="http://www.amazon.com/Naked-Objects-Richard-Pawson/dp/0470844205">Amazon</a>.</p> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_domain_driven_design_using_naked_objects">Domain Driven Design using Naked Objects</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_domain_driven_design_using_naked_objects.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>Dan Haywood, Pragmatic Bookshelf 2009</p> 
+       </div> 
+       <div class="imageblock"> 
+        <div class="content"> 
+         <a class="image" href="images//books/dhnako.jpg"><img src="images//books/dhnako.jpg" alt="dhnako" width="167px"></a> 
+        </div> 
+       </div> 
+       <div class="paragraph"> 
+        <p>This more recent book draws the parallel between domain-driven design and Naked Objects (4.0). In the spirit of the Pragmatic Bookshelf, it\u2019s a practical, hands-on sort of book, building up a case study as it goes and encouraging you to build your own app as you go.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>Amazon quotes: (avg 4.5 stars)</p> 
+       </div> 
+       <div class="ulist"> 
+        <ul> 
+         <li> <p>Important Contribution to Domain-Driven Design</p> </li> 
+         <li> <p>The easy-to-learn Naked Objects Framework .. provide[s] a masterful exposition on DDD</p> </li> 
+         <li> <p>Clear and passionate book about a great subject</p> </li> 
+         <li> <p>Excellent book and a great framework</p> </li> 
+        </ul> 
+       </div> 
+       <div class="paragraph"> 
+        <p>You can find the book at <a href="http://www.pragprog.com/titles/dhnako/domain-driven-design-using-naked-objects">Pragmatic Bookshelf (publisher)</a> and <a href="http://www.amazon.com/Domain-Driven-Design-Objects-Pragmatic-Programmers/dp/1934356441">Amazon</a>.</p> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_restful_objects_specification">Restful Objects Specification</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_restful_objects_specification.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>Dan Haywood</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>The <a href="http://restfulobjects.org">Restful Objects specification</a> defines a set of RESTful resources, and corresponding JSON representations, for accessing and manipulating a domain object model.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>This is a comprehensive specification, running to over 200 pages in length. It is implemented by Apache Isis' <a href="../../components/viewers/restfulobjects/about.html">Restful Objects</a> viewer, and is also implemented by another (non-Apache) open source project, <a href="http://nakedobjects.codeplex.com">Naked Objects MVC</a>.</p> 
+       </div> 
+      </div> 
+     </div> 
+    </div> 
+    <footer> 
+     <hr> 
+     <p class="small"> Copyright � 2010~2016 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0. <br> Apache, the Apache feather logo, Apache&nbsp;Isis, and the Apache&nbsp;Isis project logo are all trademarks of The&nbsp;Apache&nbsp;Software&nbsp;Foundation. </p> 
+    </footer> 
+   </div> 
+   <div id="doc-content-right" class="large-3 medium-3 xcolumns"> 
+    <div id="toc" class="toc2"> 
+     <div class="fallback-toc"> 
+      <ul class="sectlevel1"> 
+       <li><a href="#_naked_objects">Naked Objects</a></li> 
+       <li><a href="#_domain_driven_design_using_naked_objects">Domain Driven Design using Naked Objects</a></li> 
+       <li><a href="#_restful_objects_specification">Restful Objects Specification</a></li> 
+      </ul> 
+     </div> 
+    </div> 
+   </div> 
+  </div> 
+  <script src="./js/foundation/5.5.1/vendor/jquery.js"></script> 
+  <script src="./js/foundation/5.5.1/foundation.min.js"></script> 
+  <link href="./css/jquery.tocify/1.9.0/jquery.tocify.css" rel="stylesheet"> 
+  <script src="./js/jqueryui/1.11.4/jquery-ui.min.js"></script> 
+  <script src="./js/jquery.tocify/1.9.0/jquery.tocify.js"></script> 
+  <script type="text/javascript">
     $(function () {
         $("#toc").tocify({
             scrollTo: 50,
@@ -653,9 +580,8 @@ table.CodeRay td.code>pre{padding:0}
         });
         $(".fallback-toc").hide();
     });
-</script>
-
-<script type="text/javascript">
+</script> 
+  <script type="text/javascript">
 
   /****
 
@@ -765,9 +691,8 @@ table.CodeRay td.code>pre{padding:0}
 
     ***/
 
-</script>
-
-<script type="text/javascript">
+</script> 
+  <script type="text/javascript">
 
 $(document).ready(function(){
     if("Documentation" === "Books") {
@@ -779,10 +704,8 @@ $(document).ready(function(){
 
 });
 
-</script>
-
-
-<script>
+</script> 
+  <script>
 
 $( document ).ready(function() {
 
@@ -873,7 +796,6 @@ $( document ).ready(function() {
 
 
 });
-</script>
-
-</body>
+</script>  
+ </body>
 </html>

http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/cheat-sheet.html
----------------------------------------------------------------------
diff --git a/content/cheat-sheet.html b/content/cheat-sheet.html
index 424f102..0dab7bf 100644
--- a/content/cheat-sheet.html
+++ b/content/cheat-sheet.html
@@ -1,12 +1,10 @@
 <!doctype html>
 <html class="no-js" lang="en">
-<head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-
-    <title>Cheat Sheet</title>
-
-    <!--
+ <head> 
+  <meta charset="utf-8"> 
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"> 
+  <title>Cheat Sheet</title> 
+  <!--
         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
@@ -23,31 +21,21 @@
         KIND, either express or implied.  See the License for the
         specific language governing permissions and limitations
         under the License.
-    -->
-
-    <!-- No caching headers -->
-    <meta http-equiv="cache-control" content="no-cache" />
-    <meta http-equiv="pragma" content="no-cache" />
-    <meta http-equiv="expires" content="-1" />
-
-
-    <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
-    <link href="./css/foundation/5.5.1/foundation.css" rel="stylesheet" />
-    <script src="./js/foundation/5.5.1/vendor/modernizr.js"></script>
-    <link href="./css/asciidoctor/colony.css" rel="stylesheet">
-    <link href="./css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-
-
-
-    <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
-    <!--[if lt IE 9]>
+    --> 
+  <!-- No caching headers --> 
+  <meta http-equiv="cache-control" content="no-cache"> 
+  <meta http-equiv="pragma" content="no-cache"> 
+  <meta http-equiv="expires" content="-1"> 
+  <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line --> 
+  <link href="./css/foundation/5.5.1/foundation.css" rel="stylesheet"> 
+  <script src="./js/foundation/5.5.1/vendor/modernizr.js"></script> 
+  <link href="./css/asciidoctor/colony.css" rel="stylesheet"> 
+  <link href="./css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet"> 
+  <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet"> 
+  <!--[if lt IE 9]>
       <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
-    <![endif]-->
-
-
-
-    <style type="text/css">
+    <![endif]--> 
+  <style type="text/css">
         pre code {
             background-color: inherit;
             border-style: none;
@@ -192,9 +180,8 @@ table.CodeRay td.code>pre{padding:0}
         color:#fff;
         font-size: 1.1em;
     }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         @media only screen and (min-width: 40.063em) {
           .top-bar {
             .contain-to-grid .top-bar {
@@ -205,9 +192,8 @@ table.CodeRay td.code>pre{padding:0}
         .row {
             max-width: 80rem;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .extended-quote,
         .extended-quote-first {
             margin-left: 40px;
@@ -231,9 +217,8 @@ table.CodeRay td.code>pre{padding:0}
             text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
         }
         
-    </style>
-
-    <style>
+    </style> 
+  <style>
         body {
           position: relative;
         }
@@ -255,6 +240,7 @@ table.CodeRay td.code>pre{padding:0}
 
         div#doc-content {
             margin-top: 30px;
+            padding-top: 30px;
         }
 
         div.documentation-page table.frame-all {
@@ -286,9 +272,8 @@ table.CodeRay td.code>pre{padding:0}
             min-height: 2000px;
         }
 
-    </style>
-
-    <style>
+    </style> 
+  <style>
 
         @media only screen and (min-width: 768px) {
           #toc.toc2 ul ul { margin-left: -10px; }
@@ -316,15 +301,13 @@ table.CodeRay td.code>pre{padding:0}
         body div#toc2 li.tocify-item.active a {
             color: red;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         footer {
             margin-top: 1000px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* overriding colony.css stylesheet */
         .literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
            /*padding: 1.25em 1.5625em 1.125em 1.5625em;*/
@@ -372,9 +355,8 @@ table.CodeRay td.code>pre{padding:0}
         .imageblock img {
             margin-bottom: 10px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* from http://ben.balter.com/2014/03/13/pages-anchor-links/ */
         .header-link {
           position: absolute;
@@ -395,9 +377,8 @@ table.CodeRay td.code>pre{padding:0}
         h6:hover .header-link {
           opacity: 1;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .top-bar
         {
             -webkit-transition-duration: .5s;
@@ -425,138 +406,94 @@ table.CodeRay td.code>pre{padding:0}
             -webkit-transition-property: -webkit-transform;
             transition-property: transform;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         #doc-content a.guide {
             color: white;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .tocify {
             margin-top: 80px;
         }
-    </style>
-
-
-</script>
-
-</head>
-<body>
-
-<<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
-    <div class="github-fork-ribbon">
-        <a href="https://github.com/apache/isis#fork-destination-box">Fork me on GitHub</a>
-    </div>
-</div>
-
-
-<div class="row">
-
-    <div class="fixed contain-to-grid header">
-        <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
-            <ul class="title-area">
-                <li class="name">
-                    <h1>
-                        <a href="/index.html">Apache Isis&trade;</a>
-                    </h1>
-                </li>
-                <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
-                <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
-            </ul>
-
-            <section class="top-bar-section">
-                <ul class="right">
-
-                    <li class="has-form">
-                       <FORM class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
-                        <div class="row collapse">
-                            <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
-                            <INPUT type="hidden" name="cof" value="FORID:0">
-                            <INPUT class="form-control" name="q" type="text" placeholder="Search">
-                        </div>
-                    </FORM>
-                     </li>
-
-                </ul>
-
-                <!-- Left Nav Section -->
-                <ul class="left">
-
-                    <li><a href="/documentation.html">Documentation</a></li>
-                    <li><a href="/downloads.html">Downloads</a></li>
-                    <li><a href="/help.html">Help</a></li>
-                    <li><a href="/asf.html">@ASF</a></li>
-
-                </ul>
-
-            </section>
-        </nav>
-    </div>
-</div>
-
-<div class="row">
-
-    <div id="doc-content-left" class="large-9 medium-9 columns">
-
-
-        <div id="doc-content">
-          <div class="paragraph">
-<p><br/><br/></p>
-</div>
-<div class="paragraph">
-<p>This "one-pager" cheat sheet summarises the main programming conventions to follow when writing an Apache Isis application.</p>
-</div>
-<div class="paragraph">
-<p><br/></p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="resources/cheat-sheets/IsisCheatSheet.pdf"><img src="images/cheat-sheets/cover.png" alt="cover" width="800px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p><br/></p>
-</div>
-<div class="paragraph">
-<p>You can download the cheat sheet as either a <a href="resources/cheat-sheets/IsisCheatSheet.pdf">Acrobat PDF</a> or as an <a href="resources/cheat-sheets/IsisCheatSheet.docx">MS Word .docx</a> file.</p>
-</div>
-        </div>
-
-        <footer>
-          <hr>
-          <p class="small">
-          Copyright &copy; 2010~2016 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0.
-          <br/>
-          Apache, the Apache feather logo, Apache&nbsp;Isis, and the Apache&nbsp;Isis project logo are all trademarks of The&nbsp;Apache&nbsp;Software&nbsp;Foundation.
-          </p>
-        </footer>
-
-    </div>
-
-    <div id="doc-content-right" class="large-3 medium-3 xcolumns">
-        <div id="toc" class="toc2">
-            <div class="fallback-toc">
-                
-            </div>
-        </div>
-    </div>
-
-</div>
-
-
-<script src="./js/foundation/5.5.1/vendor/jquery.js"></script>
-<script src="./js/foundation/5.5.1/foundation.min.js"></script>
-
-
-<link href="./css/jquery.tocify/1.9.0/jquery.tocify.css" rel="stylesheet">
-<script src="./js/jqueryui/1.11.4/jquery-ui.min.js"></script>
-<script src="./js/jquery.tocify/1.9.0/jquery.tocify.js"></script>
-
-
-
-<script type="text/javascript">
+    </style> 
+  <style>
+        .tocify {
+            margin-top: 80px;
+        }
+    </style>  
+ </head> 
+ <body> 
+  <div class="row"> 
+   <div class="fixed contain-to-grid header"> 
+    <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem"> 
+     <ul class="title-area"> 
+      <li class="name"> <h1> <a href="/index.html">Apache Isis\u2122</a> </h1> </li> 
+      <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone --> 
+      <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li> 
+     </ul> 
+     <section class="top-bar-section"> 
+      <ul class="right"> 
+       <li class="has-form"> 
+        <form class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse"> 
+         <div class="row collapse"> 
+          <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya"> 
+          <input type="hidden" name="cof" value="FORID:0"> 
+          <input class="form-control" name="q" type="text" placeholder="Search"> 
+         </div> 
+        </form> </li> 
+      </ul> 
+      <!-- Left Nav Section --> 
+      <ul class="left"> 
+       <li><a href="/documentation.html">Documentation</a></li> 
+       <li><a href="/downloads.html">Downloads</a></li> 
+       <li><a href="/help.html">Help</a></li> 
+       <li><a href="/asf.html">@ASF</a></li> 
+      </ul> 
+     </section> 
+    </nav> 
+   </div> 
+  </div> 
+  <div class="row"> 
+   <div id="doc-content-left" class="large-9 medium-9 columns"> 
+    <div id="doc-content">
+     <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/cheat-sheet.adoc&quot;" style="float: right; font-size: small; padding: 6px;  "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+     <div class="paragraph"> 
+      <p>This "one-pager" cheat sheet summarises the main programming conventions to follow when writing an Apache Isis application.</p> 
+     </div> 
+     <div class="paragraph"> 
+      <p><br></p> 
+     </div> 
+     <div class="imageblock"> 
+      <div class="content"> 
+       <a class="image" href="resources/cheat-sheets/IsisCheatSheet.pdf"><img src="images/cheat-sheets/cover.png" alt="cover" width="800px"></a> 
+      </div> 
+     </div> 
+     <div class="paragraph"> 
+      <p><br></p> 
+     </div> 
+     <div class="paragraph"> 
+      <p>You can download the cheat sheet as either a <a href="resources/cheat-sheets/IsisCheatSheet.pdf">Acrobat PDF</a> or as an <a href="resources/cheat-sheets/IsisCheatSheet.docx">MS Word .docx</a> file.</p> 
+     </div> 
+    </div> 
+    <footer> 
+     <hr> 
+     <p class="small"> Copyright � 2010~2016 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0. <br> Apache, the Apache feather logo, Apache&nbsp;Isis, and the Apache&nbsp;Isis project logo are all trademarks of The&nbsp;Apache&nbsp;Software&nbsp;Foundation. </p> 
+    </footer> 
+   </div> 
+   <div id="doc-content-right" class="large-3 medium-3 xcolumns"> 
+    <div id="toc" class="toc2"> 
+     <div class="fallback-toc"> 
+     </div> 
+    </div> 
+   </div> 
+  </div> 
+  <script src="./js/foundation/5.5.1/vendor/jquery.js"></script> 
+  <script src="./js/foundation/5.5.1/foundation.min.js"></script> 
+  <link href="./css/jquery.tocify/1.9.0/jquery.tocify.css" rel="stylesheet"> 
+  <script src="./js/jqueryui/1.11.4/jquery-ui.min.js"></script> 
+  <script src="./js/jquery.tocify/1.9.0/jquery.tocify.js"></script> 
+  <script type="text/javascript">
     $(function () {
         $("#toc").tocify({
             scrollTo: 50,
@@ -569,9 +506,8 @@ table.CodeRay td.code>pre{padding:0}
         });
         $(".fallback-toc").hide();
     });
-</script>
-
-<script type="text/javascript">
+</script> 
+  <script type="text/javascript">
 
   /****
 
@@ -681,9 +617,8 @@ table.CodeRay td.code>pre{padding:0}
 
     ***/
 
-</script>
-
-<script type="text/javascript">
+</script> 
+  <script type="text/javascript">
 
 $(document).ready(function(){
     if("Documentation" === "Cheat Sheet") {
@@ -695,10 +630,8 @@ $(document).ready(function(){
 
 });
 
-</script>
-
-
-<script>
+</script> 
+  <script>
 
 $( document ).ready(function() {
 
@@ -789,7 +722,6 @@ $( document ).ready(function() {
 
 
 });
-</script>
-
-</body>
+</script>  
+ </body>
 </html>


[21/44] isis-site git commit: ISIS-1594: provide an 'edit' button

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/guides/ugfun.html
----------------------------------------------------------------------
diff --git a/content/guides/ugfun.html b/content/guides/ugfun.html
index 4025855..f1610ad 100644
--- a/content/guides/ugfun.html
+++ b/content/guides/ugfun.html
@@ -1,12 +1,10 @@
 <!doctype html>
 <html class="no-js" lang="en">
-<head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-
-    <title>Fundamentals</title>
-
-    <!--
+ <head> 
+  <meta charset="utf-8"> 
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"> 
+  <title>Fundamentals</title> 
+  <!--
         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
@@ -23,31 +21,21 @@
         KIND, either express or implied.  See the License for the
         specific language governing permissions and limitations
         under the License.
-    -->
-
-    <!-- No caching headers -->
-    <meta http-equiv="cache-control" content="no-cache" />
-    <meta http-equiv="pragma" content="no-cache" />
-    <meta http-equiv="expires" content="-1" />
-
-
-    <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
-    <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet" />
-    <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script>
-    <link href="../css/asciidoctor/colony.css" rel="stylesheet">
-    <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-
-
-
-    <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
-    <!--[if lt IE 9]>
+    --> 
+  <!-- No caching headers --> 
+  <meta http-equiv="cache-control" content="no-cache"> 
+  <meta http-equiv="pragma" content="no-cache"> 
+  <meta http-equiv="expires" content="-1"> 
+  <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line --> 
+  <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet"> 
+  <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script> 
+  <link href="../css/asciidoctor/colony.css" rel="stylesheet"> 
+  <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet"> 
+  <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet"> 
+  <!--[if lt IE 9]>
       <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
-    <![endif]-->
-
-
-
-    <style type="text/css">
+    <![endif]--> 
+  <style type="text/css">
         pre code {
             background-color: inherit;
             border-style: none;
@@ -192,9 +180,8 @@ table.CodeRay td.code>pre{padding:0}
         color:#fff;
         font-size: 1.1em;
     }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         @media only screen and (min-width: 40.063em) {
           .top-bar {
             .contain-to-grid .top-bar {
@@ -205,9 +192,8 @@ table.CodeRay td.code>pre{padding:0}
         .row {
             max-width: 80rem;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .extended-quote,
         .extended-quote-first {
             margin-left: 40px;
@@ -231,9 +217,8 @@ table.CodeRay td.code>pre{padding:0}
             text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
         }
         
-    </style>
-
-    <style>
+    </style> 
+  <style>
         body {
           position: relative;
         }
@@ -255,6 +240,7 @@ table.CodeRay td.code>pre{padding:0}
 
         div#doc-content {
             margin-top: 30px;
+            padding-top: 30px;
         }
 
         div.documentation-page table.frame-all {
@@ -286,9 +272,8 @@ table.CodeRay td.code>pre{padding:0}
             min-height: 2000px;
         }
 
-    </style>
-
-    <style>
+    </style> 
+  <style>
 
         @media only screen and (min-width: 768px) {
           #toc.toc2 ul ul { margin-left: -10px; }
@@ -316,15 +301,13 @@ table.CodeRay td.code>pre{padding:0}
         body div#toc2 li.tocify-item.active a {
             color: red;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         footer {
             margin-top: 1000px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* overriding colony.css stylesheet */
         .literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
            /*padding: 1.25em 1.5625em 1.125em 1.5625em;*/
@@ -372,9 +355,8 @@ table.CodeRay td.code>pre{padding:0}
         .imageblock img {
             margin-bottom: 10px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* from http://ben.balter.com/2014/03/13/pages-anchor-links/ */
         .header-link {
           position: absolute;
@@ -395,9 +377,8 @@ table.CodeRay td.code>pre{padding:0}
         h6:hover .header-link {
           opacity: 1;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .top-bar
         {
             -webkit-transition-duration: .5s;
@@ -425,1843 +406,1485 @@ table.CodeRay td.code>pre{padding:0}
             -webkit-transition-property: -webkit-transform;
             transition-property: transform;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         #doc-content a.guide {
             color: white;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
+        .tocify {
+            margin-top: 80px;
+        }
+    </style> 
+  <style>
         .tocify {
             margin-top: 80px;
         }
-    </style>
-
-
-</script>
-
-</head>
-<body>
-
-<<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
-    <div class="github-fork-ribbon">
-        <a href="https://github.com/apache/isis#fork-destination-box">Fork me on GitHub</a>
-    </div>
-</div>
-
-
-<div class="row">
-
-    <div class="fixed contain-to-grid header">
-        <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
-            <ul class="title-area">
-                <li class="name">
-                    <h1>
-                        <a href="/index.html">Apache Isis&trade;</a>
-                    </h1>
-                </li>
-                <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
-                <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
-            </ul>
-
-            <section class="top-bar-section">
-                <ul class="right">
-
-                    <li class="has-form">
-                       <FORM class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
-                        <div class="row collapse">
-                            <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
-                            <INPUT type="hidden" name="cof" value="FORID:0">
-                            <INPUT class="form-control" name="q" type="text" placeholder="Search">
-                        </div>
-                    </FORM>
-                     </li>
-
-                </ul>
-
-                <!-- Left Nav Section -->
-                <ul class="left">
-
-                    <li><a href="/documentation.html">Documentation</a></li>
-                    <li><a href="/downloads.html">Downloads</a></li>
-                    <li><a href="/help.html">Help</a></li>
-                    <li><a href="/asf.html">@ASF</a></li>
-
-                </ul>
-
-            </section>
-        </nav>
-    </div>
-</div>
-
-<div class="row">
-
-    <div id="doc-content-left" class="large-9 medium-9 columns">
-
-
-        <div id="doc-content">
-          <div class="sect1">
-<h2 id="_ugfun">1. Fundamentals</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>This guide introduces the <a href="#_ugfun_core-concepts">core concepts</a> and ideas behind Apache Isis,
-and tells you how to <a href="#_ugfun_getting-started">get started</a> with a Maven archetype.</p>
-</div>
-<div class="paragraph">
-<p>It also describes a number of <a href="#_ugfun_how-tos">how-to</a>s, describes how to influence the
-<a href="#_ugfun_object-layout">UI layout</a> of your domain objects (this is ultimately just a type of metadata), and it
- catalogues various <a href="#_ugfun_faqs.adoc">FAQ</a>s.</p>
-</div>
-<div class="sect2">
-<h3 id="_other_guides">1.1. Other Guides</h3>
-<div class="paragraph">
-<p>Apache Isis documentation is broken out into a number of user, reference and "supporting procedures" guides.</p>
-</div>
-<div class="paragraph">
-<p>The user guides available are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="#">Fundamentals</a> (this guide)</p>
-</li>
-<li>
-<p><a href="ugvw.html">Wicket viewer</a></p>
-</li>
-<li>
-<p><a href="ugvro.html">Restful Objects viewer</a></p>
-</li>
-<li>
-<p><a href="ugdno.html">DataNucleus object store</a></p>
-</li>
-<li>
-<p><a href="ugsec.html">Security</a></p>
-</li>
-<li>
-<p><a href="ugtst.html">Testing</a></p>
-</li>
-<li>
-<p><a href="ugbtb.html">Beyond the Basics</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The reference guides are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="rgant.html">Annotations</a></p>
-</li>
-<li>
-<p><a href="rgsvc.html">Domain Services</a></p>
-</li>
-<li>
-<p><a href="rgcfg.html">Configuration Properties</a></p>
-</li>
-<li>
-<p><a href="rgcms.html">Classes, Methods and Schema</a></p>
-</li>
-<li>
-<p><a href="rgmvn.html">Apache Isis Maven plugin</a></p>
-</li>
-<li>
-<p><a href="rgfis.html">Framework Internal Services</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The remaining guides are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="dg.html">Developers' Guide</a> (how to set up a development environment
-for Apache Isis and contribute back to the project)</p>
-</li>
-<li>
-<p><a href="cgcom.html">Committers' Guide</a> (release procedures and related practices)</p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_ugfun_core-concepts">2. Core Concepts</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>This introductory chapter should give you a good about what Apache Isis actually <strong>is</strong>: the fundamental ideas and principles that it builds upon, how it compares with other frameworks, what the fundamental building blocks are for actually writing an Isis application, and what services and features the framework provides for you to leverage in your own apps.</p>
-</div>
-<div class="admonitionblock tip">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-tip" title="Tip"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>Parts of this chapter have been adapted from Dan Haywood&#8217;s 2009 book, 'Domain Driven Design using Naked Objects'.  We&#8217;ve also added some new insights and made sure the material we&#8217;ve used is relevant to Apache Isis.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="sect2">
-<h3 id="_ugfun_core-concepts_philosophy">2.1. Philosophy and Architecture</h3>
-<div class="paragraph">
-<p>This section describes some of the core ideas and architectural patterns upon which Apache Isis builds.</p>
-</div>
-<div class="sect3">
-<h4 id="_ugfun_core-concepts_philosophy_domain-driven-design">2.1.1. Domain-Driven Design</h4>
-<div class="paragraph">
-<p>There&#8217;s no doubt that we developers love the challenge of understanding and deploying complex technologies. But understanding the nuances and subtleties of the business domain itself is just as great a challenge, perhaps more so. If we devoted our efforts to understanding and addressing those subtleties, we could build better, cleaner, and more maintainable software that did a better job for our stakeholders. And there&#8217;s no doubt that our stakeholders would thank us for it.</p>
-</div>
-<div class="paragraph">
-<p>A couple of years back Eric Evans wrote his book <a href="http://www.amazon.co.uk/Domain-driven-Design-Tackling-Complexity-Software/dp/0321125215">Domain-Driven Design</a>, which is well on its way to becoming a seminal work. In fact, most if not all of the ideas in Evans' book have been expressed before, but what he did was pull those ideas together to show how predominantly object-oriented techniques can be used to develop rich, deep, insightful, and ultimately useful business applications.</p>
-</div>
-<div class="paragraph">
-<p>There are two central ideas at the heart of domain-driven design.</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>the <strong><em>ubiquitous language</em></strong> is about getting the whole team (both domain experts and developers) to communicate more transparently using a domain model.</p>
-</li>
-<li>
-<p>Meanwhile, <strong><em>model-driven design</em></strong> is about capturing that model in a very straightforward manner in code.</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>Let&#8217;s look at each in turn.</p>
-</div>
-<div class="sect4">
-<h5 id="_ugfun_core-concepts_philosophy_domain-driven-design_ubiquitous-language">Ubiquitous Language</h5>
-<div class="paragraph">
-<p>It&#8217;s no secret that the IT industry is plagued by project failures. Too often systems take longer than intended to implement, and when finally implemented, they don&#8217;t address the real requirements anyway.</p>
-</div>
-<div class="paragraph">
-<p>Over the years we in IT have tried various approaches to address this failing. Using waterfall methodologies, we&#8217;ve asked for requirements to be fully and precisely written down before starting on anything else. Or, using agile methodologies, we&#8217;ve realized that requirements are likely to change anyway and have sought to deliver systems incrementally using feedback loops to refine the implementation.</p>
-</div>
-<div class="paragraph">
-<p>But let&#8217;s not get distracted talking about methodologies. At the end of the day what really matters is communication between the domain experts (that is, the business) who need the system and the techies actually implementing it. If the two don&#8217;t have and cannot evolve a shared understanding of what is required, then the chance of delivering a useful system will be next to nothing.</p>
-</div>
-<div class="paragraph">
-<p>Bridging this gap is traditionally what business analysts are for; they act as interpreters between the domain experts and the developers. However, this still means there are two (or more) languages in use, making it difficult to verify that the system being built is correct. If the analyst mistranslates a requirement, then neither the domain expert nor the application developer will discover this until (at best) the application is first demonstrated or (much worse) an end user sounds the alarm once the application has been deployed into production.</p>
-</div>
-<div class="paragraph">
-<p>Rather than trying to translate between a business language and a technical language, with  <em>DDD</em> we aim to have the business and developers using the same terms for the same concepts in order to create a single <strong><em>domain model</em></strong>. This domain model identifies the relevant concepts of the domain, how they relate, and ultimately where the responsibilities are. This single domain model provides the vocabulary for the  ubiquitous language for our system.</p>
-</div>
-<div class="sidebarblock">
-<div class="content">
-<div class="title">Ubiquitous Language</div>
-<div class="paragraph">
-<p>Build a common language between the domain experts and developers by using the concepts of the domain model as the primary means of communication. Use the terms in speech, in diagrams, in writing, and when presenting.</p>
-</div>
-<div class="paragraph">
-<p>If an idea cannot be expressed using this set of concepts, then go back and extend the model. Look for and remove ambiguities and inconsistencies.</p>
-</div>
-</div>
-</div>
-<div class="paragraph">
-<p>Creating a  ubiquitous language calls upon everyone involved in the system&#8217;s development to express what they are doing through the vocabulary provided by the model. If this can&#8217;t be done, then our model is incomplete. Finding the missing words deepens our understanding of the domain being modeled.</p>
-</div>
-<div class="paragraph">
-<p>This might sound like nothing more than me insisting that the developers shouldn&#8217;t use jargon when talking to the business. Well, that&#8217;s true enough, but it&#8217;s not a one-way street. A  <strong>ubiquitous language</strong> demands that the developers work hard to understand the problem domain, but it also demands that the business works hard in being  <strong>precise</strong> in its naming and descriptions of those concepts. After all, ultimately the developers will have to express those concepts in a computer programming language.</p>
-</div>
-<div class="paragraph">
-<p>Also, although here I&#8217;m talking about the "domain experts" as being a homogeneous group of people, often they may come from different branches of the business. Even if we weren&#8217;t building a computer system, there&#8217;s a lot of value in helping the domain experts standardize their own terminology. Is the marketing department&#8217;s "prospect" the same as sales' "customer," and is that the same as an after-sales "contract"?</p>
-</div>
-<div class="paragraph">
-<p>The need for precision within the  ubiquitous language also helps us scope the system. Most business processes evolve piecemeal and are often quite ill-defined. If the domain experts have a very good idea of what the business process should be, then that&#8217;s a good candidate for automation, that is, including it in the scope of the system. But if the domain experts find it hard to agree, then it&#8217;s probably best to leave it out. After all, human beings are rather more capable of dealing with fuzzy situations than computers.</p>
-</div>
-<div class="paragraph">
-<p>So, if the development team (business and developers together) continually searches to build their  ubiquitous language, then the domain model naturally becomes richer as the nuances of the domain are uncovered. At the same time, the knowledge of the business domain experts also deepens as edge conditions and contradictions that have previously been overlooked are explored.</p>
-</div>
-<div class="paragraph">
-<p>We use the  ubiquitous language to build up a domain model. But what do we do  <strong>with</strong> that model? The answer to that is the second of our central ideas.</p>
-</div>
-</div>
-<div class="sect4">
-<h5 id="_model_driven_design">Model-Driven Design</h5>
-<div class="paragraph">
-<p>Of the various methodologies that the IT industry has tried, many advocate the production of separate analysis models and implementation models. One example (from the mid 2000s) was that of the  <em>OMG</em>'s Model-Driven Architecture ( <em>MDA</em>) initiative, with its platform-independent model (the  <em>PIM</em>) and a platform-specific model (the  <em>PSM</em>).</p>
-</div>
-<div class="paragraph">
-<p>Bah and humbug! If we use our  ubiquitous language just to build up a high-level analysis model, then we will re-create the communication divide. The domain experts and business analysts will look only to the analysis model, and the developers will look only to the implementation model. Unless the mapping between the two is completely mechanical, inevitably the two will diverge.</p>
-</div>
-<div class="paragraph">
-<p>What do we mean by  <strong>model</strong> anyway? For some, the term will bring to mind  UML class or sequence diagrams and the like. But this isn&#8217;t a model; it&#8217;s a visual  <strong>representation</strong> of some aspect of a model. No, a domain model is a group of related concepts, identifying them, naming them, and defining how they relate. What is in the model depends on what our objective is. We&#8217;re not looking to simply model everything that&#8217;s out there in the real world. Instead, we want to take a relevant abstraction or simplification of it and then make it do something useful for us.  A model is neither right nor wrong, just more or less useful.</p>
-</div>
-<div class="paragraph">
-<p>For our  ubiquitous language to have value, the domain model that encodes it must have a straightforward, literal representation to the design of the software, specifically to the implementation. Our software&#8217;s design should be driven by this model; we should have a model-driven design.</p>
-</div>
-<div class="sidebarblock">
-<div class="content">
-<div class="title">Model-Driven Design</div>
-<div class="paragraph">
-<p>There must be a straightforward and very literal way to represent the domain model in terms of software. The model should balance these two requirements: form the  ubiquitous language of the development team and be representable in code.</p>
-</div>
-<div class="paragraph">
-<p>Changing the code means changing the model; refining the model requires a change to the code.</p>
-</div>
-</div>
-</div>
-<div class="paragraph">
-<p>Here also the word  <strong>design</strong> might mislead; some might be thinking of design documents and design diagrams, or perhaps of user interface (UX) design. But by  <strong>design</strong> we mean a way of organizing the domain concepts, which in turn leads to the way in which we organize their representation in code.</p>
-</div>
-<div class="paragraph">
-<p>Luckily, using <strong><em>object-oriented</em></strong> (<em>OO</em>) languages such as Java, this is relatively easy to do;  <em>OO</em> is based on a modeling paradigm anyway. We can express domain concepts using classes and interfaces, and we can express the relationships between those concepts using associations.</p>
-</div>
-<div class="paragraph">
-<p>So far so good. Or maybe, so far so much motherhood and apple pie. Understanding the  <em>DDD</em> concepts isn&#8217;t the same as being able to apply them, and some of the  <em>DDD</em> ideas can be difficult to put into practice. Time to discuss the naked objects pattern and how it eases that path by applying these central ideas of <em>DDD</em> in a very concrete way.</p>
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_ugfun_core-concepts_philosophy_naked-objects-pattern">2.1.2. Naked Objects Pattern</h4>
-<div class="paragraph">
-<p>Apache Isis implements the naked objects pattern, originally formulated by Richard Pawson.  So who better than Richard to explain the origination of the idea?</p>
-</div>
-<div class="paragraph">
-<p><div class="extended-quote-first"><p>The Naked Objects pattern arose, at least in part, from my own frustration at the lack of success of the domain-driven approach. Good examples were hard to find&#8212;&#8203;as they are still.
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><div class="extended-quote"><p>A common complaint from <em>DDD</em> practitioners was that it was hard to gain enough commitment from business stakeholders, or even to engage them at all. My own experience suggested that it was nearly impossible to engage business managers with UML diagrams.  It was much easier to engage them in rapid prototyping&#8201;&#8212;&#8201;where they could see and interact with the results&#8201;&#8212;&#8201;but most forms of rapid prototyping concentrate on the presentation layer, often at the expense of the underlying model and certainly at the expense of abstract thinking.
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><div class="extended-quote"><p>Even if you could engage the business sponsors sufficiently to design a domain model, by the time you&#8217;d finished developing the system on top of the domain model, most of its benefits had disappeared. It&#8217;s all very well creating an agile domain object model, but if any change to that model also dictates the modification of one or more layers underneath it (dealing with persistence) and multiple layers on top (dealing with presentation), then that agility is practically worthless.
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><div class="extended-quote"><p>The other concern that gave rise to the birth of Naked Objects was how to make user interfaces of mainstream business systems more "expressive"&#8201;&#8212;&#8201;how to make them feel more like using a drawing program or <em>CAD</em> system. Most business systems are not at all expressive; they treat the user merely as a dumb <strong>process-follower</strong>, rather than as an empowered <strong>problem-solver</strong>.  Even the so-called usability experts had little to say on the subject: try finding the word "empowerment" or any synonym thereof in the index of any book on usability. Research had demonstrated that the best way to achieve expressiveness was to create an object-oriented user interface (<em>OOUI</em>). In practice, though, <em>OOUI</em>s were notoriously hard to develop.
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><div class="extended-quote"><p>Sometime in the late 1990s, it dawned on me that if the domain model really did represent the "ubiquitous language" of the business and those domain objects were behaviorally rich (that is, business logic is encapsulated as methods on the domain objects rather than in procedural scripts on top of them), then the <em>UI</em> could be nothing more than a reflection of the user interface. This would solve both of my concerns. It would make it easier to do domain-driven design, because one could instantly translate evolving domain modeling ideas into a working prototype. And it would deliver an expressive, object-oriented user interface for free. Thus was born the idea of Naked Objects.
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><div class="extended-quote-attribution"><p>-- Richard Pawson
-</p></div></p>
-</div>
-<div class="paragraph">
-<p>You can learn much more about the pattern in the book, <a href="http://www.amazon.com/exec/obidos/ISBN=0470844205/">Naked Objects</a>, also freely available to <a href="http://www.nakedobjects.org/book/">read online</a>.  Richard co-wrote the book with one of Apache Isis' committers, Robert Matthews, who was in turn the author of the Naked Objects Framework for Java (the original codebase of of Apache Isis).</p>
-</div>
-<div class="paragraph">
-<p>You might also want to read Richard&#8217;s <a href="resources/core-concepts/Pawson-Naked-Objects-thesis.pdf">PhD on the subject</a>.</p>
-</div>
-<div class="admonitionblock tip">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-tip" title="Tip"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>One of the external examiners for Richard&#8217;s PhD was <a href="http://en.wikipedia.org/wiki/Trygve_Reenskaug">Trygve Reenskaug</a>, who originally formulated the MVC pattern at Xeroc PARC.  In his paper, <a href="http://heim.ifi.uio.no/~trygver/2007/2007.02.13-babyUML.pdf">Baby UML</a>, Reenskaug describes that when implemented the first MVC, "the conventional wisdom in the group was that objects should be visible and tangible, thus bridging the gap between the human brain and the abstract data within the computer."  Sound familiar?  It&#8217;s interesting to speculate what might have been if this idea had been implemented back then in the late 70s.</p>
-</div>
-<div class="paragraph">
-<p>Reenskaug then goes on to say that "this simple and powerful idea failed because &#8230;&#8203; users were used to seeing [objects] from different perspectives. The visible and tangible object would get very complex if it should be able to show itself and be manipulated in many different ways."</p>
-</div>
-<div class="paragraph">
-<p>In Apache Isis the responsibility of rendering an object is not the object itself, it is the framework.  Rather, the object inspects the object and uses that to decide how to render the object.  This is also extensible.  In the <a href="http://www.isisaddons.org">Isis Addons</a> (non-ASF) the <a href="http://github.com/isisaddons/isis-wicket-gmap3">Isis addons' gmap3</a> wicket extension renders any object with latitude/longitude on a map, while <a href="http://github.com/isisaddons/isis-wicket-fullcalendar2">Isis addons' fullcalendar2 wicket extension</a> renders any object with date(s) on a calendar.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="sect4">
-<h5 id="_ugfun_core-concepts_philosophy_naked-objects-pattern_object-interface-mapping">Object Interface Mapping</h5>
-<div class="paragraph">
-<p>Another&#8201;&#8212;&#8201;more technical&#8201;&#8212;&#8201;way to think about the naked objects pattern is as an <em>object interface mapper</em>, or <code>OIM</code>.  We sometimes use this idea to explain naked objects to a bunch of developers.</p>
-</div>
-<div class="paragraph">
-<p>Just as an ORM (such as <a href="http://datanucleus.org">DataNucleus</a> or <a href="http://hibernate.org">Hibernate</a>) maps domain entities to a database, you can think of the naked objects pattern as representing the concept of mapping domain objects to a user interface.</p>
-</div>
-<div class="paragraph">
-<p>This is the way that the <a href="http://metawidget.org/">MetaWidget</a> team, in particular Richard Kennard, the primary contributor, likes to describe their tool.  MetaWidget has a number of ideas in common with Apache Isis, specifically the runtime generation of a UI for domain objects.  You can hear more from Kennard and others on this <a href="http://devchat.tv/js-jabber/150-jsj-oims">Javascript Jabber podcast</a>.</p>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>We compare Apache Isis' with MetaWidget <a href="#_ugfun_core-concepts_principles_apache-isis-vs_metawidget">here</a>.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-</div>
-<div class="sect4">
-<h5 id="_what_this_means_in_practice">What this means in practice</h5>
-<div class="paragraph">
-<p>This <a href="https://www.youtube.com/watch?v=ludOLyi6VyY">screencast</a> shows what all of this means in practice, showing the relationship between a running app and the actual code underneath.</p>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>This screencast shows Apache Isis v1.0.0, Jan 2013.  The UI has been substantially refined since that release.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_ugfun_core-concepts_philosophy_hexagonal-architecture">2.1.3. Hexagonal Architecture</h4>
-<div class="paragraph">
-<p>One of the patterns that Evans discusses in his book is that of a <strong>layered architecture</strong>.  In it he describes why the domain model lives in its own layer within the architecture. The other layers of the application (usually presentation, application, and persistence) have their own responsibilities, and are completely separate.  Each layer is cohesive and depending only on the layers below.  In particular, we have a layer dedicated to the domain model. The code in this layer is unencumbered with the (mostly technical) responsibilities of the other layers and so can evolve to tackle complex domains as well as simple ones.</p>
-</div>
-<div class="paragraph">
-<p>This is a well-established pattern, almost a de-facto; there&#8217;s very little debate that these responsibilities should be kept separate from each other.  With Apache Isis the responsibility for presentation is a framework concern, the responsibility for the domain logic is implemented by the (your) application code.</p>
-</div>
-<div class="paragraph">
-<p>A few years ago Alistair Cockburn reworked the traditional layered architecture diagram and came up with the <strong><em>hexagonal architecture</em></strong>:.</p>
-</div>
-<div class="admonitionblock tip">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-tip" title="Tip"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>The hexagonal architecture is also known as the <a href="http://c2.com/cgi/wiki?PortsAndAdaptersArchitecture">Ports and Adapters</a> architecture or (less frequently) as the <a href="http://jeffreypalermo.com/blog/the-onion-architecture-part-1/">Onion</a> architecture.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="images/core-concepts/philosophy/hexagonal-architecture.png" alt="hexagonal architecture" width="700px">
-</div>
-<div class="title">Figure 1. The hexagonal architecture emphasizes multiple implementations of the different layers.</div>
-</div>
-<div class="paragraph">
-<p>What Cockburn is emphasizing is that there&#8217;s usually more than one way <strong>into</strong> an application (what he called the <strong><em>user-side' ports</em></strong>) and more than one way  <strong>out of</strong> an application too (the <strong><em>data-side ports</em></strong>). This is very similar to the concept of primary and secondary actors in use cases: a primary actor (often a human user but not always) is active and initiates an interaction, while a secondary actor (almost always an external system) is passive and waits to be interacted with.</p>
-</div>
-<div class="paragraph">
-<p>Associated with each port can be an <strong><em>adapter</em></strong> (in fact, Cockburn&#8217;s alternative name for this architecture is <strong><em>ports and adapters</em></strong>). An adapter is a device (piece of software) that talks in the protocol (or  <em>API</em>) of the port. Each port could have several adapters.</p>
-</div>
-<div class="paragraph">
-<p>Apache Isis maps very nicely onto the  <strong>hexagonal architecture</strong>.  Apache Isis' viewers act as user-side adapters and use the Apache Isis metamodel API as a port into the domain objects.   For the data side, we are mostly concerned with persisting domain objects to some sort of object store.  Here Apache Isis delegates most of the heavy lifting to ORM implementing the JDO API.  Most of the time this will be DataNucleus configured to persist to an RDBMS, but DataNucleus can also support other object stores, for example Neo4J.  Alternatively Apache Isis can be configured to persist using some other JDO implementation, for example Google App Engine.</p>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_ugfun_core-concepts_philosophy_aop">2.1.4. Aspect Oriented</h4>
-<div class="paragraph">
-<p>Although not a book about object modelling, Evans' "Domain Driven Design" does use object orientation as its primary modelling tool; while <a href="#_ugfun_core-concepts_philosophy_naked-objects-pattern">naked objects pattern</a> very much comes from an OO background (it even has 'object' in its name); Richard Pawson lists Alan Kay as a key influence.</p>
-</div>
-<div class="paragraph">
-<p>It&#8217;s certainly true that to develop an Apache Isis application you will need to have good object oriented modelling skills.  But given that all the mainstream languages for developing business systems are object oriented (Java, C#, Ruby), that&#8217;s not such a stretch.</p>
-</div>
-<div class="paragraph">
-<p>However, what you&#8217;ll also find as you write your applications is that in some ways an Isis application is more aspect-oriented than it is object oriented.  Given that aspect-orientation&#8201;&#8212;&#8201;as a programming paradigm at least&#8201;&#8212;&#8201;hasn&#8217;t caught on, that statement probably needs unpacking a little.</p>
-</div>
-<div class="sect4">
-<h5 id="_aop_concepts">AOP Concepts</h5>
-<div class="paragraph">
-<p>Aspect-orientation, then, is a different way of decomposing your application, by treating <em>cross-cutting concerns</em> as a first-class citizen.  The canonical (also rather boring) example of a cross-cutting concern is that of logging (or tracing) all method calls.  An aspect can be written that will weave in some code (a logging statement) at specified points in the code).</p>
-</div>
-<div class="paragraph">
-<p>This idea sounds rather abstract, but what it really amounts to is the idea of interceptors.  When one method calls another the AOP code is called in first.  This is actually then one bit of AOP that is quite mainstream; DI containers such as Spring provide aspect orientation in supporting annotations such as <code>@Transactional</code> or <code>@Secured</code> to java beans.</p>
-</div>
-<div class="paragraph">
-<p>Another aspect (ahem!) of aspect-oriented programming has found its way into other programming languages, that of a mix-in or trait.  In languages such as Scala these mix-ins are specified statically as part of the inheritance hierarchy, whereas with AOP the binding of a trait to some other class/type is done without the class "knowing" that additional behaviour is being mixed-in to it.</p>
-</div>
-</div>
-<div class="sect4">
-<h5 id="_realization_within_apache_isis">Realization within Apache Isis</h5>
-<div class="paragraph">
-<p>What has all this to do with Apache Isis, then?</p>
-</div>
-<div class="paragraph">
-<p>Well, a different way to think of the naked objects pattern is that the visualization of a domain object within a UI is a cross-cutting concern.  By following certain very standard programming conventions that represent the <em>Apache Isis Programming Model</em> (POJOs plus annotations), the framework is able to build a metamodel and from this can render your domain objects in a standard generic fashion.  That&#8217;s a rather more interesting cross-cutting concern than boring old logging!</p>
-</div>
-<div class="paragraph">
-<p>Isis also draws heavily on the AOP concept of interceptors.  Whenever an object is rendered in the UI, it is filtered with respect to the user&#8217;s permissions.  That is, if a user is not authorized to either view or perhaps modify an object, then this is applied transparently by the framework.  The <a href="http://github.com/isisaddons/isis-module-security">Isis addons' security</a> module, mentioned previously, provides a rich user/role/permissions subdomain to use out of the box; but you can integrate with a different security mechanism if you have one already.</p>
-</div>
-<div class="paragraph">
-<p>Another example of interceptors are the <a href="http://github.com/isisaddons/isis-module-command">Isis addons' command</a> and <a href="http://github.com/isisaddons/isis-module-audit">Isis addons' audit</a> modules.  The command module captures every user interaction that modifies the state of the system (the "cause" of a change) while the audit module captures every change to every object (the "effect" of a change).  Again, this is all transparent to the user.</p>
-</div>
-<div class="paragraph">
-<p>Apache Isis also has an internal event bus (you can switch between an underlying implementation of Gauva or Axon).  A domain event is fired whenever an object is interacted with, and this allows any subscribers to influence the operation (or even veto it).  This is a key mechanism in ensuring that Isis applications are maintainable, and we discuss it in depth in the section on  <a href="ugbtb.html#_ugbtb_decoupling">Decoupling</a>.  But fundamentally its relying on this AOP concept of interceptors.</p>
-</div>
-<div class="paragraph">
-<p>Finally, Isis also a feature that is akin to AOP mix-ins.  A "contributed action" is one that is implemented on a domain service but that appears to be a behaviour of rendered domain object.  In other words, we can dissociate behaviour from data.  That&#8217;s not always the right thing to do of course.  In Richard Pawson&#8217;s description of the <a href="#_ugfun_core-concepts_philosophy_naked-objects-pattern">naked objects pattern</a> he talks about "behaviourally rich" objects, in other words where the business functionality encapsulated the data.   But on the other hand sometimes the behaviour and data structures change at different rates.  The <a href="http://en.wikipedia.org/wiki/Single_responsibility_principle">single responsibility principle</a> says we should only lump code together that changes at the same rate.  Apache Isis' support for contributions (not only contributed actions, but also contributed properties and contributed collections) enables this.  And again, t
 o loop back to the topic of this section, it&#8217;s an AOP concept that being implemented by the framework.</p>
-</div>
-<div class="paragraph">
-<p>The nice thing about aspect orientation is that for the most part you can ignore these cross-cutting concerns and - at least initially at least - just focus on implementing your domain object.  Later when your app starts to grow and you start to break it out into smaller modules, you can leverage Apache Isis' AOP support for (<a href="ugbtb.html#_ugbtb_decoupling_mixins">mixins</a>), (<a href="ugbtb.html#_ugbtb_decoupling_contributions">contributions</a>) and interceptors (the <a href="ugbtb.html#_ugbtb_decoupling_event-bus">event bus</a>) to ensure that your codebase remains maintainable.</p>
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_ugfun_core-concepts_philosophy_how-eases-ddd">2.1.5. How Apache Isis eases DDD</h4>
-<div class="paragraph">
-<p>The case for  <em>DDD</em> might be compelling, but that doesn&#8217;t necessarily make it easy to do. Let&#8217;s take a look at some of the
-challenges that  <em>DDD</em> throws up and see how Apache Isis (and its implementation of the naked objects pattern) helps address them.</p>
-</div>
-<div class="sect4">
-<h5 id="_ddd_takes_a_conscious_effort">DDD takes a conscious effort</h5>
-<div class="paragraph">
-<p>Here&#8217;s what Eric Evans says about ubiquitous language:</p>
-</div>
-<div class="paragraph">
-<p><div class="extended-quote-first"><p>With a conscious effort by the [development] team the domain model can provide the backbone for [the] common [ubiquitous] language&#8230;&#8203;connecting team communication to the software implementation."
-</p></div></p>
-</div>
-<div class="paragraph">
-<p><div class="extended-quote-attribution"><p>-- Eric Evans
-</p></div></p>
-</div>
-<div class="paragraph">
-<p>The word to pick up on here is <strong>conscious</strong>.  It takes a conscious effort by the entire team to develop the ubiquitous language. Everyone in the team must challenge the use of new or unfamiliar terms, must clarify concepts when used in a new context, and in general must be on the lookout for sloppy thinking. This takes willingness on the part of all involved, not to mention some practice.</p>
-</div>
-<div class="paragraph">
-<p>With Apache Isis, though, the  ubiquitous language evolves with scarcely any effort at all. For the business experts, the Apache Isis viewers show the domain concepts they identify and the relationships between those concepts in a straightforward fashion. Meanwhile, the developers can devote themselves to encoding those domain concepts directly as domain classes. There&#8217;s no technology to get distracted by; there is literally nothing else for the developers to work on.</p>
-</div>
-</div>
-<div class="sect4">
-<h5 id="_ddd_must_be_grounded">DDD must be grounded</h5>
-<div class="paragraph">
-<p>Employing a  model-driven design isn&#8217;t necessarily straightforward, and the development processes used by some organizations positively hinder it. It&#8217;s not sufficient for the business analysts or architects to come up with some idealized representation of the business domain and then chuck it over the wall for the programmers to do their best with.</p>
-</div>
-<div class="paragraph">
-<p>Instead, the concepts in the model must have a very literal representation in code. If we fail to do this, then we open up the communication divide, and our  ubiquitous language is lost. There is literally no point having a domain model that cannot be represented in code. We cannot invent our ubiquitous language in a vacuum, and the developers must ensure that the model remains grounded in the doable.</p>
-</div>
-<div class="paragraph">
-<p>In Apache Isis, we have a very pure one-to-one correspondence between the domain concepts and its implementation. Domain concepts are represented as classes and interfaces, easily demonstrated back to the business. If the model is clumsy, then the application will be clumsy too, and so the team can work together to find a better implementable model.</p>
-</div>
-</div>
-<div class="sect4">
-<h5 id="_model_must_be_understandable">Model must be understandable</h5>
-<div class="paragraph">
-<p>If we are using code as the primary means of expressing the model, then we need to find a way to make this model understandable to the business.</p>
-</div>
-<div class="paragraph">
-<p>We could generate UML diagrams and the like from code. That will work for some members of the business community, but not for everyone. Or we could generate a PDF document from Javadoc comments, but comments aren&#8217;t code and so the document may be inaccurate.  Anyway, even if we do create such a document, not everyone will read it.</p>
-</div>
-<div class="paragraph">
-<p>A better way to represent the model is to show it in action as a working prototype. As we show in the <a href="#_ugfun_getting-started">Getting Started</a> section, Apache Isis enables this with ease. Such prototypes bring the domain model to life, engaging the audience in a way that a piece of paper never can.</p>
-</div>
-<div class="paragraph">
-<p>Moreover, with Apache Isis prototypes, the domain model will come shining through. If there are mistakes or misunderstandings in the domain model (inevitable when building any complex system), they will be obvious to all.</p>
-</div>
-</div>
-<div class="sect4">
-<h5 id="_architecture_must_be_robust">Architecture must be robust</h5>
-<div class="paragraph">
-<p><em>DDD</em> rightly requires that the domain model lives in its own layer within the architecture. The other layers of the application (usually presentation, application, and persistence) have their own responsibilities, and are completely separate.</p>
-</div>
-<div class="paragraph">
-<p>However, there are two immediate issues. The first is rather obvious: custom coding each of those other layers is an expensive proposition. Picking up on the previous point, this in itself can put the kibosh on using prototyping to represent the model, even if we wanted to do so.</p>
-</div>
-<div class="paragraph">
-<p>The second issue is more subtle. It takes real skill to ensure the correct separation of concerns between these layers, if indeed you can get an agreement as to what those concerns actually are. Even with the best intentions, it&#8217;s all too easy for custom-written layers to blur the boundaries and put (for example) validation in the user interface layer when it should belong to the domain layer. At the other extreme, it&#8217;s quite possible for custom layers to distort or completely subvert the underlying domain model.</p>
-</div>
-<div class="paragraph">
-<p>Because of Apache Isis' generic  <em>OOUI</em>s, there&#8217;s no need to write the other layers of the architecture.  Of course, this reduces the development cost. But more than that, there will be no leakage of concerns outside the domain model. All the validation logic <strong>must</strong> be in the domain model because there is nowhere else to put it.</p>
-</div>
-<div class="paragraph">
-<p>Moreover, although Apache Isis does provide a complete runtime framework, there is no direct coupling of your domain model to the framework. That means it is very possible to take your domain model prototyped in Naked Objects and then deploy it on some other  <em>J(2)EE</em> architecture, with a custom <em>UI</em> if you want.  Apache Isis guarantees that your domain model is complete.</p>
-</div>
-</div>
-<div class="sect4">
-<h5 id="_extending_the_reach_of_ddd">Extending the reach of DDD</h5>
-<div class="paragraph">
-<p>Domain-driven design is often positioned as  being applicable only to complex domains; indeed, the subtitle of Evans book is  "Tackling Complexity in the Heart of Software". The corollary is that DDD is overkill for simpler domains. The trouble is that we immediately have to make a choice: is the domain complex enough to warrant a domain-driven approach?</p>
-</div>
-<div class="paragraph">
-<p>This goes back to the previous point, building and maintaining a layered architecture. It doesn&#8217;t seem cost effective to go to all the effort of a DDD approach if the underlying domain is simple.</p>
-</div>
-<div class="paragraph">
-<p>However, with Apache Isis, we don&#8217;t write these other layers, so we don&#8217;t have to make a call on how complex our domain is. We can start working solely on our domain, even if we suspect it will be simple. If it is indeed a simple domain, then there&#8217;s no hardship, but if unexpected subtleties arise, then we&#8217;re in a good position to handle them.</p>
-</div>
-<div class="paragraph">
-<p>If you&#8217;re just starting out writing domain-driven applications, then Apache Isis should significantly ease your journey into applying <em>DDD</em>. On the other hand, if you&#8217;ve used <em>DDD</em> for a while, then you should find Isis a very useful new tool in your arsenal.</p>
-</div>
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_ugfun_core-concepts_principles">2.2. Principles and Values</h3>
-<div class="paragraph">
-<p>This section describes some of the core principles and values that the framework aims to honour and support.</p>
-</div>
-<div class="paragraph">
-<p>The first of these relate to how we believe your domain application should be written: it should be decoupled, testable and so on).  Others relate to the implementation of the framework itself.</p>
-</div>
-<div class="paragraph">
-<p>The section concludes by contrasting the framework with some other open source frameworks commonly used.</p>
-</div>
-<div class="sect3">
-<h4 id="_ugfun_core-concepts_principles_your-apps">2.2.1. Your Applications</h4>
-<div class="paragraph">
-<p>Apache Isis is primarily aimed at custom-built "enterprise" applications.  The UI exposed by the <a href="ugvw.html">Wicket viewer</a> is intended to be usable by domain experts, typically end-users within the organization.  The REST API exposed by the <a href="ugvro.html">RestfulObjects viewer</a> allows custom apps to be developed - eg using AngularJS or similar - for use by those requiring more guidance; typically end-users outside of the organization.</p>
-</div>
-<div class="paragraph">
-<p>But should your organization buy, or build?  Buying packaged software makes sense for statutory requirements, such as payroll or general ledger, or document management/retrieval.  But it makes much less sense to buy packaged software for the systems that support the core business: the software should fit the business, not the other way around.</p>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-TODO - flesh out the following:
-</td>
-</tr>
-</table>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Flexible, "just enough"</p>
-</li>
-<li>
-<p>Decoupled</p>
-</li>
-<li>
-<p>Long-term Cost of ownership</p>
-<div class="ulist">
-<ul>
-<li>
-<p>dependency injection of services</p>
-</li>
-<li>
-<p>OO design techniques, eg dependency inversion principle</p>
-</li>
-<li>
-<p>an in-memory event bus</p>
-</li>
-<li>
-<p>applib</p>
-</li>
-<li>
-<p>(no "Big Ball of Mud")</p>
-</li>
-</ul>
-</div>
-</li>
-<li>
-<p>Honouring the Single Responsibility Principle</p>
-<div class="ulist">
-<ul>
-<li>
-<p>behaviourally Complete vs Contributions/Mixins</p>
-</li>
-</ul>
-</div>
-</li>
-<li>
-<p>Testable<br></p>
-<div class="paragraph">
-<p>While Apache Isis can be used (very effectively) for simple CRUD-style applications, it is also intended to be used for complex business domains.  Ensuring that the business logic in
-such applications is correct means that the framework must (and does) provide robust testing support, both for developer-level unit testing and business-level (end-to-end) integration testing.</p>
-</div>
-</li>
-<li>
-<p>Reusable building blocks<br></p>
-<div class="paragraph">
-<p>Isis addons, catalog.incode.org</p>
-</div>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_ugfun_core-concepts_principles_isis-itself">2.2.2. Apache Isis itself</h4>
-<div class="paragraph">
-<p>This section discusses some of the principles and values we apply to the development of the Apache Isis framework itself.</p>
-</div>
-<div class="sect4">
-<h5 id="_full_stack_but_extensible">Full-stack but Extensible</h5>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-TODO
-</td>
-</tr>
-</table>
-</div>
-</div>
-<div class="sect4">
-<h5 id="_focuses_on_its_usp">Focuses on its USP</h5>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-TODO
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>add-ons</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Apache Isis is at heart a metamodel with runtime, and coordinates interations using an AOP set of principles</p>
-</li>
-<li>
-<p>Apache Isis vs Isis Addons</p>
-</li>
-<li>
-<p>Apache Isis vs Shiro vs DataNucleus</p>
-<div class="olist lowerroman">
-<ol class="lowerroman" type="i">
-<li>
-<p>all code has legacy in it&#8230;&#8203;. parts of the Isis codebase are well over a decade old; and back then a lot of the JEE technologies that we&#8217;d like to be using just didn&#8217;t exist, so we had to invent the features we required ourselves.</p>
-</li>
-<li>
-<p>also, Apache Isis today is more pragmatic than previously</p>
-</li>
-</ol>
-</div>
-</li>
-<li>
-<p>a client/server solution, with AWT-based client</p>
-</li>
-<li>
-<p>a HTML browser, Scimpi (JSF-like, but not using JSF), &#8230;&#8203;</p>
-</li>
-<li>
-<p>security</p>
-</li>
-<li>
-<p>objectstores</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>We&#8217;re working hard to remove duplication, reuse existing open source/JEE, and simplify.</p>
-</div>
-<div class="paragraph">
-<p>The areas of Apache Isis we consider mature are those that have been developed in support of real-world applications implemented by the committers.  Foremost among these is Estatio.</p>
-</div>
-<div class="paragraph">
-<p>Focus on enterprise / line-of-business applications, for use by internal staff.</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>problem solvers, not process followers</p>
-</li>
-<li>
-<p>view models</p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_ugfun_core-concepts_principles_apache-isis-vs">2.2.3. Apache Isis vs &#8230;&#8203;</h4>
-<div class="paragraph">
-<p>Many other frameworks promise rapid application development and provide automatically generated user interfaces, so how
-do they compare to Apache Isis?</p>
-</div>
-<div class="sect4">
-<h5 id="_ugfun_core-concepts_principles_apache-isis-vs_mvc-server-side-frameworks">vs MVC server-side frameworks</h5>
-<div class="paragraph">
-<p>Some of most commonly used frameworks today are <a href="http://www.spring.io/">Spring MVC</a>, <a href="http://rubyonrails.org/">Ruby on Rails</a> and <a href="http://www.grails.org">Grails</a>, all of which implement one flavour or another of the server-side MVC pattern.  The MVC 1.0 specification (scheduled for JavaEE 8) is also similar.</p>
-</div>
-<div class="paragraph">
-<p>These frameworks all use the classic  <strong>model-view-controller</strong> ( <em>MVC</em>) pattern for web applications, with scaffolding, code-generation, and/or metaprogramming tools for the controllers and views, as well as convention over configuration to define how these components interact.  The views provided out of the box by these frameworks tend to be simple  <em>CRUD</em>-style interfaces. More sophisticated behavior is accomplished by customizing the generated controllers.</p>
-</div>
-<div class="paragraph">
-<p>The most obvious difference when developing an Apache Isis application is its deliberate lack of an explicit controller layer; non- <em>CRUD</em> behavior is automatically made available in its generic object-oriented  _UI_s.  More sophisticated UIs can be built either by <a href="ugvw.html#_ugvw_extending">extending Apache Isis' Wicket viewer</a> or by writing a bespoke UI leveraging the REST (hypermedia) API automatically exposed by <a href="ugvro.html">Isis' Restful Objects viewer</a>.  Other frameworks can also be used to implement REST APIs, of course, but generally they require a significant amount of development to get anywhere near the level of sophistication provided automatically by Apache Isis' REST API.</p>
-</div>
-<div class="paragraph">
-<p>Although these frameworks all provide their own ecosystems of extensions, Apache Isis' equivalent <a href="http://www.isisaddons.org">Isis Addons</a> (non-ASF) tend to work at a higher-level of abstraction.  For example, each of these frameworks will integrate with various security mechanism, but the <a href="http://github.com/isisaddons/isis-module-security">Isis addons' security module</a> provides a full subdomain of users, roles, features and permissions that can be plugged into any Isis application.  Similarly, the <a href="http://github.com/isisaddons/isis-module-command">Isis addons' command</a> and <a href="http://github.com/isisaddons/isis-module-audit">Isis addons' audit</a> modules in combination provide a support for auditing and traceability that can also be used for out of the box profiling.  Again, these addons can be plugged into any Isis app.</p>
-</div>
-<div class="paragraph">
-<p>In terms of testing support, each of these other frameworks provide mechanisms to allow the webapp to be tested from within a JUnit test harness. Apache Isis' support is similar.  Where Apache Isis differs though is that it enables end-to-end testing without the need for slow and fragile Selenium tests. Instead, Apache Isis provides a "<a href="ugtst.html#_ugtst_integ-test-support_wrapper-factory">WrapperFactory</a>" domain service that allows the generic UI provided to in essence be simulated. On a more pragmatic level, the <a href="http://github.com/isisaddons/isis-module-fakedata">Isis addons' fakedata</a> module does "what it says on the tin", allowing both unit- and integration-tests to focus on the salient data and fake out the rest.</p>
-</div>
-</div>
-<div class="sect4">
-<h5 id="_ugfun_core-concepts_principles_apache-isis-vs_cqrs">vs CQRS</h5>
-<div class="paragraph">
-<p>The CQRS architectural pattern (it stands for "Command Query Responsbility Separation") is the idea that the domain objects that mutate the state of the system - to which commands are sent and which then execute - should be separated from the mechanism by which the state of the system is queried (rendered).  The former are sometimes called the "write (domain) model", the latter the "read model".</p>
-</div>
-<div class="paragraph">
-<p>In the canonical version of this pattern there are separate datastores.  The commands act upon a command/write datastore.  The data in this datastore is then replicated in some way to the query/read datastore, usually denormalized or otherwise such that it is easy to query.  CQRS advocates recommend using very simple (almost naive) technology for the query/read model; it should be a simple projection of the query datastore.  Complexity instead lives elsewhere: business logic in the command/write model, and in the transformation logic betweeen the command/write and read/query datastores.  In particular, there is no requirement for the two datastores to use the same technology: one might be an RDBMS while the other a NoSQL datastore or even datawarehouse.</p>
-</div>
-<div class="paragraph">
-<p>In most implementations the command and query datastores are <em>not</em> updated in the same transaction; instead there is some sort of replication mechanism.  This also means that the query datastore is eventually consistent rather than always consistent; there could be a lag of a few seconds before it is updated.  This means in turn that CQRS implementations require mechanisms to cater for offline query datastores; usually some sort of event bus.</p>
-</div>
-<div class="paragraph">
-<p>The CQRS architecture&#8217;s extreme separation of responsibilities can result in a lot of boilerplate.  Any given domain concept, eg <code>Customer</code>, must be represented both in the command/write model and also in the query/read model.  Each business operation upon the command model is reified as a command object, for example <code>PlaceOrderCommand</code>.</p>
-</div>
-<div class="paragraph">
-<p>Comparing CQRS to Apache Isis, the most obvious difference is that Apache Isis does not separate out a command/write model from a query/read model, and there is usually just a single datastore.  But then again, having a separate read model just so that the querying is very straightforward is pointless with Apache Isis because, of course, Isis provides the UI "for free".</p>
-</div>
-<div class="paragraph">
-<p>There are other reasons though why a separate read model might make sense, such as to precompute particular queries, or against denormalized data.  In these cases Apache Isis can often provide a reasonable alternative, namely to map domain entities against RDBMS views, either materialized views or dynamic.  In such cases there is still only a single physical datastore, and so transactional integrity is retained.</p>
-</div>
-<div class="paragraph">
-<p>Or, the CQRS architecture can be more fully implemented with Apache Isis by introducing a separate read model, synchronized using the <a href="rgsvc.html#_rgsvc_api_PublishingService"><code>PublishingService</code></a>, or using <a href="rgcms.html#_rgcms_classes_super_AbstractSubscriber">subscribers</a>  on the <a href="rgsvc.html#_rgsvc_api_EventBusService"><code>EventBusService</code></a>.  One can then use <a href="ugbtb.html#_ugbtb_view-models">view models</a> to surface the data in the external read datastore.</p>
-</div>
-<div class="paragraph">
-<p>With respect to commands, Apache Isis does of course support the <a href="rgsvc.html#_rgsvc_spi_CommandService"><code>CommandService</code></a> which allows each business action to be reified into a <code>Command</code>.  However, names are misleading here: Apache Isis' commands are relatively passive, merely recording the intent of the user to invoke some operation.  In a CQRS architecture, though, commands take a more active role, locating and acting upon the domain objects.  More significantly, in CQRS each command has its own class, such as <code>PlaceOrderCommand</code>, instantiated by the client and then executed.  With Apache Isis, though, the end-user merely invokes the <code>placeOrder(&#8230;&#8203;)</code> action upon the domain object; the framework itself creates the <code>Command</code> as a side-effect of this.</p>
-</div>
-<div class="paragraph">
-<p>In CQRS the commands correspond to the business logic that mutates the system.  Whether this logic is part of the command class (<code>PlaceOrderCommand</code>) or whether that command delegates to methods on the domain object is an implementation detail; but it certainly is common for the business logic to be wholly within the command object and for the domain object to be merely a data holder of the data within the command/write datastore.</p>
-</div>
-<div class="paragraph">
-<p>In Apache Isis this same separation of business logic from the underlying data can be accomplished most straightforwardly using <a href="ugbtb.html#_ugbtb_decoupling_mixins">mixins</a> or <a href="#_ugfun_how-tos_contributed-members">contributions</a>.  In the UI (surfaced by the <a href="ugvw.html">Wicket viewer</a>) or in the REST API (surfaced by the <a href="ugvro.html">RestfulObjects viewer</a>) the behaviour appears to reside on the domain object; however the behaviour actually resides on separate classes and is mixed in (like a trait) only at runtime.</p>
-</div>
-</div>
-<div class="sect4">
-<h5 id="_ugfun_core-concepts_principles_apache-isis-vs_event-sourcing">vs Event Sourcing</h5>
-<div class="paragraph">
-<p>The <a href="_ugfun_core-concepts_principles_apache-isis-vs_cqrs">CQRS architecture</a>, discussed above, is often combined with <em>Event Sourcing</em> pattern, though they are separate ideas.</p>
-</div>
-<div class="paragraph">
-<p>With event sourcing, each business operation emits a domain event (or possibly events) that allow other objects in the system to act accordingly.  For example, if a customer places an order then this might emit the <code>OrderPlacedEvent</code>.  Most significantly, the subscribers to these events can include the datastore itself; the state of the system is in effect a transaction log of every event that has occurred since "the beginning of time": it is sometimes called an event store.   With CQRS, this event datastore corresponds to the command/write datastore (the query/read datastore is of course derived from the command datastore).</p>
-</div>
-<div class="paragraph">
-<p>Although it might seem counter-intuitive to be able store persistent state in this way (as a souped up "transaction log"), the reality is that with modern compute capabilities make it quite feasible to replay many 10s/100s of thousands of events in a second.  And the architecture supports some interesting use cases; for example it becomes quite trivial to rewind the system back to some previous point in time.</p>
-</div>
-<div class="paragraph">
-<p>When combined with CQRS we see a command that triggers a business operation, and an event that results from it.  So, a <code>PlaceOrderCommand</code> command can result in an <code>OrderPlacedEvent</code> event.  A subscriber to this event might then generate a further command to act upon some other system (eg to dispatch the system).  Note that the event might be dispatched and consumed in-process or alternatively this might occur out-of-process.  If the latter, then the subscriber will operate within a separate transaction, meaning the usual eventual consistency concerns and also compensating actions if a rollback is required.  CQRS/event sourcing advocates point out - correctly  that this is just how things are in the "real world" too.</p>
-</div>
-<div class="paragraph">
-<p>In Apache Isis every business action (and indeed, property and collection) emits domain events through the <a href="rgsvc.html#_rgsvc_api_EventBusService"><code>EventBusService</code></a> , and can optionally also be published through the <a href="rgsvc.html#_rgsvc_spi_PublishingService"><code>PublishingService</code></a>.  The former are dispatched and consumed in-process and within the same transaction, and for this reason the <a href="rgcms.html#_rgcms_classes_super_AbstractSubscriber">subscribers</a> can also veto the events.  The latter are intended for out-of-process consumption; the (non-ASF) <a href="http://github.com/isisaddons/isis-module-publishing">Isis addons' publishing</a> and <a href="http://github.com/isisaddons/isis-module-publishmq">Isis addons' publishmq</a> modules provide implementations for dispatching either through a RDBMS database table, or directly through to an <a href="http://camel.apache.org">ActiveMQ</a> message queue (eg wired up to <a href="http:/
 /camel.apache.org">Apache Camel</a> event bus).</p>
-</div>
-</div>
-<div class="sect4">
-<h5 id="_ugfun_core-concepts_principles_apache-isis-vs_metawidget">vs MetaWidget</h5>
-<div class="paragraph">
-<p>MetaWidget (mentioned <a href="#_ugfun_core-concepts_philosophy_naked-objects-pattern_object-interface-mapping">earlier</a> has a number of ideas in common with Apache Isis, specifically the runtime generation of a UI for domain objects.  And like Apache Isis, MetaWidget builds its own metamodel of the domain objects and uses this to render the object.</p>
-</div>
-<div class="paragraph">
-<p>However, there is a difference in philosophy in that MW is not a full-stack framework and does not (in their words) try to "own the UI".  Rather they support a huge variety of UI technologies and allow the domain object to be rendered in any of them.</p>
-</div>
-<div class="paragraph">
-<p>In contrast, Apache Isis is full-stack and does generate a complete UI; we then allow you to customize or extend this UI (as per the various <a href="http://www.isisaddons.org">Isis Addons</a> (non-ASF), and we also provide a full REST API through the <a href="ugvro.html">Restful Objects viewer</a></p>
-</div>
-<div class="paragraph">
-<p>Also, it&#8217;s worth noting that MetaWidget does have an elegant pipeline architecture, with APIs to allow even its metamodel to be replaced.  It would be feasible and probably quite straightforward to use Apache Isis' own metamodel as an implementation of the MetaWidget API.  This would allow MetaWidget to be able to render an Apache Isis domain application.</p>
-</div>
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_ugfun_core-concepts_building-blocks">2.3. Building Blocks</h3>
-<div class="paragraph">
-<p>In this section we run through the main building blocks that make up an Apache Isis application.</p>
-</div>
-<div class="sect3">
-<h4 id="_ugfun_core-concepts_building-blocks_metamodel">2.3.1. A MetaModel</h4>
-<div class="paragraph">
-<p>At its core, Apache Isis is a metamodel that is built at runtime from the domain classes (eg <code>Customer.java</code>), along
-with optional supporting metadata (eg <code>Customer.layout.json</code>).</p>
-</div>
-<div class="paragraph">
-<p>The contents of this metamodel is inferred from the Java classes discovered on the classpath: the entities and
-supporting services, as well the members of those classes.  The detail of the metamodel is generally explicit, usually
-represented by Java annotations such as <code>@Title</code> or <code>@Action</code>.  Notably the metamodel is
-<a href="ugbtb.html#_ugbtb_programming-model">extensible</a>; it is possible to teach Apache Isis new programming
-conventions/rules (and conversely to remove those that are built in).</p>
-</div>
-<div class="paragraph">
-<p>Most of the annotations recognized by the framework are defined by the Apache Isis framework itself.  For example the
-<code>@Title</code> annotation - which identifies how the framework should derive a human-readable label for each rendered
-domain object - is part of the <code>org.apache.isis.applib.annotations</code> package.  However the framework also recognizes
-certain other JEE annotations such as <code>@javax.inject.Inject</code> (used for dependency injection).</p>
-</div>
-<div class="paragraph">
-<p>The framework uses DataNucleus for its persistence mechanism.  This is an ORM that implements the JDO and JPA APIs, and
-which can map domain objects either to an RDBMS or to various NoSQL objectstores such as MongoDB or Neo4J.  Apache Isis
-recognizes a number of the JDO annotations such as <code>@javax.jdo.annotations.Column(allowsNull=&#8230;&#8203;)</code>.</p>
-</div>
-<div class="paragraph">
-<p>In addition, the framework builds up the metamodel for each domain object using
-<a href="#_ugfun_object-layout">layout hints</a>, such as <code>Customer.layout.json</code>.  These provide metadata such as
-grouping elements of the UI together, using multi-column layouts, and so on.  The layout file can be modified while the
-application is still running, and are picked up automatically; a useful way to speed up feedback.</p>
-</div>
-<div class="admonitionblock tip">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-tip" title="Tip"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>At the time of writing Apache Isis only recognizes and supports the JDO API, though we expect JPA to be supported
-in the future.  We also expect to generalize support for <code>.layout.json</code> to be able to read such metadata from other
-sources.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_ugfun_core-concepts_building-blocks_types-of-domain-objects">2.3.2. Type of Domain Objects</h4>
-<div class="paragraph">
-<p>Most domain objects that the end-user interacts with are <strong>domain entities</strong>, such as <code>Customer</code>, <code>Order</code>, <code>Product</code> and
-so on.  These are persistent objects and which are mapped to a database (usually relational), using JDO/DataNucleus
-annotations.  From the end-user&#8217;s perspective the UI displays a single domain object per page; they can then inspect
-and modify its state, and navigate to related objects.</p>
-</div>
-<div class="paragraph">
-<p>The next type of domain object to discuss is <strong>domain services</strong>.  These are (usually) singleton stateless services
-that provide additional functionality.  The behaviour of these services is rendered in various ways, though the most
-obvious is as the menu actions on the top-level menu bars in the <a href="ugvw.html">Wicket viewer</a>'s UI.</p>
-</div>
-<div class="paragraph">
-<p>Domain objects can also delegate to domain services; domain services are automatically injected into every other domain
-object; this includes domain entities as well as other services.  This injection of domain services into entities is
-significant: it allows business logic to be implemented in the domain entities, rather than have it "leach away" into
-supporting service layers.  Said another way: it is the means by which Apache Isis helps you avoid the anaemic
-domain model anti-pattern.</p>
-</div>
-<div class="paragraph">
-<p>As well as domain entities - mapped to a datastore - Apache Isis also supports <strong>view models</strong>.  End users interact with
-view models in the same way as a domain entity, indeed they are unlikely to distinguish one from the other.  However
-view models are <em>not</em> mapped to the underlying database, rather they represent some aggregation of state from one or
-more underlying entities.  Their state is serialized and recreated from their internal identifier; this identifier is
-visible as the object&#8217;s URL in the <a href="ugvw.html">Wicket viewer</a> or
-<a href="ugvro.html">RestfulObjects viewer</a>.</p>
-</div>
-<div class="paragraph">
-<p>There&#8217;s no need though for the view model to aggregate the state of regular domain entities.  A view model could also
-be used as a proxy for some externally managed entity, accessed over a web service or REST API; it could even be a
-representation of state held in-memory (such as user preferences, for example).</p>
-</div>
-<div class="paragraph">
-<p>There are also several types of domain services.  Most easily described are those domain services (discussed above)
-that are represented as the menu actions on top-level menu bars.  Another variation are <strong>contributed services</strong> - domain
-services that contribute behaviour or (derived) state to entities/view models.  Finally domain services may also
-simply provide additional non-UI functionality; an example being to perform an address geocoding lookup against the
-google-maps API.</p>
-</div>
-<div class="paragraph">
-<p>Also worth mentioning: domain services can also be either singletons (discussed above) or request-scoped; the latter
-being annotated with <code>@javax.enterprise.context.RequestScoped</code>.  An example of the request-scoped service is the
-<a href="rgsvc.html#_rgsvc_api_Scratchpad"><code>Scratchpad</code></a> service, for sharing arbitrary data between multiple objects.</p>
-</div>
-<div class="paragraph">
-<p>The final type of domain object is the <strong>mixin</strong>.  These are similar to contributed services in that they also contribute (or rather,
-mixin) both behaviour or (derived) state to entities/view models.  However, they provide a more control over contributed services,
-with a cleaner programming model similar to traits found in other languages.</p>
-</div>
-<div class="paragraph">
-<p>The diagram below summarizes the various types of domain object:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/core-concepts/building-blocks/types-of-domain-object.png"><img src="images/core-concepts/building-blocks/types-of-domain-object.png" alt="types of domain object" width="860px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>The Apache Isis programming model uses annotations to distinguish these object types:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><strong>view models</strong> are annotated either with <code>@DomainObject(nature=VIEW_MODEL)</code> or using <code>@ViewModel</code>.  Which is used is
-a matter of personal preference. <br></p>
-<div class="paragraph">
-<p>It is also possible to implement the <code>ViewModel</code> interface, for finer-grained control.</p>
-</div>
-</li>
-<li>
-<p><strong>domain entities</strong> that are persisted to the database (as the vast majority will) are annotated with
-<code>@DomainObject(nature=ENTITY)</code>. In addition such domain entities are annotated with the JDO/DataNucleus annotation of
-<code>@javax.jdo.annotations.PersistenceCapable</code>.<br></p>
-<div class="paragraph">
-<p>In addition, if a domain entity is a proxy for state managed in an external system, or merely for some state held
-in-memory, then <code>@DomainObject(nature=EXTERNAL_ENTITY)</code> or <code>@DomainObject(nature=INMEMORY_ENTITY)</code> can be used.</p>
-</div>
-</li>
-<li>
-<p><strong>mixins</strong> are annotated either with <code>@DomainObject(nature=MIXIN)</code> or using <code>@Mixin</code>.  As for view models, which is
-used is a matter of personal preference.</p>
-</li>
-<li>
-<p>finally, <strong>domain services</strong>` are annotated with <code>@DomainService(nature=&#8230;&#8203;)</code> where the nature is either
-<code>VIEW_MENU_ONLY</code> (for domain services whose actions appear on the top-level menu bars), or <code>VIEW_CONTRIBUTIONS_ONLY</code>
-(for domain services whose actions are contributed to entities or view models), or <code>DOMAIN</code> (for domain services whose
-functionality is simply for other domain objects to invoke programmatically).</p>
-<div class="paragraph">
-<p>It is also possible to specify a nature of simply <code>VIEW</code>, this combining <code>VIEW_MENU_ONLY</code> and <code>VIEW_CONTRIBUTIONS_ONLY</code>.
-This is in fact the default, useful for initial prototyping.  A final nature is <code>VIEW_REST_ONLY</code> which is for domain
-services whose functionality is surfaced only by the <a href="ugvro.html">RestfulObjects viewer</a>.</p>
-</div>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>Worth emphasising is that domain entities and view models hold state, whereas domain services are generally
-stateless.  If a domain service does hold state (eg the <code>Scratchpad</code> service noted above) then it should be
-<code>@RequestScoped</code> so that this state is short-lived and usable only within a single request.</p>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_ugfun_core-concepts_building-blocks_objects-members">2.3.3. Object Members</h4>
-<div class="paragraph">
-<p>Every domain object in Apache Isis consists of (at most) three types of members:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>properties, such as a `Customer&#8217;s `firstName</p>
-</li>
-<li>
-<p>collections, such as a <code>Customer&#8217;s `orders</code> collection of <code>Order</code>s</p>
-</li>
-<li>
-<p>actions, such as a <code>Customer'`s `placeOrder(&#8230;&#8203;)</code> method.</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>Some domain objects - specifically domain services and mixins - only have actions.  In the case of contributing services
-and mixins these actions can (depending upon their semantics and signatures) be represented as derived properties or
-collections on the entity/view model to which they contribute/mix-in.</p>
-</div>
-<div class="sect4">
-<h5 id="_properties">Properties</h5>
-<div class="paragraph">
-<p>Properties follow the standard getter/setter pattern, with the return type being a scalar (a value object or another
-entity or view model).</p>
-</div>
-<div class="paragraph">
-<p>For example, with:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">Customer</span>
+    </style>  
+ </head> 
+ <body> 
+  <div class="row"> 
+   <div class="fixed contain-to-grid header"> 
+    <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem"> 
+     <ul class="title-area"> 
+      <li class="name"> <h1> <a href="/index.html">Apache Isis\u2122</a> </h1> </li> 
+      <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone --> 
+      <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li> 
+     </ul> 
+     <section class="top-bar-section"> 
+      <ul class="right"> 
+       <li class="has-form"> 
+        <form class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse"> 
+         <div class="row collapse"> 
+          <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya"> 
+          <input type="hidden" name="cof" value="FORID:0"> 
+          <input class="form-control" name="q" type="text" placeholder="Search"> 
+         </div> 
+        </form> </li> 
+      </ul> 
+      <!-- Left Nav Section --> 
+      <ul class="left"> 
+       <li><a href="/documentation.html">Documentation</a></li> 
+       <li><a href="/downloads.html">Downloads</a></li> 
+       <li><a href="/help.html">Help</a></li> 
+       <li><a href="/asf.html">@ASF</a></li> 
+      </ul> 
+     </section> 
+    </nav> 
+   </div> 
+  </div> 
+  <div class="row"> 
+   <div id="doc-content-left" class="large-9 medium-9 columns"> 
+    <div id="doc-content">
+     <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/ugfun.adoc&quot;" style="float: right; font-size: small; padding: 6px;  "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+     <div class="sect1"> 
+      <h2 id="_ugfun">1. Fundamentals</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_ugfun.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>This guide introduces the <a href="#_ugfun_core-concepts">core concepts</a> and ideas behind Apache Isis, and tells you how to <a href="#_ugfun_getting-started">get started</a> with a Maven archetype.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>It also describes a number of <a href="#_ugfun_how-tos">how-to</a>s, describes how to influence the <a href="#_ugfun_object-layout">UI layout</a> of your domain objects (this is ultimately just a type of metadata), and it catalogues various <a href="#_ugfun_faqs.adoc">FAQ</a>s.</p> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_other_guides">1.1. Other Guides</h3> 
+        <div class="paragraph"> 
+         <p>Apache Isis documentation is broken out into a number of user, reference and "supporting procedures" guides.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The user guides available are:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><a href="#">Fundamentals</a> (this guide)</p> </li> 
+          <li> <p><a href="ugvw.html">Wicket viewer</a></p> </li> 
+          <li> <p><a href="ugvro.html">Restful Objects viewer</a></p> </li> 
+          <li> <p><a href="ugdno.html">DataNucleus object store</a></p> </li> 
+          <li> <p><a href="ugsec.html">Security</a></p> </li> 
+          <li> <p><a href="ugtst.html">Testing</a></p> </li> 
+          <li> <p><a href="ugbtb.html">Beyond the Basics</a></p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The reference guides are:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><a href="rgant.html">Annotations</a></p> </li> 
+          <li> <p><a href="rgsvc.html">Domain Services</a></p> </li> 
+          <li> <p><a href="rgcfg.html">Configuration Properties</a></p> </li> 
+          <li> <p><a href="rgcms.html">Classes, Methods and Schema</a></p> </li> 
+          <li> <p><a href="rgmvn.html">Apache Isis Maven plugin</a></p> </li> 
+          <li> <p><a href="rgfis.html">Framework Internal Services</a></p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The remaining guides are:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><a href="dg.html">Developers' Guide</a> (how to set up a development environment for Apache Isis and contribute back to the project)</p> </li> 
+          <li> <p><a href="cgcom.html">Committers' Guide</a> (release procedures and related practices)</p> </li> 
+         </ul> 
+        </div> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_ugfun_core-concepts">2. Core Concepts</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_ugfun_core-concepts.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>This introductory chapter should give you a good about what Apache Isis actually <strong>is</strong>: the fundamental ideas and principles that it builds upon, how it compares with other frameworks, what the fundamental building blocks are for actually writing an Isis application, and what services and features the framework provides for you to leverage in your own apps.</p> 
+       </div> 
+       <div class="admonitionblock tip"> 
+        <table> 
+         <tbody>
+          <tr> 
+           <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td> 
+           <td class="content"> 
+            <div class="paragraph"> 
+             <p>Parts of this chapter have been adapted from Dan Haywood\u2019s 2009 book, 'Domain Driven Design using Naked Objects'. We\u2019ve also added some new insights and made sure the material we\u2019ve used is relevant to Apache Isis.</p> 
+            </div> </td> 
+          </tr> 
+         </tbody>
+        </table> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_ugfun_core-concepts_philosophy">2.1. Philosophy and Architecture</h3> 
+        <div class="paragraph"> 
+         <p>This section describes some of the core ideas and architectural patterns upon which Apache Isis builds.</p> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_ugfun_core-concepts_philosophy_domain-driven-design">2.1.1. Domain-Driven Design</h4> 
+         <div class="paragraph"> 
+          <p>There\u2019s no doubt that we developers love the challenge of understanding and deploying complex technologies. But understanding the nuances and subtleties of the business domain itself is just as great a challenge, perhaps more so. If we devoted our efforts to understanding and addressing those subtleties, we could build better, cleaner, and more maintainable software that did a better job for our stakeholders. And there\u2019s no doubt that our stakeholders would thank us for it.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>A couple of years back Eric Evans wrote his book <a href="http://www.amazon.co.uk/Domain-driven-Design-Tackling-Complexity-Software/dp/0321125215">Domain-Driven Design</a>, which is well on its way to becoming a seminal work. In fact, most if not all of the ideas in Evans' book have been expressed before, but what he did was pull those ideas together to show how predominantly object-oriented techniques can be used to develop rich, deep, insightful, and ultimately useful business applications.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>There are two central ideas at the heart of domain-driven design.</p> 
+         </div> 
+         <div class="ulist"> 
+          <ul> 
+           <li> <p>the <strong><em>ubiquitous language</em></strong> is about getting the whole team (both domain experts and developers) to communicate more transparently using a domain model.</p> </li> 
+           <li> <p>Meanwhile, <strong><em>model-driven design</em></strong> is about capturing that model in a very straightforward manner 

<TRUNCATED>

[39/44] isis-site git commit: ISIS-1594: provide an 'edit' button

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/guides/dg.html
----------------------------------------------------------------------
diff --git a/content/guides/dg.html b/content/guides/dg.html
index 14acdb6..35ac34e 100644
--- a/content/guides/dg.html
+++ b/content/guides/dg.html
@@ -1,12 +1,10 @@
 <!doctype html>
 <html class="no-js" lang="en">
-<head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-
-    <title>Developers' Guide</title>
-
-    <!--
+ <head> 
+  <meta charset="utf-8"> 
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"> 
+  <title>Developers' Guide</title> 
+  <!--
         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
@@ -23,31 +21,21 @@
         KIND, either express or implied.  See the License for the
         specific language governing permissions and limitations
         under the License.
-    -->
-
-    <!-- No caching headers -->
-    <meta http-equiv="cache-control" content="no-cache" />
-    <meta http-equiv="pragma" content="no-cache" />
-    <meta http-equiv="expires" content="-1" />
-
-
-    <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
-    <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet" />
-    <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script>
-    <link href="../css/asciidoctor/colony.css" rel="stylesheet">
-    <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-
-
-
-    <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
-    <!--[if lt IE 9]>
+    --> 
+  <!-- No caching headers --> 
+  <meta http-equiv="cache-control" content="no-cache"> 
+  <meta http-equiv="pragma" content="no-cache"> 
+  <meta http-equiv="expires" content="-1"> 
+  <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line --> 
+  <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet"> 
+  <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script> 
+  <link href="../css/asciidoctor/colony.css" rel="stylesheet"> 
+  <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet"> 
+  <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet"> 
+  <!--[if lt IE 9]>
       <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
-    <![endif]-->
-
-
-
-    <style type="text/css">
+    <![endif]--> 
+  <style type="text/css">
         pre code {
             background-color: inherit;
             border-style: none;
@@ -192,9 +180,8 @@ table.CodeRay td.code>pre{padding:0}
         color:#fff;
         font-size: 1.1em;
     }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         @media only screen and (min-width: 40.063em) {
           .top-bar {
             .contain-to-grid .top-bar {
@@ -205,9 +192,8 @@ table.CodeRay td.code>pre{padding:0}
         .row {
             max-width: 80rem;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .extended-quote,
         .extended-quote-first {
             margin-left: 40px;
@@ -231,9 +217,8 @@ table.CodeRay td.code>pre{padding:0}
             text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
         }
         
-    </style>
-
-    <style>
+    </style> 
+  <style>
         body {
           position: relative;
         }
@@ -255,6 +240,7 @@ table.CodeRay td.code>pre{padding:0}
 
         div#doc-content {
             margin-top: 30px;
+            padding-top: 30px;
         }
 
         div.documentation-page table.frame-all {
@@ -286,9 +272,8 @@ table.CodeRay td.code>pre{padding:0}
             min-height: 2000px;
         }
 
-    </style>
-
-    <style>
+    </style> 
+  <style>
 
         @media only screen and (min-width: 768px) {
           #toc.toc2 ul ul { margin-left: -10px; }
@@ -316,15 +301,13 @@ table.CodeRay td.code>pre{padding:0}
         body div#toc2 li.tocify-item.active a {
             color: red;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         footer {
             margin-top: 1000px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* overriding colony.css stylesheet */
         .literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
            /*padding: 1.25em 1.5625em 1.125em 1.5625em;*/
@@ -372,9 +355,8 @@ table.CodeRay td.code>pre{padding:0}
         .imageblock img {
             margin-bottom: 10px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* from http://ben.balter.com/2014/03/13/pages-anchor-links/ */
         .header-link {
           position: absolute;
@@ -395,9 +377,8 @@ table.CodeRay td.code>pre{padding:0}
         h6:hover .header-link {
           opacity: 1;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .top-bar
         {
             -webkit-transition-duration: .5s;
@@ -425,1014 +406,921 @@ table.CodeRay td.code>pre{padding:0}
             -webkit-transition-property: -webkit-transform;
             transition-property: transform;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         #doc-content a.guide {
             color: white;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .tocify {
             margin-top: 80px;
         }
-    </style>
-
-
-</script>
-
-</head>
-<body>
-
-<<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
-    <div class="github-fork-ribbon">
-        <a href="https://github.com/apache/isis#fork-destination-box">Fork me on GitHub</a>
-    </div>
-</div>
-
-
-<div class="row">
-
-    <div class="fixed contain-to-grid header">
-        <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
-            <ul class="title-area">
-                <li class="name">
-                    <h1>
-                        <a href="/index.html">Apache Isis&trade;</a>
-                    </h1>
-                </li>
-                <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
-                <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
-            </ul>
-
-            <section class="top-bar-section">
-                <ul class="right">
-
-                    <li class="has-form">
-                       <FORM class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
-                        <div class="row collapse">
-                            <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
-                            <INPUT type="hidden" name="cof" value="FORID:0">
-                            <INPUT class="form-control" name="q" type="text" placeholder="Search">
-                        </div>
-                    </FORM>
-                     </li>
-
-                </ul>
-
-                <!-- Left Nav Section -->
-                <ul class="left">
-
-                    <li><a href="/documentation.html">Documentation</a></li>
-                    <li><a href="/downloads.html">Downloads</a></li>
-                    <li><a href="/help.html">Help</a></li>
-                    <li><a href="/asf.html">@ASF</a></li>
-
-                </ul>
-
-            </section>
-        </nav>
-    </div>
-</div>
-
-<div class="row">
-
-    <div id="doc-content-left" class="large-9 medium-9 columns">
-
-
-        <div id="doc-content">
-          <div class="sect1">
-<h2 id="_dg">1. Developers' Guide</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>This developers' guide is for:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>programmers who want to just use Apache Isis to build applications, and want help setting up their development
-environment or to build their code from the command line (eg to execute within a continuous integration server such
-as Jenkins)</p>
-</li>
-<li>
-<p>programmers who want to contribute back patches (bug fixes, new features) either to the codebase or the framework&#8217;s documentation</p>
-</li>
-<li>
-<p>committers of Apache Isis itself who want guidance on release process, publishing documents and other related procedures.</p>
-</li>
-</ul>
-</div>
-<div class="sect2">
-<h3 id="_other_guides">1.1. Other Guides</h3>
-<div class="paragraph">
-<p>Apache Isis documentation is broken out into a number of user, reference and "supporting procedures" guides.</p>
-</div>
-<div class="paragraph">
-<p>The user guides available are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="ugfun.html">Fundamentals</a></p>
-</li>
-<li>
-<p><a href="ugvw.html">Wicket viewer</a></p>
-</li>
-<li>
-<p><a href="ugvro.html">Restful Objects viewer</a></p>
-</li>
-<li>
-<p><a href="ugdno.html">DataNucleus object store</a></p>
-</li>
-<li>
-<p><a href="ugsec.html">Security</a></p>
-</li>
-<li>
-<p><a href="ugtst.html">Testing</a></p>
-</li>
-<li>
-<p><a href="ugbtb.html">Beyond the Basics</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The reference guides are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="rgant.html">Annotations</a></p>
-</li>
-<li>
-<p><a href="rgsvc.html">Domain Services</a></p>
-</li>
-<li>
-<p><a href="rgcfg.html">Configuration Properties</a></p>
-</li>
-<li>
-<p><a href="rgcms.html">Classes, Methods and Schema</a></p>
-</li>
-<li>
-<p><a href="rgmvn.html">Apache Isis Maven plugin</a></p>
-</li>
-<li>
-<p><a href="rgfis.html">Framework Internal Services</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The remaining guides are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="#">Developers' Guide</a> (this guide)</p>
-</li>
-<li>
-<p><a href="cgcom.html">Committers' Guide</a> (release procedures and related practices)</p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_dg_ide">2. Using an IDE</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>The vast majority of Java developers use an IDE to assist with developing their code, and we highly recommend that you do like wise as you develop your Apache Isis applications using an IDE.  Apache Isis is built with Maven, and all modern IDEs can import Maven projects.</p>
-</div>
-<div class="paragraph">
-<p>This chapter shows how to setup and use two of the most popular IDEs, IntelliJ IDEA and Eclipse.</p>
-</div>
-<div class="sect2">
-<h3 id="_dg_ide_intellij">2.1. Developing using IntelliJ IDEA</h3>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</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.  JetBrains does however provide complimentary copies of the IntelliJ IDE to Apache committers.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>This section describes how to install and setup JetBrains' IntelliJ IDEA, then how to import an application into IntelliJ and run it.</p>
-</div>
-<div class="sect3">
-<h4 id="_dg_ide_intellij_installing">2.1.1. Installing and Setting up</h4>
-<div class="paragraph">
-<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="_dg_ide_intellij_installing_download">Download and Install</h5>
-<div class="paragraph">
-<p><a href="https://www.jetbrains.com/idea/download/">Download</a> latest version of IntelliJ Community Edition, and install:</p>
-</div>
-<div class="paragraph">
-<p>Start the wizard, click through the welcome page:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="images/appendices/dev-env/intellij-idea/010-installing/010-welcome-page.png" alt="010 welcome page" width="400px">
-</div>
-<div class="title">Figure 1. IntelliJ Installation Wizard - Welcome page</div>
-</div>
-<div class="paragraph">
-<p>Choose the location to install the IDE:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="images/appendices/dev-env/intellij-idea/010-installing/020-choose-location.png" alt="020 choose location" width="400px">
-</div>
-<div class="title">Figure 2. IntelliJ Installation Wizard - Choose Location</div>
-</div>
-<div class="paragraph">
-<p>Adjust any installation options as you prefer:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="images/appendices/dev-env/intellij-idea/010-installing/030-installation-options.png" alt="030 installation options" width="400px">
-</div>
-<div class="title">Figure 3. IntelliJ Installation Wizard - Installation Options</div>
-</div>
-<div class="paragraph">
-<p>and the start menu:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="images/appendices/dev-env/intellij-idea/010-installing/040-start-menu-folder.png" alt="040 start menu folder" width="400px">
-</div>
-<div class="title">Figure 4. IntelliJ Installation Wizard - Start Menu Folder</div>
-</div>
-<div class="paragraph">
-<p>and finish up the wizard:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="images/appendices/dev-env/intellij-idea/010-installing/050-completing.png" alt="050 completing" width="400px">
-</div>
-<div class="title">Figure 5. IntelliJ Installation Wizard - Completing the Wizard</div>
-</div>
-<div class="paragraph">
-<p>Later on we&#8217;ll specify the Apache Isis/ASF code style settings, so for now select <code>I do not want to import settings</code>:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="images/appendices/dev-env/intellij-idea/010-installing/060-import-settings-or-not.png" alt="060 import settings or not" width="400px">
-</div>
-<div class="title">Figure 6. IntelliJ Installation Wizard - Import Settings</div>
-</div>
-<div class="paragraph">
-<p>Finally, if you are a trendy hipster, set the UI theme to Darcula:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="images/appendices/dev-env/intellij-idea/010-installing/070-set-ui-theme.png" alt="070 set ui theme" width="600px">
-</div>
-<div class="title">Figure 7. IntelliJ Installation Wizard Set UI Theme</div>
-</div>
-</div>
-<div class="sect4">
-<h5 id="_dg_ide_intellij_installing_new-project">New Project</h5>
-<div class="paragraph">
-<p>In IntelliJ a project can contain multiple modules; these need not be physically located together.  (If you are previously an Eclipse user, you can think of it as similar to an Eclipse workspace).</p>
-</div>
-<div class="paragraph">
-<p>Start off by creating a new project:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="images/appendices/dev-env/intellij-idea/020-create-new-project/010-new-project-create.png" alt="010 new project create" width="400px">
-</div>
-<div class="title">Figure 8. IntelliJ Create New Project</div>
-</div>
-<div class="paragraph">
-<p>We want to create a new <strong>Java</strong> project:</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="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.  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="250px">
-</div>
-<div class="title">Figure 10. IntelliJ Create New Java Project - Select the JDK</div>
-</div>
-<div class="paragraph">
-<p>Specify the directory containing the JDK:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="images/appendices/dev-env/intellij-idea/020-create-new-project/050-name-and-location.png" alt="050 name and location" width="400px">
-</div>
-<div class="title">Figure 11. IntelliJ Create New Project - Select the JDK location</div>
-</div>
-<div class="paragraph">
-<p>Finally allow IntelliJ to create the directory for the new project:</p>
-</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="250px">
-</div>
-<div class="title">Figure 12. IntelliJ Create New Project</div>
-</div>
-</div>
-<div class="sect4">
-<h5 id="_dg_ide_intellij_file-templates">File templates</h5>
-<div class="paragraph">
-<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>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.</p>
-</div>
-<div class="paragraph">
-<p>Next, 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 14. IntelliJ Import Settings - Specify JAR file</div>
-</div>
-<div class="paragraph">
-<p>Select all the categories (there should just be one), and hit OK.  then hit restart.</p>
-</div>
-<div class="admonitionblock warning">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-warning" title="Warning"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>Apparently no categories are shown if importing into IntelliJ 2016.1.1 Community Edition (and perhaps other 2016
-versions).  The file does import ok into IntelliJ 15.0.x, so we think this is a bug in the 2016 version.</p>
-</div>
-<div class="paragraph">
-<p>The workaround is to extract the <code>.jar</code> file locally and copy the files into IntelliJ&#8217;s <code>config</code> directory, somewhere
-in your home directory:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Windows <code>&lt;User home&gt;\.IdeaIC2016\config</code></p>
-</li>
-<li>
-<p>Linux <code>~/..IdeaIC2016/config</code></p>
-</li>
-<li>
-<p>Mac OS <code>~/Library/Preferences/IdeaIC2016</code></p>
-</li>
-</ul>
-</div>
-</td>
-</tr>
-</table>
-</div>
-</div>
-<div class="sect4">
-<h5 id="_dg_ide_intellij_live-templates">Live templates</h5>
-<div class="paragraph">
-<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/050-live-templates.png" alt="050 live templates" width="600px">
-</div>
-<div class="title">Figure 15. 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">
-<h5 id="_dg_ide_intellij_other-settings-compiler">Other Settings (Compiler)</h5>
-<div class="paragraph">
-<p>There are also some other settings that influence the compiler.  We highly recommend you set these.</p>
-</div>
-<div class="paragraph">
-<p>On the <strong>Compiler</strong> Settings page, ensure that <code>build automatically</code> is enabled (and optionally <code>compile independent modules in parallel</code>):</p>
-</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="700px">
-</div>
-<div class="title">Figure 16. 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="700px">
-</div>
-<div class="title">Figure 17. 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
-for frameworks such as <a href="#_cg_ide_project-lombok">Project Lombok</a>.</p>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>IntelliJ may also have inferred these settings for specific projects/modules when importing; review the list on the left to see if the default is overridden and fix/delete as required.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-</div>
-<div class="sect4">
-<h5 id="_dg_ide_intellij_other-settings-maven">Other Settings (Maven)</h5>
-<div class="paragraph">
-<p>There are also some other settings for Maven that we recommend you adjust (though these are less critical):</p>
-</div>
-<div class="paragraph">
-<p>First, specify an up-to-date Maven installation, using <code>File &gt; Settings</code> (or <code>IntelliJ &gt; Preferences</code> if on MacOS):</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="700px">
-</div>
-<div class="title">Figure 18. 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="700px">
-</div>
-<div class="title">Figure 19. IntelliJ Maven Settings - Configuration</div>
-</div>
-</div>
-<div class="sect4">
-<h5 id="_other_settings_misc">Other Settings (Misc)</h5>
-<div class="paragraph">
-<p>These settings are optional but also recommended.</p>
-</div>
-<div class="paragraph">
-<p>On the <strong>auto import</strong> page, check the <code>optimize imports on the fly</code> and <code>add unambiguous imports on the fly</code></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="700px">
-</div>
-<div class="title">Figure 20. IntelliJ Maven Settings - Auto Import</div>
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_dg_ide_intellij_importing-maven-modules">2.1.2. Importing Maven Modules</h4>
-<div class="paragraph">
-<p>Let&#8217;s load in some actual code!  We do this by importing the Maven modules.</p>
-</div>
-<div class="paragraph">
-<p>First up, open up the Maven tool window (<code>View &gt; Tool Windows &gt; Maven Projects</code>).  You can then use the 'plus' button to add Maven modules.  In the screenshot you can see we&#8217;ve loaded in Apache Isis core; the modules are listed in the <em>Maven Projects</em> window and corresponding (IntelliJ) modules are shown in the <em>Projects</em> window:</p>
-</div>
-<div class="imageblock">
-<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>
-<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>
-</div>
-<div class="imageblock">
-<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>
-<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>
-</div>
-<div class="imageblock">
-<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>
-<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>
-</div>
-<div class="paragraph">
-<p>You can press F4 (or use <code>File &gt; Project Structure</code>) to see the resolved classpath for any of the modules loaded into the project.</p>
-</div>
-<div class="paragraph">
-<p>If you want to focus on one set of code (eg the Isis todoapp but not Apache Isis core) then you <em>could</em> remove the module; but better is to ignore those modules.  This will remove from the the <em>Projects</em> window but keep them available in the <em>Maven Projects</em> window for when you next want to work on them:</p>
-</div>
-<div class="imageblock">
-<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>
-<div class="paragraph">
-<p>Confirm that it&#8217;s ok to ignore these modules:</p>
-</div>
-<div class="imageblock">
-<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>
-<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>
-</div>
-<div class="imageblock">
-<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>
-</div>
-<div class="sect3">
-<h4 id="_dg_ide_intellij_running">2.1.3. Running</h4>
-<div class="paragraph">
-<p>Let&#8217;s see how to run both the app and the tests.</p>
-</div>
-<div class="sect4">
-<h5 id="_dg_ide_intellij_running_the-app">Running the App</h5>
-<div class="paragraph">
-<p>Once you&#8217;ve imported your Isis application, we should run it.  We do this by creating a Run configuration, using <code>Run &gt; Edit Configurations</code>.</p>
-</div>
-<div class="paragraph">
-<p>Set up the details as follows:</p>
-</div>
-<div class="imageblock">
-<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>
-<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>
-</div>
-<div class="paragraph">
-<p>Also note that <code>Use classpath of module</code> is the webapp module for your app, and that the <code>working directory</code> is <code>$MODULE_DIR$</code>.</p>
-</div>
-<div class="paragraph">
-<p>Next, and most importantly, configure the DataNucleus enhancer to run for your <code>dom</code> goal.  This can be done by defining a Maven goal to run before the app:</p>
-</div>
-<div class="imageblock">
-<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>
-<div class="paragraph">
-<p>The <code>-o</code> flag in the goal means run off-line; this will run faster.</p>
-</div>
-<div class="admonitionblock warning">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-warning" title="Warning"></i>
-</td>
-<td class="content">
-if you forget to set up the enhancer goal, or don&#8217;t run it on the correct (dom) module, then you will get all sorts of errors when you startup.  These usually manifest themselves as class cast exception in DataNucleus.
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>You should now be able to run the app using <code>Run &gt; Run Configuration</code>.  The same configuration can also be used to debug the app if you so need.</p>
-</div>
-</div>
-<div class="sect4">
-<h5 id="_dg_ide_intellij_running_unit-tests">Running the Unit Tests</h5>
-<div class="paragraph">
-<p>The easiest way to run the unit tests is just to right click on the <code>dom</code> module in the <em>Project Window</em>, and choose run unit tests.  Hopefully your tests will pass (!).</p>
-</div>
-<div class="imageblock">
-<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>
-<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>
-</div>
-<div class="imageblock">
-<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>
-<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>
-</div>
-</div>
-<div class="sect4">
-<h5 id="_dg_ide_intellij_running_integ-tests">Running the Integration Tests</h5>
-<div class="paragraph">
-<p>Integration tests can be run in the same way as unit tests, however the <code>dom</code> module must also have been enhanced.</p>
-</div>
-<div class="paragraph">
-<p>One approach is to initially run the tests use the right click on the <code>integtests</code> module; the tests will fail because the code won&#8217;t have been enhanced, but we can then go and update the run configuration to run the datanucleus enhancer goal (same as when running the application):</p>
-</div>
-<div class="imageblock">
-<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>
-<div class="paragraph">
-<p>Also make sure that the <code>search for tests</code> radio button is set to <code>In single module</code>:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/appendices/dev-env/intellij-idea/400-running-integtests/run-debug-configuration-single-module.png"><img src="images/appendices/dev-env/intellij-idea/400-running-integtests/run-debug-configuration-single-module.png" alt="run debug configuration single module" width="600px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>If this radio button is set to one of the other options then you may obtain class loading issues; these result from IntelliJ attempting to run unit tests of the <code>dom</code> project that depend on test classes in that module, but using the classpath of the <code>integtests</code> module whereby the <code>dom</code> test-classes (<code>test-jar</code> artifact) are not exposed on the Maven classpath.</p>
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_dg_ide_intellij_hints-and-tips">2.1.4. Hints and Tips</h4>
-<div class="sect4">
-<h5 id="_dg_ide_intellij_hints-and-tips_keyboard-cheat-sheets">Keyboard Cheat Sheets</h5>
-<div class="paragraph">
-<p>You can download 1-page PDFs cheat sheets for IntelliJ&#8217;s keyboard shortcuts:
-* for <a href="https://www.jetbrains.com/idea/docs/IntelliJIDEA_ReferenceCard.pdf">Windows</a>
-* for <a href="https://www.jetbrains.com/idea/docs/IntelliJIDEA_ReferenceCard_Mac.pdf">MacOS</a></p>
-</div>
-<div class="paragraph">
-<p>Probably the most important shortcut on them is for <code>Find Action</code>:
-- <code>ctrl-shift-A</code> on Windows
-- <code>cmd-shift-A</code> on MacOS.</p>
-</div>
-<div class="paragraph">
-<p>This will let you search for any action just by typing its name.</p>
-</div>
-</div>
-<div class="sect4">
-<h5 id="_switch_between_tools_editors">Switch between Tools &amp; Editors</h5>
-<div class="paragraph">
-<p>The Tool Windows are the views around the editor (to left, bottom and right).  It&#8217;s possible to move these around to your preferred locations.</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Use <code>alt-1</code> through <code>alt-9</code> (or <code>cmd-1</code> through <code>alt-9</code>) to select the tool windows</p>
-<div class="ulist">
-<ul>
-<li>
-<p>Press it twice and the tool window will hide itself; so can use to toggle</p>
-</li>
-</ul>
-</div>
-</li>
-<li>
-<p>If in the <em>Project Window</em> (say) and hit enter on a file, then it will be shown in the editor, but (conveniently) the focus remains in the tool window.  To switch to the editor, just press <code>Esc</code>.</p>
-<div class="ulist">
-<ul>
-<li>
-<p>If in the <em>Terminal Window</em>, you&#8217;ll need to press <code>Shift-Esc</code>.</p>
-</li>
-</ul>
-</div>
-</li>
-<li>
-<p>If on the editor and want to locate the file in (say) the <em>Project Window</em>, use <code>alt-F1</code>.</p>
-</li>
-<li>
-<p>To change the size of any tool window, use <code>ctrl-shift-arrow</code></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>Using these shortcuts you can easily toggle between the tool windows and the editor, without using the mouse.  Peachy!</p>
-</div>
-</div>
-<div class="sect4">
-<h5 id="_dg_ide_intellij_hints-and-tips_navigating-around">Navigating Around</h5>
-<div class="paragraph">
-<p>For all of the following, you don&#8217;t need to type every letter, typing "ab" will actually search for ".<strong>a.*b.</strong>".</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>to open classes or files or methods that you know the name of:</p>
-<div class="ulist">
-<ul>
-<li>
-<p><code>ctrl-N</code> to open class</p>
-</li>
-<li>
-<p><code>ctrl-shift-N</code> to open a file</p>
-</li>
-<li>
-<p>(bit fiddly this) <code>ctrl-shift-alt-N</code> to search for any symbol.</p>
-</li>
-</ul>
-</div>
-</li>
-<li>
-<p>open up dialog of recent files: <code>ctrl-E</code></p>
-</li>
-<li>
-<p>search for any file: <code>shift-shift</code></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>Navigating around:
-* find callers of a method (the call hierarchy): <code>ctrl-alt-H</code>
-* find subclasses or overrides: <code>ctrl-alt-B</code>
-* find superclasses/interface/declaration: <code>ctrl-B</code></p>
-</div>
-<div class="paragraph">
-<p>Viewing the structure (ie outline) of a class
-* <code>ctrl-F12</code> will pop-up a dialog showing all members
-** hit <code>ctrl-F12</code> again to also see inherited members</p>
-</div>
-</div>
-<div class="sect4">
-<h5 id="_dg_ide_intellij_hints-and-tips_editing">Editing</h5>
-<div class="ulist">
-<ul>
-<li>
-<p>Extend selection using <code>ctrl-W</code></p>
-<div class="ulist">
-<ul>
-<li>
-<p>and contract it down again using <code>ctrl-shift-W</code></p>
-</li>
-</ul>
-</div>
-</li>
-<li>
-<p>to duplicate a line, it&#8217;s <code>ctrl-D</code></p>
-<div class="ulist">
-<ul>
-<li>
-<p>if you have some text selected (or even some lines), it&#8217;ll actually duplicate the entire selection</p>
-</li>
-</ul>
-</div>
-</li>
-<li>
-<p>to delete a line, it&#8217;s <code>ctrl-X</code></p>
-</li>
-<li>
-<p>to move a line up or down: <code>shift-alt-up</code> and <code>shift-alt-down</code></p>
-<div class="ulist">
-<ul>
-<li>
-<p>if you have selected several lines, it&#8217;ll move them all togethe</p>
-</li>
-</ul>
-</div>
-</li>
-<li>
-<p><code>ctrl-shift-J</code> can be handy for joining lines together</p>
-<div class="ulist">
-<ul>
-<li>
-<p>just hit enter to split them apart (even in string quotes; IntelliJ will "do the right thing")</p>
-</li>
-</ul>
-</div>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect4">
-<h5 id="_intentions_and_code_completion">Intentions and Code Completion</h5>
-<div class="paragraph">
-<p>Massively useful is the "Intentions" popup; IntelliJ tries to guess what you might want to do.  You can activate this using`alt-enter`, whenever you see a lightbulb/tooltip in the margin of the current line.</p>
-</div>
-<div class="paragraph">
-<p>Code completion usually happens whenever you type '.'.  You can also use <code>ctrl-space</code> to bring these up.</p>
-</div>
-<div class="paragraph">
-<p>In certain circumstances (eg in methods0) you can also type <code>ctrl-shift-space</code> to get a smart list of methods etc that you might want to call.  Can be useful.</p>
-</div>
-<div class="paragraph">
-<p>Last, when invoking a method, use <code>ctrl-P</code> to see the parameter types.</p>
-</div>
-</div>
-<div class="sect4">
-<h5 id="_dg_ide_intellij_hints-and-tips_refactoring">Refactoring</h5>
-<div class="paragraph">
-<p>Loads of good stuff on the <code>Refactor</code> menu; most used are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Rename (<code>shift-F6</code>)</p>
-</li>
-<li>
-<p>Extract</p>
-<div class="ulist">
-<ul>
-<li>
-<p>method: <code>ctrl-alt-M</code></p>
-</li>
-<li>
-<p>variable: <code>ctrl-alt-V</code></p>
-</li>
-</ul>
-</div>
-</li>
-<li>
-<p>Inline method/variable: <code>ctrl-alt-N</code></p>
-</li>
-<li>
-<p>Change signature</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>If you can&#8217;t remember all those shortcuts, just use <code>ctrl-shift-alt-T</code> (might want to rebind that to something else!) and get a context-sensitive list of refactorings available for the currently selected object</p>
-</div>
-</div>
-<div class="sect4">
-<h5 id="_dg_ide_intellij_hints-and-tips_plugins">Plugins</h5>
-<div class="paragraph">
-<p>You might want to set up some additional plugins.  You can do this using <code>File &gt; Settings &gt; Plugins</code> (or equivalently <code>File &gt; Other Settings &gt; Configure Plugins</code>).</p>
-</div>
-<div class="paragraph">
-<p>Recommended are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="https://plugins.jetbrains.com/plugin/7179?pr=idea">Maven Helper</a> plugin</p>
-<div class="paragraph">
-<p>More on this below.</p>
-</div>
-</li>
-<li>
-<p><a href="https://github.com/asciidoctor/asciidoctor-intellij-plugin">AsciiDoctor</a> plugin</p>
-<div class="paragraph">
-<p>Useful if you are doing any authoring of documents.</p>
-</div>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>Some others you might like to explore are:</p>
-</div>
-<div class="imageblock">
-<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>
-<div class="sect5">
-<h6 id="_dg_ide_intellij_hints-and-tips_plugins_maven-helper-plugin">Maven Helper Plugin</h6>
-<div class="paragraph">
-<p>This plugin provides a couple of great features.  One is better visualization of dependency trees (similar to Eclipse).</p>
-</div>
-<div class="paragraph">
-<p>If you open a <code>pom.xml</code> file, you&#8217;ll see an additional "Dependencies" tab:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/appendices/dev-env/intellij-idea/050-some-plugins/maven-helper/010-dependency-tab.png"><img src="images/appendices/dev-env/intellij-idea/050-some-plugins/maven-helper/010-dependency-tab.png" alt="010 dependency tab" width="600px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>Clicking on this gives a graphical tree representation of the dependencies, similar to that obtained by <code>mvn dependency:tree</code>, but filterable.</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/appendices/dev-env/intellij-idea/050-some-plugins/maven-helper/020-dependency-as-tree.png"><img src="images/appendices/dev-env/intellij-idea/050-some-plugins/maven-helper/020-dependency-as-tree.png" alt="020 dependency as tree" width="600px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>The plugin also provides the ability to easily run a Maven goal on a project:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/appendices/dev-env/intellij-idea/050-some-plugins/maven-helper/030-maven-run-goal.png"><img src="images/appendices/dev-env/intellij-idea/050-some-plugins/maven-helper/030-maven-run-goal.png" alt="030 maven run goal" width="600px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>This menu can also be bound to a keystroke so that it is available as a pop-up:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/appendices/dev-env/intellij-idea/050-some-plugins/maven-helper/040-maven-quick-run.png"><img src="images/appendices/dev-env/intellij-idea/050-some-plugins/maven-helper/040-maven-quick-run.png" alt="040 maven quick run" width="600px"></a>
-</div>
-</div>
-</div>
-</div>
-<div class="sect4">
-<h5 id="_dg_ide_intellij_troubleshooting">Troubleshooting</h5>
-<div class="paragraph">
-<p>When a Maven module is imported, IntelliJ generates its own project files (suffix <code>.ipr</code>), and the application is actually built from that.</p>
-</div>
-<div class="paragraph">
-<p>Occasionally these don&#8217;t keep in sync (even if auto-import of Maven modules has been enabled).</p>
-</div>
-<div class="paragraph">
-<p>To fix the issue, try:
-* reimport module
-* rebuild selected modules/entire project
-* remove and then re-add the project
-* restart, invalidating caches
-* hit StackOverflow (!)</p>
-</div>
-<div class="paragraph">
-<p>One thing worth knowing; IntelliJ actively scans the filesystem all the time.  It&#8217;s therefore (almost always) fine to build the app from the Maven command line; IntelliJ will detect the changes and keep in sync.  If you want to force that, use <code>File &gt; Synchronize</code>, <code>ctrl-alt-Y</code>.</p>
-</div>
-<div class="paragraph">
-<p>If you hit an error of "duplicate classes":</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/appendices/dev-env/intellij-idea/060-troubleshooting/010-duplicate-classes.png"><img src="images/appendices/dev-env/intellij-idea/060-troubleshooting/010-duplicate-classes.png" alt="010 duplicate classes" width="600px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>then make sure you have correctly configured the <a href="#_cg_ide_intellij_other-settings-compiler">annotation processor</a>
-settings.  Pay attention in particular to the "Production sources directory" and "Test sources directory", that these
-are set up correctly.</p>
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_dg_ide_intellij_advanced">2.1.5. Faster turnaround times</h4>
-<div class="paragraph">
-<p>In this section are several options that will reduce the time it takes between making a source code edit and seeing the results in the running app. code/build/deploy/review feedback loop.</p>
-</div>
-<div class="sect4">
-<h5 id="_dg_ide_intellij_advanced_gradle-compile-enhance">Using Grade to compile/enhance</h5>
-<div class="paragraph">
-<p>Running an Apache Isis application requires that the DataNucleus enhancer runs on the compiled bytecode.  As described <a href="#_dg_ide_intellij_running_the-app">above</a>, the recommended way to do this with IntelliJ is to use a Run configuration that runs the enhancer goal prior to launch.</p>
-</div>
-<div class="paragraph">
-<p>Alternative, you can use the following <code>build.gradle</code> script in your <code>dom</code> module:</p>
-</div>
-<div class="listingblock">
-<div class="title"><code>build.gradle</code></div>
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="groovy">apply <span class="key">plugin</span>: <span class="string"><span class="delimiter">'</span><span class="content">java</span><span class="delimiter">'</span></span>
+    </style> 
+  <style>
+        .tocify {
+            margin-top: 80px;
+        }
+    </style>  
+ </head> 
+ <body> 
+  <div class="row"> 
+   <div class="fixed contain-to-grid header"> 
+    <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem"> 
+     <ul class="title-area"> 
+      <li class="name"> <h1> <a href="/index.html">Apache Isis\u2122</a> </h1> </li> 
+      <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone --> 
+      <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li> 
+     </ul> 
+     <section class="top-bar-section"> 
+      <ul class="right"> 
+       <li class="has-form"> 
+        <form class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse"> 
+         <div class="row collapse"> 
+          <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya"> 
+          <input type="hidden" name="cof" value="FORID:0"> 
+          <input class="form-control" name="q" type="text" placeholder="Search"> 
+         </div> 
+        </form> </li> 
+      </ul> 
+      <!-- Left Nav Section --> 
+      <ul class="left"> 
+       <li><a href="/documentation.html">Documentation</a></li> 
+       <li><a href="/downloads.html">Downloads</a></li> 
+       <li><a href="/help.html">Help</a></li> 
+       <li><a href="/asf.html">@ASF</a></li> 
+      </ul> 
+     </section> 
+    </nav> 
+   </div> 
+  </div> 
+  <div class="row"> 
+   <div id="doc-content-left" class="large-9 medium-9 columns"> 
+    <div id="doc-content">
+     <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/dg.adoc&quot;" style="float: right; font-size: small; padding: 6px;  "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+     <div class="sect1"> 
+      <h2 id="_dg">1. Developers' Guide</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_dg.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>This developers' guide is for:</p> 
+       </div> 
+       <div class="ulist"> 
+        <ul> 
+         <li> <p>programmers who want to just use Apache Isis to build applications, and want help setting up their development environment or to build their code from the command line (eg to execute within a continuous integration server such as Jenkins)</p> </li> 
+         <li> <p>programmers who want to contribute back patches (bug fixes, new features) either to the codebase or the framework\u2019s documentation</p> </li> 
+         <li> <p>committers of Apache Isis itself who want guidance on release process, publishing documents and other related procedures.</p> </li> 
+        </ul> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_other_guides">1.1. Other Guides</h3> 
+        <div class="paragraph"> 
+         <p>Apache Isis documentation is broken out into a number of user, reference and "supporting procedures" guides.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The user guides available are:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><a href="ugfun.html">Fundamentals</a></p> </li> 
+          <li> <p><a href="ugvw.html">Wicket viewer</a></p> </li> 
+          <li> <p><a href="ugvro.html">Restful Objects viewer</a></p> </li> 
+          <li> <p><a href="ugdno.html">DataNucleus object store</a></p> </li> 
+          <li> <p><a href="ugsec.html">Security</a></p> </li> 
+          <li> <p><a href="ugtst.html">Testing</a></p> </li> 
+          <li> <p><a href="ugbtb.html">Beyond the Basics</a></p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The reference guides are:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><a href="rgant.html">Annotations</a></p> </li> 
+          <li> <p><a href="rgsvc.html">Domain Services</a></p> </li> 
+          <li> <p><a href="rgcfg.html">Configuration Properties</a></p> </li> 
+          <li> <p><a href="rgcms.html">Classes, Methods and Schema</a></p> </li> 
+          <li> <p><a href="rgmvn.html">Apache Isis Maven plugin</a></p> </li> 
+          <li> <p><a href="rgfis.html">Framework Internal Services</a></p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The remaining guides are:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><a href="#">Developers' Guide</a> (this guide)</p> </li> 
+          <li> <p><a href="cgcom.html">Committers' Guide</a> (release procedures and related practices)</p> </li> 
+         </ul> 
+        </div> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_dg_ide">2. Using an IDE</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_dg_ide.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>The vast majority of Java developers use an IDE to assist with developing their code, and we highly recommend that you do like wise as you develop your Apache Isis applications using an IDE. Apache Isis is built with Maven, and all modern IDEs can import Maven projects.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>This chapter shows how to setup and use two of the most popular IDEs, IntelliJ IDEA and Eclipse.</p> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_dg_ide_intellij">2.1. Developing using IntelliJ IDEA</h3> 
+        <div class="admonitionblock note"> 
+         <table> 
+          <tbody>
+           <tr> 
+            <td class="icon"> <i class="fa icon-note" title="Note"></i> </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. JetBrains does however provide complimentary copies of the IntelliJ IDE to Apache committers.</p> 
+             </div> </td> 
+           </tr> 
+          </tbody>
+         </table> 
+        </div> 
+        <div class="paragraph"> 
+         <p>This section describes how to install and setup JetBrains' IntelliJ IDEA, then how to import an application into IntelliJ and run it.</p> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_dg_ide_intellij_installing">2.1.1. Installing and Setting up</h4> 
+         <div class="paragraph"> 
+          <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="_dg_ide_intellij_installing_download">Download and Install</h5> 
+          <div class="paragraph"> 
+           <p><a href="https://www.jetbrains.com/idea/download/">Download</a> latest version of IntelliJ Community Edition, and install:</p> 
+          </div> 
+          <div class="paragraph"> 
+           <p>Start the wizard, click through the welcome page:</p> 
+          </div> 
+          <div class="imageblock"> 
+           <div class="content"> 
+            <img src="images/appendices/dev-env/intellij-idea/010-installing/010-welcome-page.png" alt="010 welcome page" width="400px"> 
+           </div> 
+           <div class="title">
+            Figure 1. IntelliJ Installation Wizard - Welcome page
+           </div> 
+          </div> 
+          <div class="paragraph"> 
+           <p>Choose the location to install the IDE:</p> 
+          </div> 
+          <div class="imageblock"> 
+           <div class="content"> 
+            <img src="images/appendices/dev-env/intellij-idea/010-installing/020-choose-location.png" alt="020 choose location" width="400px"> 
+           </div> 
+           <div class="title">
+            Figure 2. IntelliJ Installation Wizard - Choose Location
+           </div> 
+          </div> 
+          <div class="paragraph"> 
+           <p>Adjust any installation options as you prefer:</p> 
+          </div> 
+          <div class="imageblock"> 
+           <div class="content"> 
+            <img src="images/appendices/dev-env/intellij-idea/010-installing/030-installation-options.png" alt="030 installation options" width="400px"> 
+           </div> 
+           <div class="title">
+            Figure 3. IntelliJ Installation Wizard - Installation Options
+           </div> 
+          </div> 
+          <div class="paragraph"> 
+           <p>and the start menu:</p> 
+          </div> 
+          <div class="imageblock"> 
+           <div class="content"> 
+            <img src="images/appendices/dev-env/intellij-idea/010-installing/040-start-menu-folder.png" alt="040 start menu folder" width="400px"> 
+           </div> 
+           <div class="title">
+            Figure 4. IntelliJ Installation Wizard - Start Menu Folder
+           </div> 
+          </div> 
+          <div class="paragraph"> 
+           <p>and finish up the wizard:</p> 
+          </div> 
+          <div class="imageblock"> 
+           <div class="content"> 
+            <img src="images/appendices/dev-env/intellij-idea/010-installing/050-completing.png" alt="050 completing" width="400px"> 
+           </div> 
+           <div class="title">
+            Figure 5. IntelliJ Installation Wizard - Completing the Wizard
+           </div> 
+          </div> 
+          <div class="paragraph"> 
+           <p>Later on we\u2019ll specify the Apache Isis/ASF code style settings, so for now select <code>I do not want to import settings</code>:</p> 
+          </div> 
+          <div class="imageblock"> 
+           <div class="content"> 
+            <img src="images/appendices/dev-env/intellij-idea/010-installing/060-import-settings-or-not.png" alt="060 import settings or not" width="400px"> 
+           </div> 
+           <div class="title">
+            Figure 6. IntelliJ Installation Wizard - Import Settings
+           </div> 
+          </div> 
+          <div class="paragraph"> 
+           <p>Finally, if you are a trendy hipster, set the UI theme to Darcula:</p> 
+          </div> 
+          <div class="imageblock"> 
+           <div class="content"> 
+            <img src="images/appendices/dev-env/intellij-idea/010-installing/070-set-ui-theme.png" alt="070 set ui theme" width="600px"> 
+           </div> 
+           <div class="title">
+            Figure 7. IntelliJ Installation Wizard Set UI Theme
+           </div> 
+          </div> 
+         </div> 
+         <div class="sect4"> 
+          <h5 id="_dg_ide_intellij_installing_new-project">New Project</h5> 
+          <div class="paragraph"> 
+           <p>In IntelliJ a project can contain multiple modules; these need not be physically located together. (If you are previously an Eclipse user, you can think of it as similar to an Eclipse workspace).</p> 
+          </div> 
+          <div class="paragraph"> 
+           <p>Start off by creating a new project:</p> 
+          </div> 
+          <div class="imageblock"> 
+           <div class="content"> 
+            <img src="images/appendices/dev-env/intellij-idea/020-create-new-project/010-new-project-create.png" alt="010 new project create" width="400px"> 
+           </div> 
+           <div class="title">
+            Figure 8. IntelliJ Create New Project
+           </div> 
+          </div> 
+          <div class="paragraph"> 
+           <p>We want to create a new <strong>Java</strong> project:</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="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. 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="250px"> 
+           </div> 
+           <div class="title">
+            Figure 10. IntelliJ Create New Java Project - Select the JDK
+           </div> 
+          </div> 
+          <div class="paragraph"> 
+           <p>Specify the directory containing the JDK:</p> 
+          </div> 
+          <div class="imageblock"> 
+           <div class="content"> 
+            <img src="images/appendices/dev-env/intellij-idea/020-create-new-project/050-name-and-location.png" alt="050 name and location" width="400px"> 
+           </div> 
+           <div class="title">
+            Figure 11. IntelliJ Create New Project - Select the JDK location
+           </div> 
+          </div> 
+          <div class="paragraph"> 
+           <p>Finally allow IntelliJ to create the directory for the new project:</p> 
+          </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="250px"> 
+           </div> 
+           <div class="title">
+            Figure 12. IntelliJ Create New Project
+           </div> 
+          </div> 
+         </div> 
+         <div class="sect4"> 
+          <h5 id="_dg_ide_intellij_file-templates">File templates</h5> 
+          <div class="paragraph"> 
+           <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>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.</p> 
+          </div> 
+          <div class="paragraph"> 
+           <p>Next, 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 14. IntelliJ Import Settings - Specify JAR file
+           </div> 
+          </div> 
+          <div class="paragraph"> 
+           <p>Select all the categories (there should just be one), and hit OK. then hit restart.</p> 
+          </div> 
+          <div class="admonitionblock warning"> 
+           <table> 
+            <tbody>
+             <tr> 
+              <td class="icon"> <i class="fa icon-warning" title="Warning"></i> </td> 
+              <td class="content"> 
+               <div class="paragraph"> 
+                <p>Apparently no categories are shown if importing into IntelliJ 2016.1.1 Community Edition (and perhaps other 2016 versions). The file does import ok into IntelliJ 15.0.x, so we think this is a bug in the 2016 version.</p> 
+               </div> 
+               <div class="paragraph"> 
+                <p>The workaround is to extract the <code>.jar</code> file locally and copy the files into IntelliJ\u2019s <code>config</code> directory, somewhere in your home directory:</p> 
+               </div> 
+               <div class="ulist"> 
+                <ul> 
+                 <li> <p>Windows <code>&lt;User home&gt;\.IdeaIC2016\config</code></p> </li> 
+                 <li> <p>Linux <code>~/..IdeaIC2016/config</code></p> </li> 
+                 <li> <p>Mac OS <code>~/Library/Preferences/IdeaIC2016</code></p> </li> 
+                </ul> 
+               </div> </td> 
+             </tr> 
+            </tbody>
+           </table> 
+          </div> 
+         </div> 
+         <div class="sect4"> 
+          <h5 id="_dg_ide_intellij_live-templates">Live templates</h5> 
+          <div class="paragraph"> 
+           <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/050-live-templates.png" alt="050 live templates" width="600px"> 
+           </div> 
+           <div class="title">
+            Figure 15. 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"> 
+          <h5 id="_dg_ide_intellij_other-settings-compiler">Other Settings (Compiler)</h5> 
+          <div class="paragraph"> 
+           <p>There are also some other settings that influence the compiler. We highly recommend you set these.</p> 
+          </div> 
+          <div class="paragraph"> 
+           <p>On the <strong>Compiler</strong> Settings page, ensure that <code>build automatically</code> is enabled (and optionally <code>compile independent modules in parallel</code>):</p> 
+          </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="700px"> 
+           </div> 
+           <div class="title">
+            Figure 16. 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="700px"> 
+           </div> 
+           <div class="title">
+            Figure 17. 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 for frameworks such as <a href="#_cg_ide_project-lombok">Project Lombok</a>.</p> 
+          </div> 
+          <div class="admonitionblock note"> 
+           <table> 
+            <tbody>
+             <tr> 
+              <td class="icon"> <i class="fa icon-note" title="Note"></i> </td> 
+              <td class="content"> 
+               <div class="paragraph"> 
+                <p>IntelliJ may also have inferred these settings for specific projects/modules when importing; review the list on the left to see if the default is overridden and fix/delete as required.</p> 
+               </div> </td> 
+             </tr> 
+            </tbody>
+           </table> 
+          </div> 
+         </div> 
+         <div class="sect4"> 
+          <h5 id="_dg_ide_intellij_other-settings-maven">Other Settings (Maven)</h5> 
+          <div class="paragraph"> 
+           <p>There are also some other settings for Maven that we recommend you adjust (though these are less critical):</p> 
+          </div> 
+          <div class="paragraph"> 
+           <p>First, specify an up-to-date Maven installation, using <code>File &gt; Settings</code> (or <code>IntelliJ &gt; Preferences</code> if on MacOS):</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="700px"> 
+           </div> 
+           <div class="title">
+            Figure 18. 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="700px"> 
+           </div> 
+           <div class="title">
+            Figure 19. IntelliJ Maven Settings - Configuration
+           </div> 
+          </div> 
+         </div> 
+         <div class="sect4"> 
+          <h5 id="_other_settings_misc">Other Settings (Misc)</h5> 
+          <div class="paragraph"> 
+           <p>These settings are optional but also recommended.</p> 
+          </div> 
+          <div class="paragraph"> 
+           <p>On the <strong>auto import</strong> page, check the <code>optimize imports on the fly</code> and <code>add unambiguous imports on the fly</code></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="700px"> 
+           </div> 
+           <div class="title">
+            Figure 20. IntelliJ Maven Settings - Auto Import
+           </div> 
+          </div> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_dg_ide_intellij_importing-maven-modules">2.1.2. Importing Maven Modules</h4> 
+         <div class="paragraph"> 
+          <p>Let\u2019s load in some actual code! We do this by importing the Maven modules.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>First up, open up the Maven tool window (<code>View &gt; Tool Windows &gt; Maven Projects</code>). You can then use the 'plus' button to add Maven modules. In the screenshot you can see we\u2019ve loaded in Apache Isis core; the modules are listed in the <em>Maven Projects</em> window and corresponding (IntelliJ) modules are shown in the <em>Projects</em> window:</p> 
+         </div> 
+         <div class="imageblock"> 
+          <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> 
+         <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> 
+         </div> 
+         <div class="imageblock"> 
+          <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> 
+         <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> 
+         </div> 
+         <div class="imageblock"> 
+          <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> 
+         <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> 
+         </div> 
+         <div class="paragraph"> 
+          <p>You can press F4 (or use <code>File &gt; Project Structure</code>) to see the resolved classpath for any of the modules loaded into the project.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>If you want to focus on one set of code (eg the Isis todoapp but not Apache Isis core) then you <em>could</em> remove the module; but better is to ignore those modules. This will remove from the the <em>Projects</em> window but keep them available in the <em>Maven Projects</em> window for when you next want to work on them:</p> 
+         </div> 
+         <div class="imageblock"> 
+          <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> 
+         <div class="paragraph"> 
+          <p>Confirm that it\u2019s ok to ignore these modules:</p> 
+         </div> 
+         <div class="imageblock"> 
+          <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> 
+         <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> 
+         </div> 
+         <div class="imageblock"> 
+          <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> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_dg_ide_intellij_running">2.1.3. Running</h4> 
+         <div class="paragraph"> 
+          <p>Let\u2019s see how to run both the app and the tests.</p> 
+         </div> 
+         <div class="sect4"> 
+          <h5 id="_dg_ide_intellij_running_the-app">Running the App</h5> 
+          <div class="paragraph"> 
+           <p>Once you\u2019ve imported your Isis application, we should run it. We do this by creating a Run configuration, using <code>Run &gt; Edit Configurations</code>.</p> 
+          </div> 
+          <div class="paragraph"> 
+           <p>Set up the details as follows:</p> 
+          </div> 
+          <div class="imageblock"> 
+           <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> 
+          <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\u2019s possible to pass program arguments to this (eg to automatically install fixtures), but for now leave this blank.</p> 
+          </div> 
+          <div class="paragraph"> 
+           <p>Also note that <code>Use classpath of module</code> is the webapp module for your app, and that the <code>working directory</code> is <code>$MODULE_DIR$</code>.</p> 
+          </div> 
+          <div class="paragraph"> 
+           <p>Next, and most importantly, configure the DataNucleus enhancer to run for your <code>dom</code> goal. This can be done by defining a Maven goal to run before the app:</p> 
+          </div> 
+          <div class="imageblock"> 
+           <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> 
+          <div class="paragraph"> 
+           <p>The <code>-o</code> flag in the goal means run off-line; this will run faster.</p> 
+          </div> 
+          <div class="admonitionblock warning"> 
+           <table> 
+            <tbody>
+             <tr> 
+              <td class="icon"> <i class="fa icon-warning" title="Warning"></i> </td> 
+              <td class="content"> if you forget to set up the enhancer goal, or don\u2019t run it on the correct (dom) module, then you will get all sorts of errors when you startup. These usually manifest themselves as class cast exception in DataNucleus. </td> 
+             </tr> 
+            </tbody>
+           </table> 
+          </div> 
+          <div class="paragraph"> 
+           <p>You should now be able to run the app using <code>Run &gt; Run Configuration</code>. The same configuration can also be used to debug the app if you so need.</p> 
+          </div> 
+         </div> 
+         <div class="sect4"> 
+          <h5 id="_dg_ide_intellij_running_unit-tests">Running the Unit Tests</h5> 
+          <div class="paragraph"> 
+           <p>The easiest way to run the unit tests is just to right click on the <code>dom</code> module in the <em>Project Window</em>, and choose run unit tests. Hopefully your tests will pass (!).</p> 
+          </div> 
+          <div class="imageblock"> 
+           <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> 
+          <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> 
+          </div> 
+          <div class="imageblock"> 
+           <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> 
+          <div class="paragraph"> 
+           <p>Thereafter, you should run units by selecting this configuration (if you use the right click approach you\u2019ll end up with lots of run configurations, all similar).</p> 
+          </div> 
+         </div> 
+         <div class="sect4"> 
+          <h5 id="_dg_ide_intellij_running_integ-tests">Running the Integration Tests</h5> 
+          <div class="paragraph"> 
+           <p>Integration tests can be run in the same way as unit tests, however the <code>dom</code> module must also have been enhanced.</p> 
+          </div> 
+          <div class="paragraph"> 
+           <p>One approach is to initially run the tests use the right click on the <code>integtests</code> module; the tests will fail because the code won\u2019t have been enhanced, but we can then go and update the run configuration to run the datanucleus enhancer goal (same as when running the application):</p> 
+          </div> 
+          <div class="imageblock"> 
+           <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> 
+          <div class="paragraph"> 
+           <p>Also make sure that the <code>search for tests</code> radio button is set to <code>In single module</code>:</p> 
+          </div> 
+          <div class="imageblock"> 
+           <div class="content"> 
+            <a class="image" href="images/appendices/dev-env/intellij-idea/400-running-integtests/run-debug-configuration-single-module.png"><img src="images/appendices/dev-env/intellij-idea/400-running-integtests/run-debug-configuration-single-module.png" alt="run debug configuration single module" width="600px"></a> 
+           </div> 
+          </div> 
+          <div class="paragraph"> 
+           <p>If this radio button is set to one of the other options then you may obtain class loading issues; these result from IntelliJ attempting to run unit tests of the <code>dom</code> project that depend on test classes in that module, but using the classpath of the <code>integtests</code> module whereby the <code>dom</code> test-classes (<code>test-jar</code> artifact) are not exposed on the Maven classpath.</p> 
+          </div> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_dg_ide_intellij_hints-and-tips">2.1.4. Hints and Tips</h4> 
+         <div class="sect4"> 
+          <h5 id="_dg_ide_intellij_hints-and-tips_keyboard-cheat-sheets">Keyboard Cheat Sheets</h5> 
+          <div class="paragraph"> 
+           <p>You can download 1-page PDFs cheat sheets for IntelliJ\u2019s keyboard shortcuts: * for <a href="https://www.jetbrains.com/idea/docs/IntelliJIDEA_ReferenceCard.pdf">Windows</a> * for <a href="https://www.jetbrains.com/idea/docs/IntelliJIDEA_ReferenceCard_Mac.pdf">MacOS</a></p> 
+          </div> 
+          <div class="paragraph"> 
+           <p>Probably the most important shortcut on them is for <code>Find Action</code>: - <code>ctrl-shift-A</code> on Windows - <code>cmd-shift-A</code> on MacOS.</p> 
+          </div> 
+          <div class="paragraph"> 
+           <p>This will let you search for any action just by typing its name.</p> 
+          </div> 
+         </div> 
+         <div class="sect4"> 
+          <h5 id="_switch_between_tools_editors">Switch between Tools &amp; Editors</h5> 
+          <div class="paragraph"> 
+           <p>The Tool Windows are the views around the editor (to left, bottom and right). It\u2019s possible to move these around to your preferred locations.</p> 
+          </div> 
+          <div class="ulist"> 
+           <ul> 
+            <li> <p>Use <code>alt-1</code> through <code>alt-9</code> (or <code>cmd-1</code> through <code>alt-9</code>) to select the tool windows</p> 
+             <div class="ulist"> 
+              <ul> 
+               <li> <p>Press it twice and the tool window will hide itself; so can use to toggle</p> </li> 
+              </ul> 
+             </div> </li> 
+            <li> <p>If in the <em>Project Window</em> (say) and hit enter on a file, then it will be shown in the editor, but (conveniently) the focus remains in the tool window. To switch to the editor, just press <code>Esc</code>.</p> 
+             <div class="ulist"> 
+              <ul> 
+               <li> <p>If in the <em>Terminal Window</em>, you\u2019ll need to press <code>Shift-Esc</code>.</p> </li> 
+              </ul> 
+             </div> </li> 
+            <li> <p>If on the editor and want to locate the file in (say) the <em>Project Window</em>, use <code>alt-F1</code>.</p> </li> 
+            <li> <p>To change the size of any tool window, use <code>ctrl-shift-arrow</code></p> </li> 
+           </ul> 
+          </div> 
+          <div class="paragraph"> 
+           <p>Using these shortcuts you can easily toggle between the tool windows and the editor, without using the mouse. Peachy!</p> 
+          </div> 
+         </div> 
+         <div class="sect4"> 
+          <h5 id="_dg_ide_intellij_hints-and-tips_navigating-around">Navigating Around</h5> 
+          <div class="paragraph"> 
+           <p>For all of the following, you don\u2019t need to type every letter, typing "ab" will actually search for ".<strong>a.*b.</strong>".</p> 
+          </div> 
+          <div class="ulist"> 
+           <ul> 
+            <li> <p>to open classes or files or methods that you know the name of:</p> 
+             <div class="ulist"> 
+              <ul> 
+               <li> <p><code>ctrl-N</code> to open class</p> </li> 
+               <li> <p><code>ctrl-shift-N</code> to open a file</p> </li> 
+               <li> <p>(bit fiddly this) <code>ctrl-shift-alt-N</code> to search for any symbol.</p> </li> 
+              </ul> 
+             </div> </li> 
+            <li> <p>open up dialog of recent files: <code>ctrl-E</code></p> </li> 
+            <li> <p>search for any file: <code>shift-shift</code></p> </li> 
+           </ul> 
+          </div> 
+          <div class="paragraph"> 
+           <p>Navigating around: * find callers of a method (the call hierarchy): <code>ctrl-alt-H</code> * find subclasses or overrides: <code>ctrl-alt-B</code> * find superclasses/interface/declaration: <code>ctrl-B</code></p> 
+          </div> 
+          <div class="paragraph"> 
+           <p>Viewing the structure (ie outline) of a class * <code>ctrl-F12</code> will pop-up a dialog showing all members ** hit <code>ctrl-F12</code> again to also see inherited members</p> 
+          </div> 
+         </div> 
+         <div class="sect4"> 
+          <h5 id="_dg_ide_intellij_hints-and-tips_editing">Editing</h5> 
+          <div class="ulist"> 
+           <ul> 
+            <li> <p>Extend selection using <code>ctrl-W</code></p> 
+             <div class="ulist"> 
+              <ul> 
+               <li> <p>and contract it down again using <code>ctrl-shift-W</code></p> </li> 
+              </ul> 
+             </div> </li> 
+            <li> <p>to duplicate a line, it\u2019s <code>ctrl-D</code></p> 
+             <div class="ulist"> 
+              <ul> 
+               <li> <p>if you have some text selected (or even some lines), it\u2019ll actually duplicate the entire selection</p> </li> 
+              </ul> 
+             </div> </li> 
+            <li> <p>to delete a line, it\u2019s <code>ctrl-X</code></p> </li> 
+            <li> <p>to move a line up or down: <code>shift-alt-up</code> and <code>shift-alt-down</code></p> 
+             <div class="ulist"> 
+              <ul> 
+               <li> <p>if you have selected several lines, it\u2019ll move them all togethe</p> </li> 
+              </ul> 
+             </div> </li> 
+            <li> <p><code>ctrl-shift-J</code> can be handy for joining lines together</p> 
+             <div class="ulist"> 
+              <ul> 
+               <li> <p>just hit enter to split them apart (even in string quotes; IntelliJ will "do the right thing")</p> </li> 
+              </ul> 
+             </div> </li> 
+           </ul> 
+          </div> 
+         </div> 
+         <div class="sect4"> 
+          <h5 id="_intentions_and_code_completion">Intentions and Code Completion</h5> 
+          <div class="paragraph"> 
+           <p>Massively useful is the "Intentions" popup; IntelliJ tries to guess what you might want to do. You can activate this using`alt-enter`, whenever you see a lightbulb/tooltip in the margin of the current line.</p> 
+          </div> 
+          <div class="paragraph"> 
+           <p>Code completion usually happens whenever you type '.'. You can 

<TRUNCATED>

[19/44] isis-site git commit: ISIS-1594: provide an 'edit' button

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/guides/ugodn.html
----------------------------------------------------------------------
diff --git a/content/guides/ugodn.html b/content/guides/ugodn.html
index 9c34ddd..8016639 100644
--- a/content/guides/ugodn.html
+++ b/content/guides/ugodn.html
@@ -1,12 +1,10 @@
 <!doctype html>
 <html class="no-js" lang="en">
-<head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-
-    <title>DataNucleus Object Store</title>
-
-    <!--
+ <head> 
+  <meta charset="utf-8"> 
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"> 
+  <title>DataNucleus Object Store</title> 
+  <!--
         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
@@ -23,31 +21,21 @@
         KIND, either express or implied.  See the License for the
         specific language governing permissions and limitations
         under the License.
-    -->
-
-    <!-- No caching headers -->
-    <meta http-equiv="cache-control" content="no-cache" />
-    <meta http-equiv="pragma" content="no-cache" />
-    <meta http-equiv="expires" content="-1" />
-
-
-    <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
-    <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet" />
-    <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script>
-    <link href="../css/asciidoctor/colony.css" rel="stylesheet">
-    <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-
-
-
-    <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
-    <!--[if lt IE 9]>
+    --> 
+  <!-- No caching headers --> 
+  <meta http-equiv="cache-control" content="no-cache"> 
+  <meta http-equiv="pragma" content="no-cache"> 
+  <meta http-equiv="expires" content="-1"> 
+  <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line --> 
+  <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet"> 
+  <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script> 
+  <link href="../css/asciidoctor/colony.css" rel="stylesheet"> 
+  <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet"> 
+  <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet"> 
+  <!--[if lt IE 9]>
       <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
-    <![endif]-->
-
-
-
-    <style type="text/css">
+    <![endif]--> 
+  <style type="text/css">
         pre code {
             background-color: inherit;
             border-style: none;
@@ -192,9 +180,8 @@ table.CodeRay td.code>pre{padding:0}
         color:#fff;
         font-size: 1.1em;
     }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         @media only screen and (min-width: 40.063em) {
           .top-bar {
             .contain-to-grid .top-bar {
@@ -205,9 +192,8 @@ table.CodeRay td.code>pre{padding:0}
         .row {
             max-width: 80rem;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .extended-quote,
         .extended-quote-first {
             margin-left: 40px;
@@ -231,9 +217,8 @@ table.CodeRay td.code>pre{padding:0}
             text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
         }
         
-    </style>
-
-    <style>
+    </style> 
+  <style>
         body {
           position: relative;
         }
@@ -255,6 +240,7 @@ table.CodeRay td.code>pre{padding:0}
 
         div#doc-content {
             margin-top: 30px;
+            padding-top: 30px;
         }
 
         div.documentation-page table.frame-all {
@@ -286,9 +272,8 @@ table.CodeRay td.code>pre{padding:0}
             min-height: 2000px;
         }
 
-    </style>
-
-    <style>
+    </style> 
+  <style>
 
         @media only screen and (min-width: 768px) {
           #toc.toc2 ul ul { margin-left: -10px; }
@@ -316,15 +301,13 @@ table.CodeRay td.code>pre{padding:0}
         body div#toc2 li.tocify-item.active a {
             color: red;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         footer {
             margin-top: 1000px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* overriding colony.css stylesheet */
         .literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
            /*padding: 1.25em 1.5625em 1.125em 1.5625em;*/
@@ -372,9 +355,8 @@ table.CodeRay td.code>pre{padding:0}
         .imageblock img {
             margin-bottom: 10px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* from http://ben.balter.com/2014/03/13/pages-anchor-links/ */
         .header-link {
           position: absolute;
@@ -395,9 +377,8 @@ table.CodeRay td.code>pre{padding:0}
         h6:hover .header-link {
           opacity: 1;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .top-bar
         {
             -webkit-transition-duration: .5s;
@@ -425,740 +406,658 @@ table.CodeRay td.code>pre{padding:0}
             -webkit-transition-property: -webkit-transform;
             transition-property: transform;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         #doc-content a.guide {
             color: white;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
+        .tocify {
+            margin-top: 80px;
+        }
+    </style> 
+  <style>
         .tocify {
             margin-top: 80px;
         }
-    </style>
-
-
-</script>
-
-</head>
-<body>
-
-<<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
-    <div class="github-fork-ribbon">
-        <a href="https://github.com/apache/isis#fork-destination-box">Fork me on GitHub</a>
-    </div>
-</div>
-
-
-<div class="row">
-
-    <div class="fixed contain-to-grid header">
-        <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
-            <ul class="title-area">
-                <li class="name">
-                    <h1>
-                        <a href="/index.html">Apache Isis&trade;</a>
-                    </h1>
-                </li>
-                <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
-                <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
-            </ul>
-
-            <section class="top-bar-section">
-                <ul class="right">
-
-                    <li class="has-form">
-                       <FORM class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
-                        <div class="row collapse">
-                            <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
-                            <INPUT type="hidden" name="cof" value="FORID:0">
-                            <INPUT class="form-control" name="q" type="text" placeholder="Search">
-                        </div>
-                    </FORM>
-                     </li>
-
-                </ul>
-
-                <!-- Left Nav Section -->
-                <ul class="left">
-
-                    <li><a href="/documentation.html">Documentation</a></li>
-                    <li><a href="/downloads.html">Downloads</a></li>
-                    <li><a href="/help.html">Help</a></li>
-                    <li><a href="/asf.html">@ASF</a></li>
-
-                </ul>
-
-            </section>
-        </nav>
-    </div>
-</div>
-
-<div class="row">
-
-    <div id="doc-content-left" class="large-9 medium-9 columns">
-
-
-        <div id="doc-content">
-          <div class="sect1">
-<h2 id="_ugdnos">1. DataNucleus Object Store</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>The DataNucleus Object Store enables domain objects to be persisted to relational as well as NoSQL databases.  The object store is implemented using <a href="http://datanuclues.org">DataNucleus</a>.</p>
-</div>
-<div class="paragraph">
-<p>This user guide discuss end-user features, configuration and customization of the DataNucleus object store.</p>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>DataNucleus as a product also supports the JPA API; Apache Isis is likely to also support JPA in the future.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>Unresolved directive in ugodn.adoc - include::_ugbtb_datanucleus_overriding-jdo-annotations.adoc[leveloffset=+1]
-Unresolved directive in ugodn.adoc - include::_ugbtb_datanucleus_java8.adoc[leveloffset=+1]</p>
-</div>
-<div class="sect2">
-<h3 id="_other_guides">1.1. Other Guides</h3>
-<div class="paragraph">
-<p>Apache Isis documentation is broken out into a number of user and reference guides.</p>
-</div>
-<div class="paragraph">
-<p>The user guides available are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="ugfun.html">Fundamentals</a></p>
-</li>
-<li>
-<p><a href="ugvw.html">Wicket viewer</a></p>
-</li>
-<li>
-<p><a href="ugvro.html">Restful Objects viewer</a></p>
-</li>
-<li>
-<p><a href="ugdno.html">DataNucleus object store</a> (this guide)</p>
-</li>
-<li>
-<p><a href="ugsec.html">Security</a></p>
-</li>
-<li>
-<p><a href="ugtst.html">Testing</a></p>
-</li>
-<li>
-<p><a href="ugbtb.html">Beyond the Basics</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The reference guides are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="rgant.html">Annotations</a></p>
-</li>
-<li>
-<p><a href="rgsvc.html">Domain Services</a></p>
-</li>
-<li>
-<p><a href="rgcfg.html">Configuration Properties</a></p>
-</li>
-<li>
-<p><a href="rgcms.html">Classes, Methods and Schema</a></p>
-</li>
-<li>
-<p><a href="rgmvn.html">Apache Isis Maven plugin</a></p>
-</li>
-<li>
-<p><a href="rgfis.html">Framework Internal Services</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The remaining guides are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="dg.html">Developers' Guide</a> (how to set up a development environment
-for Apache Isis and contribute back to the project)</p>
-</li>
-<li>
-<p><a href="cgcom.html">Committers' Guide</a> (release procedures and related practices)</p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_ugodn_configuring">2. Configuring DataNucleus</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Apache Isis programmatically configures DataNucleus; any Apache Isis properties with the prefix <code>isis.persistor.datanucleus.impl</code> are passed through directly to the JDO/DataNucleus objectstore (with the prefix stripped off, of course).</p>
-</div>
-<div class="paragraph">
-<p>DataNucleus will for itself also and read the <code>META-INF/persistence.xml</code>; at a minimum this defines the name of the "persistence unit".  n theory it could also hold mappings, though in Apache Isis we tend to use annotations instead.</p>
-</div>
-<div class="paragraph">
-<p>Furthermore, DataNucleus will search for various other XML mapping files, eg <code>mappings.jdo</code>.  A full list can be found <a href="http://www.datanucleus.org/products/datanucleus/jdo/metadata.html">here</a>.  The metadata in these XML can be used to override the annotations of annotated entities; see <a href="ugbtb.html#_ugbtb_other-techniques_overriding-jdo-annotations">Overriding JDO Annotatons</a> for further discussion.</p>
-</div>
-<div class="sect2">
-<h3 id="_ugodn_configuring_properties">2.1. Configuration Properties</h3>
-<div class="paragraph">
-<p>These configuration properties are typically stored in <code>WEB-INF/persistor_datanucleus.properties</code>.  However, you can place all configuration properties into <code>WEB-INF/isis.properties</code> if you wish (the configuration properties from all config files are merged together).</p>
-</div>
-<div class="sect3">
-<h4 id="_configuration_properties_for_apache_isis_itself">2.1.1. Configuration Properties for Apache Isis itself</h4>
-<table class="tableblock frame-all grid-all spread">
-<caption class="title">Table 1. JDO/DataNucleus Objectstore Configuration Properties</caption>
-<colgroup>
-<col style="width: 33.3333%;">
-<col style="width: 16.6666%;">
-<col style="width: 50.0001%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">Property</th>
-<th class="tableblock halign-left valign-top">Value<br>
-(<em>default value</em>)</th>
-<th class="tableblock halign-left valign-top">Description</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.persistor.</code><br>
-<code>datanucleus.</code><br>
-<code>classMetadataLoadedListener</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>FQCN</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>The default (<code>o.a.i.os.jdo.dn.CreateSchemaObjectFromClassMetadata</code>) creates a DB schema object</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.persistor.datanucleus.</code><br>
-<code>RegisterEntities.packagePrefix</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">fully qualified package names (CSV)</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>that specifies the entities early rather than allow DataNucleus to find the entities lazily.  Further <a href="#_ugodn_configuring_eagerly-registering-entities">discussion below</a>.</p>
-</div>
-<div class="paragraph">
-<p>This property is IGNORED if the <a href="rgcfg.html#_rgcfg_configuring-components"><code>isis.appManifest</code></a> configuration property is specified, or if an <a href="rgcms.html#_rgcms_classes_super_AppManifest"><code>AppManifest</code></a> is provided programmatically.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.persistor.datanucleus.</code><br>
-<code>PublishingService.serializedForm</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">zipped</p></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-</tbody>
-</table>
-</div>
-<div class="sect3">
-<h4 id="_configuration_properties_passed_through_directly_to_datanucleus">2.1.2. Configuration Properties passed through directly to DataNucleus.</h4>
-<table class="tableblock frame-all grid-all spread">
-<caption class="title">Table 2. JDO/DataNucleus Objectstore Configuration Properties</caption>
-<colgroup>
-<col style="width: 33.3333%;">
-<col style="width: 16.6666%;">
-<col style="width: 50.0001%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">Property</th>
-<th class="tableblock halign-left valign-top">Value<br>
-(<em>default value</em>)</th>
-<th class="tableblock halign-left valign-top">Description</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.persistor.datanucleus.impl.*</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Passed through directly to Datanucleus (with <code>isis.persistor.datanucleus.impl</code> prefix stripped)</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.persistor.datanucleus.impl.</code><br>
-<code>datanucleus.persistenceByReachabilityAtCommit</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>false</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>We recommend this setting is disabled. <br>
-Further <a href="#_ugodn_configuring_disabling-persistence-by-reachability">discussion below</a>.</p>
-</div></div></td>
-</tr>
-</tbody>
-</table>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_ugodn_configuring_persistence-xml">2.2. <code>persistence.xml</code></h3>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-TODO
-</td>
-</tr>
-</table>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_ugodn_configuring_eagerly-registering-entities">2.3. Eagerly Registering Entities</h3>
-<div class="paragraph">
-<p>Both Apache Isis and DataNucleus have their own metamodels of the domain entities. Apache Isis builds its metamodel by walking the graph of types of the domain services.  The JDO/DataNucleus objectstore then takes these types and registers them with DataNucleus.</p>
-</div>
-<div class="paragraph">
-<p>In some cases, though, not every entity type is discoverable from the API of the service actions. This is especially the case if you have lots of subtypes (where the action method specifies only the supertype). In such cases the Isis and JDO metamodels is built lazily, when an instance of that (sub)type is first encountered.</p>
-</div>
-<div class="paragraph">
-<p>Apache Isis is quite happy for the metamodel to be lazily created, and - to be fair - DataNucleus also works well in most cases. In some cases, though, we have found that the JDBC driver (eg HSQLDB) will deadlock if DataNucleus tries to submit some DDL (for a lazily discovered type) intermingled with DML (for updating).  In any case, it&#8217;s probably not good practice to have DataNucleus work this way.</p>
-</div>
-<div class="paragraph">
-<p>The framework thus provide mechanisms to search for all <code>@PersistenceCapable</code> entities under specified package(s), and registers them all eagerly.  In fact there are two:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>as of 1.9.0 the recommended (and simpler) approach is to specify an <a href="rgcms.html#_rgcms_classes_super_AppManifest"><code>AppManifest</code></a>, either as a <a href="rgcfg.html#_rgcfg_configuring-components"><code>isis.appManifest</code></a> configuration property or programmatically.</p>
-</li>
-<li>
-<p>for earlier versions the <code>isis.persistor.datanucleus.RegisterEntities.packagePrefix</code> configuration property can be specified.  To bootstrap as a webapp this is usually specified in <code>persistor_datanucleus.properties</code>.  (This is also supported in 1.9.0 if no <code>AppManifest</code> is specified.  For integration testing this can be specified programatically.</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>Further discussion on specifying the package(s) in integration testing (for either approach) can be found in the <a href="ugtst.html#_ugtst_integ-test-support_bootstrapping">user guide</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_ugodn_configuring_disabling-persistence-by-reachability">2.4. Persistence by Reachability</h3>
-<div class="paragraph">
-<p>By default, JDO/DataNucleus supports the concept of <a href="http://www.datanucleus.org/products/datanucleus/jdo/orm/cascading.html">persistence-by-reachability</a>. That is, if
-a non-persistent entity is associated with an already-persistent entity, then DataNucleus will detect this and will automatically persist the associated object. Put another way: there is no need to call Apache Isis' <code>DomainObjectContainer#persist(.)</code> or <code>DomainObjectContainer#persistIfNotAlready(.)</code> methods.</p>
-</div>
-<div class="paragraph">
-<p>However, convenient though this feature is, you may find that it causes performance issues.</p>
-</div>
-<div class="admonitionblock warning">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-warning" title="Warning"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>DataNucleus' persistence-by-reachability may cause performance issues.  We strongly recommend that you disable it.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>One scenario in particular where this performance issues can arise is if your entities implement the <code>java.lang.Comparable</code> interface, and you have used Apache Isis' <a href="rgcms.html#_rgcms_classes_utility_ObjectContracts"><code>ObjectContracts</code></a> utility class. The issue here is that <code>ObjectContracts</code> implementation can cause DataNucleus to recursively rehydrate a larger number of associated entities. (More detail below).</p>
-</div>
-<div class="paragraph">
-<p>We therefore recommend that you disable persistence-by-reachability by adding the following to <code>persistor_datanucleus.properties</code>:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="ini">isis.persistor.datanucleus.impl.datanucleus.persistenceByReachabilityAtCommit=false</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>This change has been made to the <a href="ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp archetype</a></p>
-</div>
-<div class="paragraph">
-<p>If you do disable this feature, then you will (of course) need to ensure that you explicitly persist all entities using the <code>DomainObjectContainer#persist(.)</code> or <code>DomainObjectContainer#persistIfNotAlready(.)</code> methods.</p>
-</div>
-<div class="sect3">
-<h4 id="_the_issue_in_more_detail">2.4.1. The issue in more detail</h4>
-<div class="paragraph">
-<p>Consider these entities (<a href="http://yuml.me/edit/b8681268">yuml.me/b8681268</a>):</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="images/runtime/configuring-datanucleus/disabling-persistence-by-reachability/party-agreementrole-agreement.png" alt="party agreementrole agreement" width="750px">
-</div>
-</div>
-<div class="paragraph">
-<p>In the course of a transaction, the <code>Agreement</code> entity is loaded into memory (not necessarily modified), and then new <code>AgreementRole</code>s are associated to it.</p>
-</div>
-<div class="paragraph">
-<p>All these entities implement <code>Comparable</code> using <code>ObjectContracts</code>, and the implementation of <code>AgreementRole</code>'s (simplified) is:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">AgreementRole</span> {
+    </style>  
+ </head> 
+ <body> 
+  <div class="row"> 
+   <div class="fixed contain-to-grid header"> 
+    <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem"> 
+     <ul class="title-area"> 
+      <li class="name"> <h1> <a href="/index.html">Apache Isis\u2122</a> </h1> </li> 
+      <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone --> 
+      <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li> 
+     </ul> 
+     <section class="top-bar-section"> 
+      <ul class="right"> 
+       <li class="has-form"> 
+        <form class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse"> 
+         <div class="row collapse"> 
+          <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya"> 
+          <input type="hidden" name="cof" value="FORID:0"> 
+          <input class="form-control" name="q" type="text" placeholder="Search"> 
+         </div> 
+        </form> </li> 
+      </ul> 
+      <!-- Left Nav Section --> 
+      <ul class="left"> 
+       <li><a href="/documentation.html">Documentation</a></li> 
+       <li><a href="/downloads.html">Downloads</a></li> 
+       <li><a href="/help.html">Help</a></li> 
+       <li><a href="/asf.html">@ASF</a></li> 
+      </ul> 
+     </section> 
+    </nav> 
+   </div> 
+  </div> 
+  <div class="row"> 
+   <div id="doc-content-left" class="large-9 medium-9 columns"> 
+    <div id="doc-content">
+     <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/ugodn.adoc&quot;" style="float: right; font-size: small; padding: 6px;  "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+     <div class="sect1"> 
+      <h2 id="_ugdnos">1. DataNucleus Object Store</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_ugdnos.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>The DataNucleus Object Store enables domain objects to be persisted to relational as well as NoSQL databases. The object store is implemented using <a href="http://datanuclues.org">DataNucleus</a>.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>This user guide discuss end-user features, configuration and customization of the DataNucleus object store.</p> 
+       </div> 
+       <div class="admonitionblock note"> 
+        <table> 
+         <tbody>
+          <tr> 
+           <td class="icon"> <i class="fa icon-note" title="Note"></i> </td> 
+           <td class="content"> 
+            <div class="paragraph"> 
+             <p>DataNucleus as a product also supports the JPA API; Apache Isis is likely to also support JPA in the future.</p> 
+            </div> </td> 
+          </tr> 
+         </tbody>
+        </table> 
+       </div> 
+       <div class="paragraph"> 
+        <p>Unresolved directive in ugodn.adoc - include::_ugbtb_datanucleus_overriding-jdo-annotations.adoc[leveloffset=+1] Unresolved directive in ugodn.adoc - include::_ugbtb_datanucleus_java8.adoc[leveloffset=+1]</p> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_other_guides">1.1. Other Guides</h3> 
+        <div class="paragraph"> 
+         <p>Apache Isis documentation is broken out into a number of user and reference guides.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The user guides available are:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><a href="ugfun.html">Fundamentals</a></p> </li> 
+          <li> <p><a href="ugvw.html">Wicket viewer</a></p> </li> 
+          <li> <p><a href="ugvro.html">Restful Objects viewer</a></p> </li> 
+          <li> <p><a href="ugdno.html">DataNucleus object store</a> (this guide)</p> </li> 
+          <li> <p><a href="ugsec.html">Security</a></p> </li> 
+          <li> <p><a href="ugtst.html">Testing</a></p> </li> 
+          <li> <p><a href="ugbtb.html">Beyond the Basics</a></p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The reference guides are:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><a href="rgant.html">Annotations</a></p> </li> 
+          <li> <p><a href="rgsvc.html">Domain Services</a></p> </li> 
+          <li> <p><a href="rgcfg.html">Configuration Properties</a></p> </li> 
+          <li> <p><a href="rgcms.html">Classes, Methods and Schema</a></p> </li> 
+          <li> <p><a href="rgmvn.html">Apache Isis Maven plugin</a></p> </li> 
+          <li> <p><a href="rgfis.html">Framework Internal Services</a></p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The remaining guides are:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><a href="dg.html">Developers' Guide</a> (how to set up a development environment for Apache Isis and contribute back to the project)</p> </li> 
+          <li> <p><a href="cgcom.html">Committers' Guide</a> (release procedures and related practices)</p> </li> 
+         </ul> 
+        </div> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_ugodn_configuring">2. Configuring DataNucleus</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_ugodn_configuring.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>Apache Isis programmatically configures DataNucleus; any Apache Isis properties with the prefix <code>isis.persistor.datanucleus.impl</code> are passed through directly to the JDO/DataNucleus objectstore (with the prefix stripped off, of course).</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>DataNucleus will for itself also and read the <code>META-INF/persistence.xml</code>; at a minimum this defines the name of the "persistence unit". n theory it could also hold mappings, though in Apache Isis we tend to use annotations instead.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>Furthermore, DataNucleus will search for various other XML mapping files, eg <code>mappings.jdo</code>. A full list can be found <a href="http://www.datanucleus.org/products/datanucleus/jdo/metadata.html">here</a>. The metadata in these XML can be used to override the annotations of annotated entities; see <a href="ugbtb.html#_ugbtb_other-techniques_overriding-jdo-annotations">Overriding JDO Annotatons</a> for further discussion.</p> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_ugodn_configuring_properties">2.1. Configuration Properties</h3> 
+        <div class="paragraph"> 
+         <p>These configuration properties are typically stored in <code>WEB-INF/persistor_datanucleus.properties</code>. However, you can place all configuration properties into <code>WEB-INF/isis.properties</code> if you wish (the configuration properties from all config files are merged together).</p> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_configuration_properties_for_apache_isis_itself">2.1.1. Configuration Properties for Apache Isis itself</h4> 
+         <table class="tableblock frame-all grid-all spread"> 
+          <caption class="title">
+           Table 1. JDO/DataNucleus Objectstore Configuration Properties
+          </caption> 
+          <colgroup> 
+           <col style="width: 33.3333%;"> 
+           <col style="width: 16.6666%;"> 
+           <col style="width: 50.0001%;"> 
+          </colgroup> 
+          <thead> 
+           <tr> 
+            <th class="tableblock halign-left valign-top">Property</th> 
+            <th class="tableblock halign-left valign-top">Value<br> (<em>default value</em>)</th> 
+            <th class="tableblock halign-left valign-top">Description</th> 
+           </tr> 
+          </thead> 
+          <tbody> 
+           <tr> 
+            <td class="tableblock halign-left valign-top">
+             <div>
+              <div class="paragraph"> 
+               <p><code>isis.persistor.</code><br> <code>datanucleus.</code><br> <code>classMetadataLoadedListener</code></p> 
+              </div>
+             </div></td> 
+            <td class="tableblock halign-left valign-top"><p class="tableblock"><code>FQCN</code></p></td> 
+            <td class="tableblock halign-left valign-top">
+             <div>
+              <div class="paragraph"> 
+               <p>The default (<code>o.a.i.os.jdo.dn.CreateSchemaObjectFromClassMetadata</code>) creates a DB schema object</p> 
+              </div>
+             </div></td> 
+           </tr> 
+           <tr> 
+            <td class="tableblock halign-left valign-top">
+             <div>
+              <div class="paragraph"> 
+               <p><code>isis.persistor.datanucleus.</code><br> <code>RegisterEntities.packagePrefix</code></p> 
+              </div>
+             </div></td> 
+            <td class="tableblock halign-left valign-top"><p class="tableblock">fully qualified package names (CSV)</p></td> 
+            <td class="tableblock halign-left valign-top">
+             <div>
+              <div class="paragraph"> 
+               <p>that specifies the entities early rather than allow DataNucleus to find the entities lazily. Further <a href="#_ugodn_configuring_eagerly-registering-entities">discussion below</a>.</p> 
+              </div> 
+              <div class="paragraph"> 
+               <p>This property is IGNORED if the <a href="rgcfg.html#_rgcfg_configuring-components"><code>isis.appManifest</code></a> configuration property is specified, or if an <a href="rgcms.html#_rgcms_classes_super_AppManifest"><code>AppManifest</code></a> is provided programmatically.</p> 
+              </div>
+             </div></td> 
+           </tr> 
+           <tr> 
+            <td class="tableblock halign-left valign-top">
+             <div>
+              <div class="paragraph"> 
+               <p><code>isis.persistor.datanucleus.</code><br> <code>PublishingService.serializedForm</code></p> 
+              </div>
+             </div></td> 
+            <td class="tableblock halign-left valign-top"><p class="tableblock">zipped</p></td> 
+            <td class="tableblock halign-left valign-top">
+             <div></div></td> 
+           </tr> 
+          </tbody> 
+         </table> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_configuration_properties_passed_through_directly_to_datanucleus">2.1.2. Configuration Properties passed through directly to DataNucleus.</h4> 
+         <table class="tableblock frame-all grid-all spread"> 
+          <caption class="title">
+           Table 2. JDO/DataNucleus Objectstore Configuration Properties
+          </caption> 
+          <colgroup> 
+           <col style="width: 33.3333%;"> 
+           <col style="width: 16.6666%;"> 
+           <col style="width: 50.0001%;"> 
+          </colgroup> 
+          <thead> 
+           <tr> 
+            <th class="tableblock halign-left valign-top">Property</th> 
+            <th class="tableblock halign-left valign-top">Value<br> (<em>default value</em>)</th> 
+            <th class="tableblock halign-left valign-top">Description</th> 
+           </tr> 
+          </thead> 
+          <tbody> 
+           <tr> 
+            <td class="tableblock halign-left valign-top">
+             <div>
+              <div class="paragraph"> 
+               <p><code>isis.persistor.datanucleus.impl.*</code></p> 
+              </div>
+             </div></td> 
+            <td class="tableblock halign-left valign-top"></td> 
+            <td class="tableblock halign-left valign-top">
+             <div>
+              <div class="paragraph"> 
+               <p>Passed through directly to Datanucleus (with <code>isis.persistor.datanucleus.impl</code> prefix stripped)</p> 
+              </div>
+             </div></td> 
+           </tr> 
+           <tr> 
+            <td class="tableblock halign-left valign-top">
+             <div>
+              <div class="paragraph"> 
+               <p><code>isis.persistor.datanucleus.impl.</code><br> <code>datanucleus.persistenceByReachabilityAtCommit</code></p> 
+              </div>
+             </div></td> 
+            <td class="tableblock halign-left valign-top"><p class="tableblock"><code>false</code></p></td> 
+            <td class="tableblock halign-left valign-top">
+             <div>
+              <div class="paragraph"> 
+               <p>We recommend this setting is disabled. <br> Further <a href="#_ugodn_configuring_disabling-persistence-by-reachability">discussion below</a>.</p> 
+              </div>
+             </div></td> 
+           </tr> 
+          </tbody> 
+         </table> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_ugodn_configuring_persistence-xml">2.2. <code>persistence.xml</code></h3> 
+        <div class="admonitionblock note"> 
+         <table> 
+          <tbody>
+           <tr> 
+            <td class="icon"> <i class="fa icon-note" title="Note"></i> </td> 
+            <td class="content"> TODO </td> 
+           </tr> 
+          </tbody>
+         </table> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_ugodn_configuring_eagerly-registering-entities">2.3. Eagerly Registering Entities</h3> 
+        <div class="paragraph"> 
+         <p>Both Apache Isis and DataNucleus have their own metamodels of the domain entities. Apache Isis builds its metamodel by walking the graph of types of the domain services. The JDO/DataNucleus objectstore then takes these types and registers them with DataNucleus.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>In some cases, though, not every entity type is discoverable from the API of the service actions. This is especially the case if you have lots of subtypes (where the action method specifies only the supertype). In such cases the Isis and JDO metamodels is built lazily, when an instance of that (sub)type is first encountered.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Apache Isis is quite happy for the metamodel to be lazily created, and - to be fair - DataNucleus also works well in most cases. In some cases, though, we have found that the JDBC driver (eg HSQLDB) will deadlock if DataNucleus tries to submit some DDL (for a lazily discovered type) intermingled with DML (for updating). In any case, it\u2019s probably not good practice to have DataNucleus work this way.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The framework thus provide mechanisms to search for all <code>@PersistenceCapable</code> entities under specified package(s), and registers them all eagerly. In fact there are two:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p>as of 1.9.0 the recommended (and simpler) approach is to specify an <a href="rgcms.html#_rgcms_classes_super_AppManifest"><code>AppManifest</code></a>, either as a <a href="rgcfg.html#_rgcfg_configuring-components"><code>isis.appManifest</code></a> configuration property or programmatically.</p> </li> 
+          <li> <p>for earlier versions the <code>isis.persistor.datanucleus.RegisterEntities.packagePrefix</code> configuration property can be specified. To bootstrap as a webapp this is usually specified in <code>persistor_datanucleus.properties</code>. (This is also supported in 1.9.0 if no <code>AppManifest</code> is specified. For integration testing this can be specified programatically.</p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Further discussion on specifying the package(s) in integration testing (for either approach) can be found in the <a href="ugtst.html#_ugtst_integ-test-support_bootstrapping">user guide</a>.</p> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_ugodn_configuring_disabling-persistence-by-reachability">2.4. Persistence by Reachability</h3> 
+        <div class="paragraph"> 
+         <p>By default, JDO/DataNucleus supports the concept of <a href="http://www.datanucleus.org/products/datanucleus/jdo/orm/cascading.html">persistence-by-reachability</a>. That is, if a non-persistent entity is associated with an already-persistent entity, then DataNucleus will detect this and will automatically persist the associated object. Put another way: there is no need to call Apache Isis' <code>DomainObjectContainer#persist(.)</code> or <code>DomainObjectContainer#persistIfNotAlready(.)</code> methods.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>However, convenient though this feature is, you may find that it causes performance issues.</p> 
+        </div> 
+        <div class="admonitionblock warning"> 
+         <table> 
+          <tbody>
+           <tr> 
+            <td class="icon"> <i class="fa icon-warning" title="Warning"></i> </td> 
+            <td class="content"> 
+             <div class="paragraph"> 
+              <p>DataNucleus' persistence-by-reachability may cause performance issues. We strongly recommend that you disable it.</p> 
+             </div> </td> 
+           </tr> 
+          </tbody>
+         </table> 
+        </div> 
+        <div class="paragraph"> 
+         <p>One scenario in particular where this performance issues can arise is if your entities implement the <code>java.lang.Comparable</code> interface, and you have used Apache Isis' <a href="rgcms.html#_rgcms_classes_utility_ObjectContracts"><code>ObjectContracts</code></a> utility class. The issue here is that <code>ObjectContracts</code> implementation can cause DataNucleus to recursively rehydrate a larger number of associated entities. (More detail below).</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>We therefore recommend that you disable persistence-by-reachability by adding the following to <code>persistor_datanucleus.properties</code>:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="ini">isis.persistor.datanucleus.impl.datanucleus.persistenceByReachabilityAtCommit=false</code></pre> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>This change has been made to the <a href="ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp archetype</a></p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>If you do disable this feature, then you will (of course) need to ensure that you explicitly persist all entities using the <code>DomainObjectContainer#persist(.)</code> or <code>DomainObjectContainer#persistIfNotAlready(.)</code> methods.</p> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_the_issue_in_more_detail">2.4.1. The issue in more detail</h4> 
+         <div class="paragraph"> 
+          <p>Consider these entities (<a href="http://yuml.me/edit/b8681268">yuml.me/b8681268</a>):</p> 
+         </div> 
+         <div class="imageblock"> 
+          <div class="content"> 
+           <img src="images/runtime/configuring-datanucleus/disabling-persistence-by-reachability/party-agreementrole-agreement.png" alt="party agreementrole agreement" width="750px"> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>In the course of a transaction, the <code>Agreement</code> entity is loaded into memory (not necessarily modified), and then new <code>AgreementRole</code>s are associated to it.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>All these entities implement <code>Comparable</code> using <code>ObjectContracts</code>, and the implementation of <code>AgreementRole</code>'s (simplified) is:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">AgreementRole</span> {
     ...
     public <span class="type">int</span> compareTo(AgreementRole other) {
-        <span class="keyword">return</span> ObjectContracts.compareTo(<span class="local-variable">this</span>, other, <span class="string"><span class="delimiter">&quot;</span><span class="content">agreement</span><span class="delimiter">&quot;</span></span>,<span class="string"><span class="delimiter">&quot;</span><span class="content">startDate</span><span class="delimiter">&quot;</span></span>,<span class="string"><span class="delimiter">&quot;</span><span class="content">party</span><span class="delimiter">&quot;</span></span>);
+        <span class="keyword">return</span> ObjectContracts.compareTo(<span class="local-variable">this</span>, other, <span class="string"><span class="delimiter">"</span><span class="content">agreement</span><span class="delimiter">"</span></span>,<span class="string"><span class="delimiter">"</span><span class="content">startDate</span><span class="delimiter">"</span></span>,<span class="string"><span class="delimiter">"</span><span class="content">party</span><span class="delimiter">"</span></span>);
     }
-}</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>while <code>Agreement</code>'s is implemented as:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">Agreement</span> {
+}</code></pre> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>while <code>Agreement</code>'s is implemented as:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">Agreement</span> {
     ...
     public <span class="type">int</span> compareTo(Agreement other) {
-        <span class="keyword">return</span> ObjectContracts.compareTo(<span class="local-variable">this</span>, other, <span class="string"><span class="delimiter">&quot;</span><span class="content">reference</span><span class="delimiter">&quot;</span></span>);
+        <span class="keyword">return</span> ObjectContracts.compareTo(<span class="local-variable">this</span>, other, <span class="string"><span class="delimiter">"</span><span class="content">reference</span><span class="delimiter">"</span></span>);
     }
-}</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>and <code>Party</code>'s is similarly implemented as:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">Party</span> {
+}</code></pre> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>and <code>Party</code>'s is similarly implemented as:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">Party</span> {
     ...
     public <span class="type">int</span> compareTo(Party other) {
-        <span class="keyword">return</span> ObjectContracts.compareTo(<span class="local-variable">this</span>, other, <span class="string"><span class="delimiter">&quot;</span><span class="content">reference</span><span class="delimiter">&quot;</span></span>);
+        <span class="keyword">return</span> ObjectContracts.compareTo(<span class="local-variable">this</span>, other, <span class="string"><span class="delimiter">"</span><span class="content">reference</span><span class="delimiter">"</span></span>);
     }
-}</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>DataNucleus&#8217;s persistence-by-reachability algorithm adds the <code>AgreementRole</code> instances into a <code>SortedSet</code>, which causes <code>AgreementRole#compareTo()</code> to fire:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>the evaluation of the "agreement" property delegates back to the <code>Agreement</code>, whose own <code>Agreement#compareTo()</code> uses the scalar <code>reference</code> property. As the <code>Agreement</code> is already in-memory, this does not trigger any further database queries</p>
-</li>
-<li>
-<p>the evaluation of the "startDate" property is just a scalar property of the <code>AgreementRole</code>, so will already in-memory</p>
-</li>
-<li>
-<p>the evaluation of the "party" property delegates back to the <code>Party</code>, whose own <code>Party#compareTo()</code> requires the uses the scalar <code>reference</code> property. However, since the <code>Party</code> is not yet in-memory, using the <code>reference</code> property triggers a database query to "rehydrate" the <code>Party</code> instance.</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>In other words, in figuring out whether <code>AgreementRole</code> requires the persistence-by-reachability algorithm to run, it causes the adjacent associated entity <code>Party</code> to also be retrieved.</p>
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_ugodn_configuring_using-jndi-data-source">2.5. Using JNDI DataSource</h3>
-<div class="paragraph">
-<p>Isis' JDO objectstore can be configured either to connect to the database using its own connection pool, or by using a container-managed datasource.</p>
-</div>
-<div class="sect3">
-<h4 id="_application_managed">2.5.1. Application managed</h4>
-<div class="paragraph">
-<p>Using a connection pool managed directly by the application (that is, by Apache Isis' JDO objectstore and ultimately by DataNucleus) requires a single set of configuration properties to be specified.</p>
-</div>
-<div class="paragraph">
-<p>In either <code>WEB-INF\isis.properties</code> file (or <code>WEB-INF\persistor.properties</code>, or <code>WEB-INF\persistor_datanucleus.properties</code>), specify the connection driver, url, username and password.</p>
-</div>
-<div class="paragraph">
-<p>For example:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="ini">isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=net.sf.log4jdbc.DriverSpy
+}</code></pre> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>DataNucleus\u2019s persistence-by-reachability algorithm adds the <code>AgreementRole</code> instances into a <code>SortedSet</code>, which causes <code>AgreementRole#compareTo()</code> to fire:</p> 
+         </div> 
+         <div class="ulist"> 
+          <ul> 
+           <li> <p>the evaluation of the "agreement" property delegates back to the <code>Agreement</code>, whose own <code>Agreement#compareTo()</code> uses the scalar <code>reference</code> property. As the <code>Agreement</code> is already in-memory, this does not trigger any further database queries</p> </li> 
+           <li> <p>the evaluation of the "startDate" property is just a scalar property of the <code>AgreementRole</code>, so will already in-memory</p> </li> 
+           <li> <p>the evaluation of the "party" property delegates back to the <code>Party</code>, whose own <code>Party#compareTo()</code> requires the uses the scalar <code>reference</code> property. However, since the <code>Party</code> is not yet in-memory, using the <code>reference</code> property triggers a database query to "rehydrate" the <code>Party</code> instance.</p> </li> 
+          </ul> 
+         </div> 
+         <div class="paragraph"> 
+          <p>In other words, in figuring out whether <code>AgreementRole</code> requires the persistence-by-reachability algorithm to run, it causes the adjacent associated entity <code>Party</code> to also be retrieved.</p> 
+         </div> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_ugodn_configuring_using-jndi-data-source">2.5. Using JNDI DataSource</h3> 
+        <div class="paragraph"> 
+         <p>Isis' JDO objectstore can be configured either to connect to the database using its own connection pool, or by using a container-managed datasource.</p> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_application_managed">2.5.1. Application managed</h4> 
+         <div class="paragraph"> 
+          <p>Using a connection pool managed directly by the application (that is, by Apache Isis' JDO objectstore and ultimately by DataNucleus) requires a single set of configuration properties to be specified.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>In either <code>WEB-INF\isis.properties</code> file (or <code>WEB-INF\persistor.properties</code>, or <code>WEB-INF\persistor_datanucleus.properties</code>), specify the connection driver, url, username and password.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>For example:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="ini">isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=net.sf.log4jdbc.DriverSpy
 isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=jdbc:log4jdbc:hsqldb:mem:test
 isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName=sa
-isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword=</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Those configuration properties that start with the prefix <code>isis.persistor.datanucleus.impl.</code> are passed through directly to DataNucleus (with the prefix removed).</p>
-</div>
-<div class="paragraph">
-<p>It is also possible to specify the `
-datanucleus.ConnectionPasswordDecrypter
-` property; see the <a href="http://www.datanucleus.org/products/accessplatform_4_1/persistence_properties.html#ConnectionPasswordDecrypter">DataNucleus documentation</a> for further details.</p>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_container_managed_jndi">2.5.2. Container managed (JNDI)</h4>
-<div class="paragraph">
-<p>Using a datasource managed by the servlet container requires three separate bits of configuration.</p>
-</div>
-<div class="paragraph">
-<p>Firstly, specify the name of the datasource in the <code>WEB-INF\persistor_datanucleus.properties</code> file. For example:</p>
-</div>
-<div class="paragraph">
-<p>If connection pool settings are also present in this file, they will simply be ignored. Any other configuration properties that start with the prefix <code>isis.persistor.datanucleus.impl.</code> are passed through directly to DataNucleus (with the prefix removed).</p>
-</div>
-<div class="paragraph">
-<p>Secondly, in the <code>WEB-INF/web.xml</code>, declare the resource reference:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="xml"><span class="tag">&lt;resource-ref&gt;</span>
+isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword=</code></pre> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>Those configuration properties that start with the prefix <code>isis.persistor.datanucleus.impl.</code> are passed through directly to DataNucleus (with the prefix removed).</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>It is also possible to specify the ` datanucleus.ConnectionPasswordDecrypter ` property; see the <a href="http://www.datanucleus.org/products/accessplatform_4_1/persistence_properties.html#ConnectionPasswordDecrypter">DataNucleus documentation</a> for further details.</p> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_container_managed_jndi">2.5.2. Container managed (JNDI)</h4> 
+         <div class="paragraph"> 
+          <p>Using a datasource managed by the servlet container requires three separate bits of configuration.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>Firstly, specify the name of the datasource in the <code>WEB-INF\persistor_datanucleus.properties</code> file. For example:</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>If connection pool settings are also present in this file, they will simply be ignored. Any other configuration properties that start with the prefix <code>isis.persistor.datanucleus.impl.</code> are passed through directly to DataNucleus (with the prefix removed).</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>Secondly, in the <code>WEB-INF/web.xml</code>, declare the resource reference:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="xml"><span class="tag">&lt;resource-ref&gt;</span>
     <span class="tag">&lt;description&gt;</span>db<span class="tag">&lt;/description&gt;</span>
     <span class="tag">&lt;res-ref-name&gt;</span>jdbc/simpleapp<span class="tag">&lt;/res-ref-name&gt;</span>
     <span class="tag">&lt;res-type&gt;</span>javax.sql.DataSource<span class="tag">&lt;/res-type&gt;</span>
     <span class="tag">&lt;res-auth&gt;</span>Container<span class="tag">&lt;/res-auth&gt;</span>
-<span class="tag">&lt;/resource-ref&gt;</span></code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Finally, declare the datasource as required by the servlet container. For example, if using Tomcat 7, the datasource can be specified by adding the following to <code>$TOMCAT_HOME/conf/context.xml</code>:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="xml"><span class="tag">&lt;Resource</span> <span class="attribute-name">name</span>=<span class="string"><span class="delimiter">&quot;</span><span class="content">jdbc/simpleapp</span><span class="delimiter">&quot;</span></span>
-  <span class="attribute-name">auth</span>=<span class="string"><span class="delimiter">&quot;</span><span class="content">Container</span><span class="delimiter">&quot;</span></span>
-  <span class="attribute-name">type</span>=<span class="string"><span class="delimiter">&quot;</span><span class="content">javax.sql.DataSource</span><span class="delimiter">&quot;</span></span>
-  <span class="attribute-name">maxActive</span>=<span class="string"><span class="delimiter">&quot;</span><span class="content">100</span><span class="delimiter">&quot;</span></span>
-  <span class="attribute-name">maxIdle</span>=<span class="string"><span class="delimiter">&quot;</span><span class="content">30</span><span class="delimiter">&quot;</span></span>
-  <span class="attribute-name">maxWait</span>=<span class="string"><span class="delimiter">&quot;</span><span class="content">10000</span><span class="delimiter">&quot;</span></span>
-  <span class="attribute-name">username</span>=<span class="string"><span class="delimiter">&quot;</span><span class="content">sa</span><span class="delimiter">&quot;</span></span>
-  <span class="attribute-name">password</span>=<span class="string"><span class="delimiter">&quot;</span><span class="content">p4ssword</span><span class="delimiter">&quot;</span></span>
-  <span class="attribute-name">driverClassName</span>=<span class="string"><span class="delimiter">&quot;</span><span class="content">com.microsoft.sqlserver.jdbc.SQLServerDriver</span><span class="delimiter">&quot;</span></span>
-  <span class="attribute-name">url</span>=<span class="string"><span class="delimiter">&quot;</span><span class="content">jdbc:sqlserver://127.0.0.1:1433;instance=.;databaseName=simpleapp</span><span class="delimiter">&quot;</span></span><span class="tag">/&gt;</span></code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>You will also need to make sure that the JDBC driver is on the servlet container&#8217;s classpath. For Tomcat, this means copying the driver to <code>$TOMCAT_HOME/lib</code>.</p>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>According to Tomcat&#8217;s documentation, it is supposedly possible to copy the <code>conf/context.xml</code> to the name of the webapp, eg <code>conf/mywebapp.xml</code>, and scope the connection to that webapp only.  I was unable to get this working, however.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_ugodn_overriding-jdo-annotations">3. Overriding JDO Annotations</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>The JDO Objectstore (or rather, the underlying DataNucleus implementation) builds its own persistence metamodel by reading both annotations on the class and also by searching for metadata in XML files. The metadata in the XML files takes precedence over the annotations, and so can be used to override metadata that is "hard-coded" in annotations.</p>
-</div>
-<div class="paragraph">
-<p>For example, as of 1.9.0 the various <a href="http://www.isisaddons.org">Isis addons</a> modules (not ASF) use schemas for each entity. For example, the <code>AuditEntry</code> entity in the <a href="http://github.com/isisaddons/isis-module-audit">audit module</a> is annotated as:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@javax</span>.jdo.annotations.PersistenceCapable(
+<span class="tag">&lt;/resource-ref&gt;</span></code></pre> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>Finally, declare the datasource as required by the servlet container. For example, if using Tomcat 7, the datasource can be specified by adding the following to <code>$TOMCAT_HOME/conf/context.xml</code>:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="xml"><span class="tag">&lt;Resource</span> <span class="attribute-name">name</span>=<span class="string"><span class="delimiter">"</span><span class="content">jdbc/simpleapp</span><span class="delimiter">"</span></span>
+  <span class="attribute-name">auth</span>=<span class="string"><span class="delimiter">"</span><span class="content">Container</span><span class="delimiter">"</span></span>
+  <span class="attribute-name">type</span>=<span class="string"><span class="delimiter">"</span><span class="content">javax.sql.DataSource</span><span class="delimiter">"</span></span>
+  <span class="attribute-name">maxActive</span>=<span class="string"><span class="delimiter">"</span><span class="content">100</span><span class="delimiter">"</span></span>
+  <span class="attribute-name">maxIdle</span>=<span class="string"><span class="delimiter">"</span><span class="content">30</span><span class="delimiter">"</span></span>
+  <span class="attribute-name">maxWait</span>=<span class="string"><span class="delimiter">"</span><span class="content">10000</span><span class="delimiter">"</span></span>
+  <span class="attribute-name">username</span>=<span class="string"><span class="delimiter">"</span><span class="content">sa</span><span class="delimiter">"</span></span>
+  <span class="attribute-name">password</span>=<span class="string"><span class="delimiter">"</span><span class="content">p4ssword</span><span class="delimiter">"</span></span>
+  <span class="attribute-name">driverClassName</span>=<span class="string"><span class="delimiter">"</span><span class="content">com.microsoft.sqlserver.jdbc.SQLServerDriver</span><span class="delimiter">"</span></span>
+  <span class="attribute-name">url</span>=<span class="string"><span class="delimiter">"</span><span class="content">jdbc:sqlserver://127.0.0.1:1433;instance=.;databaseName=simpleapp</span><span class="delimiter">"</span></span><span class="tag">/&gt;</span></code></pre> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>You will also need to make sure that the JDBC driver is on the servlet container\u2019s classpath. For Tomcat, this means copying the driver to <code>$TOMCAT_HOME/lib</code>.</p> 
+         </div> 
+         <div class="admonitionblock note"> 
+          <table> 
+           <tbody>
+            <tr> 
+             <td class="icon"> <i class="fa icon-note" title="Note"></i> </td> 
+             <td class="content"> 
+              <div class="paragraph"> 
+               <p>According to Tomcat\u2019s documentation, it is supposedly possible to copy the <code>conf/context.xml</code> to the name of the webapp, eg <code>conf/mywebapp.xml</code>, and scope the connection to that webapp only. I was unable to get this working, however.</p> 
+              </div> </td> 
+            </tr> 
+           </tbody>
+          </table> 
+         </div> 
+        </div> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_ugodn_overriding-jdo-annotations">3. Overriding JDO Annotations</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_ugodn_overriding-jdo-annotations.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>The JDO Objectstore (or rather, the underlying DataNucleus implementation) builds its own persistence metamodel by reading both annotations on the class and also by searching for metadata in XML files. The metadata in the XML files takes precedence over the annotations, and so can be used to override metadata that is "hard-coded" in annotations.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>For example, as of 1.9.0 the various <a href="http://www.isisaddons.org">Isis addons</a> modules (not ASF) use schemas for each entity. For example, the <code>AuditEntry</code> entity in the <a href="http://github.com/isisaddons/isis-module-audit">audit module</a> is annotated as:</p> 
+       </div> 
+       <div class="listingblock"> 
+        <div class="content"> 
+         <pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@javax</span>.jdo.annotations.PersistenceCapable(
         identityType=IdentityType.DATASTORE,
-        schema = <span class="string"><span class="delimiter">&quot;</span><span class="content">IsisAddonsAudit</span><span class="delimiter">&quot;</span></span>,
-        table=<span class="string"><span class="delimiter">&quot;</span><span class="content">AuditEntry</span><span class="delimiter">&quot;</span></span>)
+        schema = <span class="string"><span class="delimiter">"</span><span class="content">IsisAddonsAudit</span><span class="delimiter">"</span></span>,
+        table=<span class="string"><span class="delimiter">"</span><span class="content">AuditEntry</span><span class="delimiter">"</span></span>)
 <span class="directive">public</span> <span class="type">class</span> <span class="class">AuditEntry</span> {
     ...
-}</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>This will map the <code>AuditEntry</code> class to a table <code>&quot;IsisAddonsAudit&quot;.&quot;AuditEntry&quot;</code>; that is using a custom schema to own the object.</p>
-</div>
-<div class="paragraph">
-<p>Suppose though that for whatever reason we didn&#8217;t want to use a custom schema but would rather use the default. We can override the above annotation using a <code>package.jdo</code> file, for example:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="xml"><span class="preprocessor">&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; ?&gt;</span>
-<span class="tag">&lt;jdo</span> <span class="attribute-name">xmlns</span>=<span class="string"><span class="delimiter">&quot;</span><span class="content">http://xmlns.jcp.org/xml/ns/jdo/jdo</span><span class="delimiter">&quot;</span></span>
-    <span class="attribute-name">xmlns:xsi</span>=<span class="string"><span class="delimiter">&quot;</span><span class="content">http://www.w3.org/2001/XMLSchema-instance</span><span class="delimiter">&quot;</span></span>
-    <span class="attribute-name">xsi:schemaLocation</span>=<span class="string"><span class="delimiter">&quot;</span><span class="content">http://xmlns.jcp.org/xml/ns/jdo/jdo</span>
-        <span class="content">http://xmlns.jcp.org/xml/ns/jdo/jdo_3_0.xsd</span><span class="delimiter">&quot;</span></span> <span class="attribute-name">version</span>=<span class="string"><span class="delimiter">&quot;</span><span class="content">3.0</span><span class="delimiter">&quot;</span></span><span class="tag">&gt;</span>
-    <span class="tag">&lt;package</span> <span class="attribute-name">name</span>=<span class="string"><span class="delimiter">&quot;</span><span class="content">org.isisaddons.module.audit.dom</span><span class="delimiter">&quot;</span></span><span class="tag">&gt;</span>
-        <span class="tag">&lt;class</span> <span class="attribute-name">name</span>=<span class="string"><span class="delimiter">&quot;</span><span class="content">AuditEntry</span><span class="delimiter">&quot;</span></span> <span class="attribute-name">schema</span>=<span class="string"><span class="delimiter">&quot;</span><span class="content">PUBLIC</span><span class="delimiter">&quot;</span></span> <span class="attribute-name">table</span>=<span class="string"><span class="delimiter">&quot;</span><span class="content">IsisAddonsAuditEntry</span><span class="delimiter">&quot;</span></span><span class="tag">&gt;</span>
+}</code></pre> 
+        </div> 
+       </div> 
+       <div class="paragraph"> 
+        <p>This will map the <code>AuditEntry</code> class to a table <code>"IsisAddonsAudit"."AuditEntry"</code>; that is using a custom schema to own the object.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>Suppose though that for whatever reason we didn\u2019t want to use a custom schema but would rather use the default. We can override the above annotation using a <code>package.jdo</code> file, for example:</p> 
+       </div> 
+       <div class="listingblock"> 
+        <div class="content"> 
+         <pre class="CodeRay highlight"><code data-lang="xml"><span class="preprocessor">&lt;?xml version="1.0" encoding="UTF-8" ?&gt;</span>
+<span class="tag">&lt;jdo</span> <span class="attribute-name">xmlns</span>=<span class="string"><span class="delimiter">"</span><span class="content">http://xmlns.jcp.org/xml/ns/jdo/jdo</span><span class="delimiter">"</span></span>
+    <span class="attribute-name">xmlns:xsi</span>=<span class="string"><span class="delimiter">"</span><span class="content">http://www.w3.org/2001/XMLSchema-instance</span><span class="delimiter">"</span></span>
+    <span class="attribute-name">xsi:schemaLocation</span>=<span class="string"><span class="delimiter">"</span><span class="content">http://xmlns.jcp.org/xml/ns/jdo/jdo</span> <span class="content">http://xmlns.jcp.org/xml/ns/jdo/jdo_3_0.xsd</span><span class="delimiter">"</span></span> <span class="attribute-name">version</span>=<span class="string"><span class="delimiter">"</span><span class="content">3.0</span><span class="delimiter">"</span></span><span class="tag">&gt;</span>
+    <span class="tag">&lt;package</span> <span class="attribute-name">name</span>=<span class="string"><span class="delimiter">"</span><span class="content">org.isisaddons.module.audit.dom</span><span class="delimiter">"</span></span><span class="tag">&gt;</span>
+        <span class="tag">&lt;class</span> <span class="attribute-name">name</span>=<span class="string"><span class="delimiter">"</span><span class="content">AuditEntry</span><span class="delimiter">"</span></span> <span class="attribute-name">schema</span>=<span class="string"><span class="delimiter">"</span><span class="content">PUBLIC</span><span class="delimiter">"</span></span> <span class="attribute-name">table</span>=<span class="string"><span class="delimiter">"</span><span class="content">IsisAddonsAuditEntry</span><span class="delimiter">"</span></span><span class="tag">&gt;</span>
         <span class="tag">&lt;/class&gt;</span>
     <span class="tag">&lt;/package&gt;</span>
-<span class="tag">&lt;/jdo&gt;</span></code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>This file should be placed can be placed in <code>src/main/java/META-INF</code> within your application&#8217;s <code>dom</code> module.</p>
-</div>
-<div class="admonitionblock tip">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-tip" title="Tip"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>You can use a mixin action on <a href="rgcms.html#_rgcms_classes_mixins_Persistable"><code>Persistable</code></a> mixin
-to download the JDO class metadata in XML form.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="ulist">
-<ul>
-<li>
-<p>The same approach should work for any other JDO metadata, but some experimentation might be required.+</p>
-<div class="paragraph">
-<p>For example, in writing up the above example we found that writing <code>schema=&quot;&quot;</code> (in an attempt to say, "use the default schema for this table") actually caused the original annotation value to be used instead.</p>
-</div>
-</li>
-<li>
-<p>Forcing the schema to "PUBLIC" (as in the above example) works, but it isn&#8217;t ideal because the name "PUBLIC" is not vendor-neutral (it works for HSQLDB, but MS SQL Server uses "dbo" as its default).</p>
-</li>
-<li>
-<p>As of 1.9.0 Apache Isis will automatically (attempt) to create the owning schema for a given table if it does not exist. This behaviour can be customized, as described in the section on <a href="#_ugbtb_decoupling_db-schemas">using modules</a>.</p>
-</li>
-<li>
-<p>You may need to override the entire class metadata rather than individual elements; the mixin mentioned above can help here.</p>
-</li>
-</ul>
-</div>
-</td>
-</tr>
-</table>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_ugodn_java8">4. Java8</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>DataNucleus 4.x supports Java 7, but can also be used with Java 8, eg for streams support against collections managed
-by DataNucleus.</p>
-</div>
-<div class="paragraph">
-<p>Just include within <code>&lt;dependencies&gt;</code> of your <code>dom</code> module&#8217;s <code>pom.xml</code>:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="xml"><span class="tag">&lt;dependency&gt;</span>
+<span class="tag">&lt;/jdo&gt;</span></code></pre> 
+        </div> 
+       </div> 
+       <div class="paragraph"> 
+        <p>This file should be placed can be placed in <code>src/main/java/META-INF</code> within your application\u2019s <code>dom</code> module.</p> 
+       </div> 
+       <div class="admonitionblock tip"> 
+        <table> 
+         <tbody>
+          <tr> 
+           <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td> 
+           <td class="content"> 
+            <div class="paragraph"> 
+             <p>You can use a mixin action on <a href="rgcms.html#_rgcms_classes_mixins_Persistable"><code>Persistable</code></a> mixin to download the JDO class metadata in XML form.</p> 
+            </div> </td> 
+          </tr> 
+         </tbody>
+        </table> 
+       </div> 
+       <div class="admonitionblock note"> 
+        <table> 
+         <tbody>
+          <tr> 
+           <td class="icon"> <i class="fa icon-note" title="Note"></i> </td> 
+           <td class="content"> 
+            <div class="ulist"> 
+             <ul> 
+              <li> <p>The same approach should work for any other JDO metadata, but some experimentation might be required.+</p> 
+               <div class="paragraph"> 
+                <p>For example, in writing up the above example we found that writing <code>schema=""</code> (in an attempt to say, "use the default schema for this table") actually caused the original annotation value to be used instead.</p> 
+               </div> </li> 
+              <li> <p>Forcing the schema to "PUBLIC" (as in the above example) works, but it isn\u2019t ideal because the name "PUBLIC" is not vendor-neutral (it works for HSQLDB, but MS SQL Server uses "dbo" as its default).</p> </li> 
+              <li> <p>As of 1.9.0 Apache Isis will automatically (attempt) to create the owning schema for a given table if it does not exist. This behaviour can be customized, as described in the section on <a href="#_ugbtb_decoupling_db-schemas">using modules</a>.</p> </li> 
+              <li> <p>You may need to override the entire class metadata rather than individual elements; the mixin mentioned above can help here.</p> </li> 
+             </ul> 
+            </div> </td> 
+          </tr> 
+         </tbody>
+        </table> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_ugodn_java8">4. Java8</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_ugodn_java8.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>DataNucleus 4.x supports Java 7, but can also be used with Java 8, eg for streams support against collections managed by DataNucleus.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>Just include within <code>&lt;dependencies&gt;</code> of your <code>dom</code> module\u2019s <code>pom.xml</code>:</p> 
+       </div> 
+       <div class="listingblock"> 
+        <div class="content"> 
+         <pre class="CodeRay highlight"><code data-lang="xml"><span class="tag">&lt;dependency&gt;</span>
     <span class="tag">&lt;groupId&gt;</span>org.datanucleus<span class="tag">&lt;/groupId&gt;</span>
     <span class="tag">&lt;artifactId&gt;</span>datanucleus-java8<span class="tag">&lt;/artifactId&gt;</span>
     <span class="tag">&lt;version&gt;</span>4.2.0-release<span class="tag">&lt;/version&gt;</span>t
-<span class="tag">&lt;/dependency&gt;</span></code></pre>
-</div>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>The DataNucleus website includes a <a href="http://www.datanucleus.org/products/accessplatform/compatibility.html">page</a>
-listing version compatibility of these extensions vis-a-vis the core DataNucleus platform.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-</div>
-</div>
-        </div>
-
-        <footer>
-          <hr>
-          <p class="small">
-          Copyright &copy; 2010~2016 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0.
-          <br/>
-          Apache, the Apache feather logo, Apache&nbsp;Isis, and the Apache&nbsp;Isis project logo are all trademarks of The&nbsp;Apache&nbsp;Software&nbsp;Foundation.
-          </p>
-        </footer>
-
-    </div>
-
-    <div id="doc-content-right" class="large-3 medium-3 xcolumns">
-        <div id="toc" class="toc2">
-            <div class="fallback-toc">
-                <ul class="sectlevel1">
-<li><a href="#_ugdnos">1. DataNucleus Object Store</a>
-<ul class="sectlevel2">
-<li><a href="#_other_guides">1.1. Other Guides</a></li>
-</ul>
-</li>
-<li><a href="#_ugodn_configuring">2. Configuring DataNucleus</a>
-<ul class="sectlevel2">
-<li><a href="#_ugodn_configuring_properties">2.1. Configuration Properties</a>
-<ul class="sectlevel3">
-<li><a href="#_configuration_properties_for_apache_isis_itself">2.1.1. Configuration Properties for Apache Isis itself</a></li>
-<li><a href="#_configuration_properties_passed_through_directly_to_datanucleus">2.1.2. Configuration Properties passed through directly to DataNucleus.</a></li>
-</ul>
-</li>
-<li><a href="#_ugodn_configuring_persistence-xml">2.2. <code>persistence.xml</code></a></li>
-<li><a href="#_ugodn_configuring_eagerly-registering-entities">2.3. Eagerly Registering Entities</a></li>
-<li><a href="#_ugodn_configuring_disabling-persistence-by-reachability">2.4. Persistence by Reachability</a>
-<ul class="sectlevel3">
-<li><a href="#_the_issue_in_more_detail">2.4.1. The issue in more detail</a></li>
-</ul>
-</li>
-<li><a href="#_ugodn_configuring_using-jndi-data-source">2.5. Using JNDI DataSource</a>
-<ul class="sectlevel3">
-<li><a href="#_application_managed">2.5.1. Application managed</a></li>
-<li><a href="#_container_managed_jndi">2.5.2. Container managed (JNDI)</a></li>
-</ul>
-</li>
-</ul>
-</li>
-<li><a href="#_ugodn_overriding-jdo-annotations">3. Overriding JDO Annotations</a></li>
-<li><a href="#_ugodn_java8">4. Java8</a></li>
-</ul>
-            </div>
-        </div>
-    </div>
-
-</div>
-
-
-<script src="../js/foundation/5.5.1/vendor/jquery.js"></script>
-<script src="../js/foundation/5.5.1/foundation.min.js"></script>
-
-
-<link href="../css/jquery.tocify/1.9.0/jquery.tocify.css" rel="stylesheet">
-<script src="../js/jqueryui/1.11.4/jquery-ui.min.js"></script>
-<script src="../js/jquery.tocify/1.9.0/jquery.tocify.js"></script>
-
-
-
-<script type="text/javascript">
+<span class="tag">&lt;/dependency&gt;</span></code></pre> 
+        </div> 
+       </div> 
+       <div class="admonitionblock note"> 
+        <table> 
+         <tbody>
+          <tr> 
+           <td class="icon"> <i class="fa icon-note" title="Note"></i> </td> 
+           <td class="content"> 
+            <div class="paragraph"> 
+             <p>The DataNucleus website includes a <a href="http://www.datanucleus.org/products/accessplatform/compatibility.html">page</a> listing version compatibility of these extensions vis-a-vis the core DataNucleus platform.</p> 
+            </div> </td> 
+          </tr> 
+         </tbody>
+        </table> 
+       </div> 
+      </div> 
+     </div> 
+    </div> 
+    <footer> 
+     <hr> 
+     <p class="small"> Copyright � 2010~2016 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0. <br> Apache, the Apache feather logo, Apache&nbsp;Isis, and the Apache&nbsp;Isis project logo are all trademarks of The&nbsp;Apache&nbsp;Software&nbsp;Foundation. </p> 
+    </footer> 
+   </div> 
+   <div id="doc-content-right" class="large-3 medium-3 xcolumns"> 
+    <div id="toc" class="toc2"> 
+     <div class="fallback-toc"> 
+      <ul class="sectlevel1"> 
+       <li><a href="#_ugdnos">1. DataNucleus Object Store</a> 
+        <ul class="sectlevel2"> 
+         <li><a href="#_other_guides">1.1. Other Guides</a></li> 
+        </ul> </li> 
+       <li><a href="#_ugodn_configuring">2. Configuring DataNucleus</a> 
+        <ul class="sectlevel2"> 
+         <li><a href="#_ugodn_configuring_properties">2.1. Configuration Properties</a> 
+          <ul class="sectlevel3"> 
+           <li><a href="#_configuration_properties_for_apache_isis_itself">2.1.1. Configuration Properties for Apache Isis itself</a></li> 
+           <li><a href="#_configuration_properties_passed_through_directly_to_datanucleus">2.1.2. Configuration Properties passed through directly to DataNucleus.</a></li> 
+          </ul> </li> 
+         <li><a href="#_ugodn_configuring_persistence-xml">2.2. <code>persistence.xml</code></a></li> 
+         <li><a href="#_ugodn_configuring_eagerly-registering-entities">2.3. Eagerly Registering Entities</a></li> 
+         <li><a href="#_ugodn_configuring_disabling-persistence-by-reachability">2.4. Persistence by Reachability</a> 
+          <ul class="sectlevel3"> 
+           <li><a href="#_the_issue_in_more_detail">2.4.1. The issue in more detail</a></li> 
+          </ul> </li> 
+         <li><a href="#_ugodn_configuring_using-jndi-data-source">2.5. Using JNDI DataSource</a> 
+          <ul class="sectlevel3"> 
+           <li><a href="#_application_managed">2.5.1. Application managed</a></li> 
+           <li><a href="#_container_managed_jndi">2.5.2. Container managed (JNDI)</a></li> 
+          </ul> </li> 
+        </ul> </li> 
+       <li><a href="#_ugodn_overriding-jdo-annotations">3. Overriding JDO Annotations</a></li> 
+       <li><a href="#_ugodn_java8">4. Java8</a></li> 
+      </ul> 
+     </div> 
+    </div> 
+   </div> 
+  </div> 
+  <script src="../js/foundation/5.5.1/vendor/jquery.js"></script> 
+  <script src="../js/foundation/5.5.1/foundation.min.js"></script> 
+  <link href="../css/jquery.tocify/1.9.0/jquery.tocify.css" rel="stylesheet"> 
+  <script src="../js/jqueryui/1.11.4/jquery-ui.min.js"></script> 
+  <script src="../js/jquery.tocify/1.9.0/jquery.tocify.js"></script> 
+  <script type="text/javascript">
     $(function () {
         $("#toc").tocify({
             scrollTo: 50,
@@ -1171,9 +1070,8 @@ listing version compatibility of these extensions vis-a-vis the core DataNucleus
         });
         $(".fallback-toc").hide();
     });
-</script>
-
-<script type="text/javascript">
+</script> 
+  <script type="text/javascript">
 
   /****
 
@@ -1283,9 +1181,8 @@ listing version compatibility of these extensions vis-a-vis the core DataNucleus
 
     ***/
 
-</script>
-
-<script type="text/javascript">
+</script> 
+  <script type="text/javascript">
 
 $(document).ready(function(){
     if("Documentation" === "DataNucleus Object Store") {
@@ -1297,10 +1194,8 @@ $(document).ready(function(){
 
 });
 
-</script>
-
-
-<script>
+</script> 
+  <script>
 
 $( document ).ready(function() {
 
@@ -1391,7 +1286,6 @@ $( document ).ready(function() {
 
 
 });
-</script>
-
-</body>
+</script>  
+ </body>
 </html>


[06/44] isis-site git commit: ISIS-1594: provide an 'edit' button

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/more-thanks.html
----------------------------------------------------------------------
diff --git a/content/more-thanks.html b/content/more-thanks.html
index 53447a3..e45607e 100644
--- a/content/more-thanks.html
+++ b/content/more-thanks.html
@@ -1,12 +1,10 @@
 <!doctype html>
 <html class="no-js" lang="en">
-<head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-
-    <title>More thanks</title>
-
-    <!--
+ <head> 
+  <meta charset="utf-8"> 
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"> 
+  <title>More thanks</title> 
+  <!--
         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
@@ -23,31 +21,21 @@
         KIND, either express or implied.  See the License for the
         specific language governing permissions and limitations
         under the License.
-    -->
-
-    <!-- No caching headers -->
-    <meta http-equiv="cache-control" content="no-cache" />
-    <meta http-equiv="pragma" content="no-cache" />
-    <meta http-equiv="expires" content="-1" />
-
-
-    <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
-    <link href="./css/foundation/5.5.1/foundation.css" rel="stylesheet" />
-    <script src="./js/foundation/5.5.1/vendor/modernizr.js"></script>
-    <link href="./css/asciidoctor/colony.css" rel="stylesheet">
-    <link href="./css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-
-
-
-    <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
-    <!--[if lt IE 9]>
+    --> 
+  <!-- No caching headers --> 
+  <meta http-equiv="cache-control" content="no-cache"> 
+  <meta http-equiv="pragma" content="no-cache"> 
+  <meta http-equiv="expires" content="-1"> 
+  <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line --> 
+  <link href="./css/foundation/5.5.1/foundation.css" rel="stylesheet"> 
+  <script src="./js/foundation/5.5.1/vendor/modernizr.js"></script> 
+  <link href="./css/asciidoctor/colony.css" rel="stylesheet"> 
+  <link href="./css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet"> 
+  <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet"> 
+  <!--[if lt IE 9]>
       <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
-    <![endif]-->
-
-
-
-    <style type="text/css">
+    <![endif]--> 
+  <style type="text/css">
         pre code {
             background-color: inherit;
             border-style: none;
@@ -192,9 +180,8 @@ table.CodeRay td.code>pre{padding:0}
         color:#fff;
         font-size: 1.1em;
     }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         @media only screen and (min-width: 40.063em) {
           .top-bar {
             .contain-to-grid .top-bar {
@@ -205,9 +192,8 @@ table.CodeRay td.code>pre{padding:0}
         .row {
             max-width: 80rem;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .extended-quote,
         .extended-quote-first {
             margin-left: 40px;
@@ -231,9 +217,8 @@ table.CodeRay td.code>pre{padding:0}
             text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
         }
         
-    </style>
-
-    <style>
+    </style> 
+  <style>
         body {
           position: relative;
         }
@@ -255,6 +240,7 @@ table.CodeRay td.code>pre{padding:0}
 
         div#doc-content {
             margin-top: 30px;
+            padding-top: 30px;
         }
 
         div.documentation-page table.frame-all {
@@ -286,9 +272,8 @@ table.CodeRay td.code>pre{padding:0}
             min-height: 2000px;
         }
 
-    </style>
-
-    <style>
+    </style> 
+  <style>
 
         @media only screen and (min-width: 768px) {
           #toc.toc2 ul ul { margin-left: -10px; }
@@ -316,15 +301,13 @@ table.CodeRay td.code>pre{padding:0}
         body div#toc2 li.tocify-item.active a {
             color: red;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         footer {
             margin-top: 1000px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* overriding colony.css stylesheet */
         .literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
            /*padding: 1.25em 1.5625em 1.125em 1.5625em;*/
@@ -372,9 +355,8 @@ table.CodeRay td.code>pre{padding:0}
         .imageblock img {
             margin-bottom: 10px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* from http://ben.balter.com/2014/03/13/pages-anchor-links/ */
         .header-link {
           position: absolute;
@@ -395,9 +377,8 @@ table.CodeRay td.code>pre{padding:0}
         h6:hover .header-link {
           opacity: 1;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .top-bar
         {
             -webkit-transition-duration: .5s;
@@ -425,191 +406,164 @@ table.CodeRay td.code>pre{padding:0}
             -webkit-transition-property: -webkit-transform;
             transition-property: transform;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         #doc-content a.guide {
             color: white;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
+        .tocify {
+            margin-top: 80px;
+        }
+    </style> 
+  <style>
         .tocify {
             margin-top: 80px;
         }
-    </style>
-
-
-</script>
-
-</head>
-<body>
-
-<<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
-    <div class="github-fork-ribbon">
-        <a href="https://github.com/apache/isis#fork-destination-box">Fork me on GitHub</a>
-    </div>
-</div>
-
-
-<div class="row">
-
-    <div class="fixed contain-to-grid header">
-        <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
-            <ul class="title-area">
-                <li class="name">
-                    <h1>
-                        <a href="/index.html">Apache Isis&trade;</a>
-                    </h1>
-                </li>
-                <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
-                <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
-            </ul>
-
-            <section class="top-bar-section">
-                <ul class="right">
-
-                    <li class="has-form">
-                       <FORM class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
-                        <div class="row collapse">
-                            <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
-                            <INPUT type="hidden" name="cof" value="FORID:0">
-                            <INPUT class="form-control" name="q" type="text" placeholder="Search">
-                        </div>
-                    </FORM>
-                     </li>
-
-                </ul>
-
-                <!-- Left Nav Section -->
-                <ul class="left">
-
-                    <li><a href="/documentation.html">Documentation</a></li>
-                    <li><a href="/downloads.html">Downloads</a></li>
-                    <li><a href="/help.html">Help</a></li>
-                    <li><a href="/asf.html">@ASF</a></li>
-
-                </ul>
-
-            </section>
-        </nav>
-    </div>
-</div>
-
-<div class="row">
-
-    <div id="doc-content-left" class="large-9 medium-9 columns">
-
-
-        <div id="doc-content">
-          <div class="paragraph">
-<p><br/><br/><br/></p>
-</div>
-<div class="paragraph">
-<p>In addition to the <a href="http://www.apache.org/foundation/thanks.html">support given to Apache Foundation as a whole</a>, we in the Apache Isis community would also like to extend our thanks to:</p>
-</div>
-<table class="tableblock frame-all grid-all spread">
-<colgroup>
-<col style="width: 33.3333%;">
-<col style="width: 66.6667%;">
-</colgroup>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="imageblock">
-<div class="content">
-<a class="image" href="http://www.eurocommercialproperties.com"><img src="images/more-thanks/ecp.png" alt="ecp"></a>
-</div>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Eurocommercial Properties, for sponsoring the development of Apache Isis in support of the <a href="./powered-by.html">Estatio</a> estate management application.  Our heart-felt thanks.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="imageblock">
-<div class="content">
-<a class="image" href="http://structure101.com"><img src="images/more-thanks/s101_170.png" alt="s101 170"></a>
-</div>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Headway Software, for supplying an open source license to Structure&nbsp;101.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="imageblock">
-<div class="content">
-<a class="image" href="http://www.ej-technologies.com/products/jprofiler/overview.html"><img src="images/more-thanks/ej-technologies.png" alt="ej technologies"></a>
-</div>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>EJ Technologies, for supplying an open source license to <a href="http://www.ej-technologies.com/products/jprofiler/overview.html">JProfiler</a></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="imageblock">
-<div class="content">
-<a class="image" href="http://icons8.com"><img src="images/more-thanks/icons8-logo.png" alt="icons8 logo"></a>
-</div>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Icons8, for selected icons on this website and in the <a href="https://github.com/apache/isis/tree/master/example/application/simpleapp/dom/src/main/resources/images">simpleapp</a> used to generate the <a href="./simpleapp-archetype.html">simpleapp archetype</a></p>
-</div></div></td>
-</tr>
-</tbody>
-</table>
-<div class="paragraph">
-<p>Also to:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="https://github.com/mojavelinux">Dan Allen</a> for his fantastic work on <a href="https://github.com/asciidoctor/asciidoctor">Asciidoctor</a></p>
-</li>
-<li>
-<p><a href="https://github.com/lukehutch">Luke Hutchison</a> for his <a href="https://github.com/lukehutch/fast-classpath-scanner">fast-classpath-scanner</a>, in particular for merging in our PR for Java 7 support and releasing so quickly</p>
-</li>
-<li>
-<p><a href="https://github.com/krasa/MavenHelper">Vojtech Krasa</a> for his super <a href="https://github.com/krasa/MavenHelper">MavenHelper</a> plugin to IntelliJ</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>and to many others who contribute their free time and passion to open source.</p>
-</div>
-        </div>
-
-        <footer>
-          <hr>
-          <p class="small">
-          Copyright &copy; 2010~2016 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0.
-          <br/>
-          Apache, the Apache feather logo, Apache&nbsp;Isis, and the Apache&nbsp;Isis project logo are all trademarks of The&nbsp;Apache&nbsp;Software&nbsp;Foundation.
-          </p>
-        </footer>
-
-    </div>
-
-    <div id="doc-content-right" class="large-3 medium-3 xcolumns">
-        <div id="toc" class="toc2">
-            <div class="fallback-toc">
-                
-            </div>
-        </div>
-    </div>
-
-</div>
-
-
-<script src="./js/foundation/5.5.1/vendor/jquery.js"></script>
-<script src="./js/foundation/5.5.1/foundation.min.js"></script>
-
-
-<link href="./css/jquery.tocify/1.9.0/jquery.tocify.css" rel="stylesheet">
-<script src="./js/jqueryui/1.11.4/jquery-ui.min.js"></script>
-<script src="./js/jquery.tocify/1.9.0/jquery.tocify.js"></script>
-
-
-
-<script type="text/javascript">
+    </style>  
+ </head> 
+ <body> 
+  <div class="row"> 
+   <div class="fixed contain-to-grid header"> 
+    <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem"> 
+     <ul class="title-area"> 
+      <li class="name"> <h1> <a href="/index.html">Apache Isis\u2122</a> </h1> </li> 
+      <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone --> 
+      <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li> 
+     </ul> 
+     <section class="top-bar-section"> 
+      <ul class="right"> 
+       <li class="has-form"> 
+        <form class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse"> 
+         <div class="row collapse"> 
+          <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya"> 
+          <input type="hidden" name="cof" value="FORID:0"> 
+          <input class="form-control" name="q" type="text" placeholder="Search"> 
+         </div> 
+        </form> </li> 
+      </ul> 
+      <!-- Left Nav Section --> 
+      <ul class="left"> 
+       <li><a href="/documentation.html">Documentation</a></li> 
+       <li><a href="/downloads.html">Downloads</a></li> 
+       <li><a href="/help.html">Help</a></li> 
+       <li><a href="/asf.html">@ASF</a></li> 
+      </ul> 
+     </section> 
+    </nav> 
+   </div> 
+  </div> 
+  <div class="row"> 
+   <div id="doc-content-left" class="large-9 medium-9 columns"> 
+    <div id="doc-content">
+     <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/more-thanks.adoc&quot;" style="float: right; font-size: small; padding: 6px;  "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+     <div class="paragraph"> 
+      <p>In addition to the <a href="http://www.apache.org/foundation/thanks.html">support given to Apache Foundation as a whole</a>, we in the Apache Isis community would also like to extend our thanks to:</p> 
+     </div> 
+     <table class="tableblock frame-all grid-all spread"> 
+      <colgroup> 
+       <col style="width: 33.3333%;"> 
+       <col style="width: 66.6667%;"> 
+      </colgroup> 
+      <tbody> 
+       <tr> 
+        <td class="tableblock halign-left valign-top">
+         <div>
+          <div class="imageblock"> 
+           <div class="content"> 
+            <a class="image" href="http://www.eurocommercialproperties.com"><img src="images/more-thanks/ecp.png" alt="ecp"></a> 
+           </div> 
+          </div>
+         </div></td> 
+        <td class="tableblock halign-left valign-top">
+         <div>
+          <div class="paragraph"> 
+           <p>Eurocommercial Properties, for sponsoring the development of Apache Isis in support of the <a href="./powered-by.html">Estatio</a> estate management application. Our heart-felt thanks.</p> 
+          </div>
+         </div></td> 
+       </tr> 
+       <tr> 
+        <td class="tableblock halign-left valign-top">
+         <div>
+          <div class="imageblock"> 
+           <div class="content"> 
+            <a class="image" href="http://structure101.com"><img src="images/more-thanks/s101_170.png" alt="s101 170"></a> 
+           </div> 
+          </div>
+         </div></td> 
+        <td class="tableblock halign-left valign-top">
+         <div>
+          <div class="paragraph"> 
+           <p>Headway Software, for supplying an open source license to Structure&nbsp;101.</p> 
+          </div>
+         </div></td> 
+       </tr> 
+       <tr> 
+        <td class="tableblock halign-left valign-top">
+         <div>
+          <div class="imageblock"> 
+           <div class="content"> 
+            <a class="image" href="http://www.ej-technologies.com/products/jprofiler/overview.html"><img src="images/more-thanks/ej-technologies.png" alt="ej technologies"></a> 
+           </div> 
+          </div>
+         </div></td> 
+        <td class="tableblock halign-left valign-top">
+         <div>
+          <div class="paragraph"> 
+           <p>EJ Technologies, for supplying an open source license to <a href="http://www.ej-technologies.com/products/jprofiler/overview.html">JProfiler</a></p> 
+          </div>
+         </div></td> 
+       </tr> 
+       <tr> 
+        <td class="tableblock halign-left valign-top">
+         <div>
+          <div class="imageblock"> 
+           <div class="content"> 
+            <a class="image" href="http://icons8.com"><img src="images/more-thanks/icons8-logo.png" alt="icons8 logo"></a> 
+           </div> 
+          </div>
+         </div></td> 
+        <td class="tableblock halign-left valign-top">
+         <div>
+          <div class="paragraph"> 
+           <p>Icons8, for selected icons on this website and in the <a href="https://github.com/apache/isis/tree/master/example/application/simpleapp/dom/src/main/resources/images">simpleapp</a> used to generate the <a href="./simpleapp-archetype.html">simpleapp archetype</a></p> 
+          </div>
+         </div></td> 
+       </tr> 
+      </tbody> 
+     </table> 
+     <div class="paragraph"> 
+      <p>Also to:</p> 
+     </div> 
+     <div class="ulist"> 
+      <ul> 
+       <li> <p><a href="https://github.com/mojavelinux">Dan Allen</a> for his fantastic work on <a href="https://github.com/asciidoctor/asciidoctor">Asciidoctor</a></p> </li> 
+       <li> <p><a href="https://github.com/krasa/MavenHelper">Vojtech Krasa</a> for his super <a href="https://github.com/krasa/MavenHelper">MavenHelper</a> plugin to IntelliJ</p> </li> 
+      </ul> 
+     </div> 
+     <div class="paragraph"> 
+      <p>and to many others who contribute their free time and passion to open source.</p> 
+     </div> 
+    </div> 
+    <footer> 
+     <hr> 
+     <p class="small"> Copyright � 2010~2016 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0. <br> Apache, the Apache feather logo, Apache&nbsp;Isis, and the Apache&nbsp;Isis project logo are all trademarks of The&nbsp;Apache&nbsp;Software&nbsp;Foundation. </p> 
+    </footer> 
+   </div> 
+   <div id="doc-content-right" class="large-3 medium-3 xcolumns"> 
+    <div id="toc" class="toc2"> 
+     <div class="fallback-toc"> 
+     </div> 
+    </div> 
+   </div> 
+  </div> 
+  <script src="./js/foundation/5.5.1/vendor/jquery.js"></script> 
+  <script src="./js/foundation/5.5.1/foundation.min.js"></script> 
+  <link href="./css/jquery.tocify/1.9.0/jquery.tocify.css" rel="stylesheet"> 
+  <script src="./js/jqueryui/1.11.4/jquery-ui.min.js"></script> 
+  <script src="./js/jquery.tocify/1.9.0/jquery.tocify.js"></script> 
+  <script type="text/javascript">
     $(function () {
         $("#toc").tocify({
             scrollTo: 50,
@@ -622,9 +576,8 @@ table.CodeRay td.code>pre{padding:0}
         });
         $(".fallback-toc").hide();
     });
-</script>
-
-<script type="text/javascript">
+</script> 
+  <script type="text/javascript">
 
   /****
 
@@ -734,9 +687,8 @@ table.CodeRay td.code>pre{padding:0}
 
     ***/
 
-</script>
-
-<script type="text/javascript">
+</script> 
+  <script type="text/javascript">
 
 $(document).ready(function(){
     if("Documentation" === "More thanks") {
@@ -748,10 +700,8 @@ $(document).ready(function(){
 
 });
 
-</script>
-
-
-<script>
+</script> 
+  <script>
 
 $( document ).ready(function() {
 
@@ -842,7 +792,6 @@ $( document ).ready(function() {
 
 
 });
-</script>
-
-</body>
+</script>  
+ </body>
 </html>

http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/powered-by.html
----------------------------------------------------------------------
diff --git a/content/powered-by.html b/content/powered-by.html
index 1ddb330..7b04377 100644
--- a/content/powered-by.html
+++ b/content/powered-by.html
@@ -1,12 +1,10 @@
 <!doctype html>
 <html class="no-js" lang="en">
-<head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-
-    <title>Powered By</title>
-
-    <!--
+ <head> 
+  <meta charset="utf-8"> 
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"> 
+  <title>Powered By</title> 
+  <!--
         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
@@ -23,31 +21,21 @@
         KIND, either express or implied.  See the License for the
         specific language governing permissions and limitations
         under the License.
-    -->
-
-    <!-- No caching headers -->
-    <meta http-equiv="cache-control" content="no-cache" />
-    <meta http-equiv="pragma" content="no-cache" />
-    <meta http-equiv="expires" content="-1" />
-
-
-    <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
-    <link href="./css/foundation/5.5.1/foundation.css" rel="stylesheet" />
-    <script src="./js/foundation/5.5.1/vendor/modernizr.js"></script>
-    <link href="./css/asciidoctor/colony.css" rel="stylesheet">
-    <link href="./css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-
-
-
-    <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
-    <!--[if lt IE 9]>
+    --> 
+  <!-- No caching headers --> 
+  <meta http-equiv="cache-control" content="no-cache"> 
+  <meta http-equiv="pragma" content="no-cache"> 
+  <meta http-equiv="expires" content="-1"> 
+  <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line --> 
+  <link href="./css/foundation/5.5.1/foundation.css" rel="stylesheet"> 
+  <script src="./js/foundation/5.5.1/vendor/modernizr.js"></script> 
+  <link href="./css/asciidoctor/colony.css" rel="stylesheet"> 
+  <link href="./css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet"> 
+  <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet"> 
+  <!--[if lt IE 9]>
       <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
-    <![endif]-->
-
-
-
-    <style type="text/css">
+    <![endif]--> 
+  <style type="text/css">
         pre code {
             background-color: inherit;
             border-style: none;
@@ -192,9 +180,8 @@ table.CodeRay td.code>pre{padding:0}
         color:#fff;
         font-size: 1.1em;
     }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         @media only screen and (min-width: 40.063em) {
           .top-bar {
             .contain-to-grid .top-bar {
@@ -205,9 +192,8 @@ table.CodeRay td.code>pre{padding:0}
         .row {
             max-width: 80rem;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .extended-quote,
         .extended-quote-first {
             margin-left: 40px;
@@ -231,9 +217,8 @@ table.CodeRay td.code>pre{padding:0}
             text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
         }
         
-    </style>
-
-    <style>
+    </style> 
+  <style>
         body {
           position: relative;
         }
@@ -255,6 +240,7 @@ table.CodeRay td.code>pre{padding:0}
 
         div#doc-content {
             margin-top: 30px;
+            padding-top: 30px;
         }
 
         div.documentation-page table.frame-all {
@@ -286,9 +272,8 @@ table.CodeRay td.code>pre{padding:0}
             min-height: 2000px;
         }
 
-    </style>
-
-    <style>
+    </style> 
+  <style>
 
         @media only screen and (min-width: 768px) {
           #toc.toc2 ul ul { margin-left: -10px; }
@@ -316,15 +301,13 @@ table.CodeRay td.code>pre{padding:0}
         body div#toc2 li.tocify-item.active a {
             color: red;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         footer {
             margin-top: 1000px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* overriding colony.css stylesheet */
         .literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
            /*padding: 1.25em 1.5625em 1.125em 1.5625em;*/
@@ -372,9 +355,8 @@ table.CodeRay td.code>pre{padding:0}
         .imageblock img {
             margin-bottom: 10px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* from http://ben.balter.com/2014/03/13/pages-anchor-links/ */
         .header-link {
           position: absolute;
@@ -395,9 +377,8 @@ table.CodeRay td.code>pre{padding:0}
         h6:hover .header-link {
           opacity: 1;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .top-bar
         {
             -webkit-transition-duration: .5s;
@@ -425,591 +406,479 @@ table.CodeRay td.code>pre{padding:0}
             -webkit-transition-property: -webkit-transform;
             transition-property: transform;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         #doc-content a.guide {
             color: white;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .tocify {
             margin-top: 80px;
         }
-    </style>
-
-
-</script>
-
-</head>
-<body>
-
-<<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
-    <div class="github-fork-ribbon">
-        <a href="https://github.com/apache/isis#fork-destination-box">Fork me on GitHub</a>
-    </div>
-</div>
-
-
-<div class="row">
-
-    <div class="fixed contain-to-grid header">
-        <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
-            <ul class="title-area">
-                <li class="name">
-                    <h1>
-                        <a href="/index.html">Apache Isis&trade;</a>
-                    </h1>
-                </li>
-                <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
-                <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
-            </ul>
-
-            <section class="top-bar-section">
-                <ul class="right">
-
-                    <li class="has-form">
-                       <FORM class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
-                        <div class="row collapse">
-                            <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
-                            <INPUT type="hidden" name="cof" value="FORID:0">
-                            <INPUT class="form-control" name="q" type="text" placeholder="Search">
-                        </div>
-                    </FORM>
-                     </li>
-
-                </ul>
-
-                <!-- Left Nav Section -->
-                <ul class="left">
-
-                    <li><a href="/documentation.html">Documentation</a></li>
-                    <li><a href="/downloads.html">Downloads</a></li>
-                    <li><a href="/help.html">Help</a></li>
-                    <li><a href="/asf.html">@ASF</a></li>
-
-                </ul>
-
-            </section>
-        </nav>
-    </div>
-</div>
-
-<div class="row">
-
-    <div id="doc-content-left" class="large-9 medium-9 columns">
-
-
-        <div id="doc-content">
-          <div id="preamble">
-<div class="sectionbody">
-<div class="paragraph">
-<p><br/><br/></p>
-</div>
-<div class="paragraph">
-<p>Deciding whether to use a full stack framework such as Apache Isis means in large part determining to what extent the
-applications you need to develop align with the strengths and philosophy of the framework.</p>
-</div>
-<div class="paragraph">
-<p>This page catalogues a few notable applications that are powered by Apache Isis so you can help make that determination:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="#_powered-by_estatio">Estatio</a></p>
-</li>
-<li>
-<p><a href="#_powered-by_gesconsultor-grc">GESCONSULTOR GRC</a></p>
-</li>
-<li>
-<p><a href="#_powered-by_contactapp">ContactApp</a></p>
-</li>
-<li>
-<p><a href="#_powered-by_commapp">CommApp</a></p>
-</li>
-<li>
-<p><a href="#_powered-by_transport-planner">TransportPlanner</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>If you have written an app in Apache Isis that you&#8217;d like to share, please mention it on the <a href="./support.html">mailing list</a>.</p>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_powered-by_estatio">Estatio</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Estatio is an estate management application developed for and deployed at <a href="http://www.eurocommercialproperties.com/">Eurocommercial</a>.</p>
-</div>
-<div class="paragraph">
-<p>Eurocommercial Properties is a Dutch-listed company that owns and operates over 50 shopping centres across Italy, France and Sweden, with income from property of approx. EUR150m per year.  Previously the company had used one of the leading software packages for its invoicing;
-however this had proven on the one hand lacking in key features/functionality for some locales, while
- overlapping/duplicating the features/capabilities of the general ledger system.  It had also been found to be
- extremely difficult to upgrade to new versions of the product (eg multiple regressions).</p>
-</div>
-<div class="paragraph">
-<p>The decision was made to develop a bespoke application focused just on invoicing, providing the flexibility to support
-any of the requirements that might arise in the company&#8217;s operating coutries.  It would interface but not overlap in
-functionality with the existing general ledger.  It would also be able to expand its scope over time to support more
-of the company&#8217;s operations (eg to support purchase and disposal of shopping centres).</p>
-</div>
-<div class="paragraph">
-<p>The application developed, and deployed initially in Italy, is called Estatio:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/powered-by/estatio/estatio-1.png"><img src="images/powered-by/estatio/estatio-1.png" alt="estatio 1" width="900px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>The development team for the original implementation consisted of just two developers (both of whom are Apache Isis committers); the first version of the application was developed over 2 years and 2 man-years effort.  Since the initial release - as the scope of the application has grown - the team has expanded to take on a further part-time developer and also some interns.</p>
-</div>
-<div class="sect2">
-<h3 id="_supporting_open_source">Supporting Open Source</h3>
-<div class="paragraph">
-<p>Much of Apache Isis' recent development has been driven out by the requirements of this application, so you can see for yourself how many of the features in Isis are used in real life.  Many of the (non-ASF) <a href="http://isisaddons.org">Isis Addons</a> also originate from the requirements of Estatio.</p>
-</div>
-<div class="paragraph">
-<p>Estatio itself is also open source, licensed under Apache Software License and available on <a href="https://github.com/estatio/estatio">github</a>.</p>
-</div>
-<div class="paragraph">
-<p>The Apache Isis committers are extremely grateful for Eurocommercial&#8217;s investment in the framework in order to make Estatio a reality.  Our heart-felt thanks.</p>
-</div>
-<div class="paragraph">
-<p>And to learn a little more about the Estatio domain model itself, take a look at both the source code (of course) and also at <a href="https://github.com/estatio/estatio/blob/master/adocs/documentation/src/main/asciidoc/auditability.adoc">this documentation</a>, developed to allow Eurocommercial&#8217;s accountants to understand and audit the application.</p>
-</div>
-<div class="paragraph">
-<p><em>Case study provided by Jeroen van der Wal, <a href="http://incode.org">Incode</a></em></p>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_powered-by_gesconsultor-grc">GESCONSULTOR GRC</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p><a href="http://http://www.gesconsultor.com">GESCONSULTOR</a> GRC (currently SandaS GRC) is an IT Governance, Risk and Compliance
-platform to help companies be compliant with IT-related ISO Standards, laws, regulations and best practices.  Its scope
-includes:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>ISO 27001 for Information Security Management Systems,</p>
-</li>
-<li>
-<p>ISO 22301 for Business Continuity Management Systems,</p>
-</li>
-<li>
-<p>ISO 20000 for IT Service Management Systems,</p>
-</li>
-<li>
-<p>PCI-DSS regulation for Information Systems accessing electronic media payment Information,</p>
-</li>
-<li>
-<p>COBIT standard from ISACA,</p>
-</li>
-<li>
-<p>Critical Infrastructure Protection laws,</p>
-</li>
-<li>
-<p>Data Privacy laws of many countries.</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>With thousands of customers of some of its modules, the application needed to support many business requirements
-derived from previous requisite sources and also from many Authoritative Sources loaded by users.</p>
-</div>
-<div class="paragraph">
-<p>In 2011 a major rearchitecting was begun, and Apache Isis was selected as the best solution - among all Java frameworks
-and platforms evaluated - for supporting those business rules in a domain-focused way.</p>
-</div>
-<div class="paragraph">
-<p>Following the principles of Domain-Driven Design for the domain layer, and with the infrastructure layer isolated by
-the Apache Isis framework, the new system started to grow in a highly structured and maintainable way.  New modules
-were created really quickly, with functionality not available on competing solutions.</p>
-</div>
-<div class="paragraph">
-<p>The application also leveraged the flexibility of the framework, replacing the provided Wicket viewer with a custom
-viewer.  More on this below.</p>
-</div>
-<div class="sect2">
-<h3 id="_key_features">Key features</h3>
-<div class="sect3">
-<h4 id="_enterprise_architecture">Enterprise Architecture</h4>
-<div class="paragraph">
-<p>Allows a company to model its <em>Business</em>, <em>IT Asset</em>s and their dependencies.  The custom viewer in this case exposes a
-classical form-like interface:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/powered-by/gesconsultor-grc/fig-1-custom-viewer.png"><img src="images/powered-by/gesconsultor-grc/fig-1-custom-viewer.png" alt="fig 1 custom viewer" width="800px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>Alternatively, a custom drag-n-drop visual interface can be used:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/powered-by/gesconsultor-grc/fig-2-custom-drag-n-drop-interface.png"><img src="images/powered-by/gesconsultor-grc/fig-2-custom-drag-n-drop-interface.png" alt="fig 2 custom drag n drop interface" width="800px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>This is implemented with the Dojo javascript library, interfacing to Apache Isis-managed domain objects.</p>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_risk_management">Risk Management</h4>
-<div class="paragraph">
-<p>Allows a company to manage <em>Risk Scenario</em>s through a <em>Risk Register</em>, and execute a full ISO 31000 compliant
-<em>Risk Assessment</em>.  A custom UI visualizes these risks as a heatmap:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/powered-by/gesconsultor-grc/fig-3-custom-ui-analyzing-risk-scenarios.png"><img src="images/powered-by/gesconsultor-grc/fig-3-custom-ui-analyzing-risk-scenarios.png" alt="fig 3 custom ui analyzing risk scenarios" width="800px"></a>
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_project_management">Project Management</h4>
-<div class="paragraph">
-<p>Allows users to visually manage their projects and tasks through a KanBan-like interface.  Again, the viewer provides
-drag-n-drop capabilities:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/powered-by/gesconsultor-grc/fig-4-managing-projects.png"><img src="images/powered-by/gesconsultor-grc/fig-4-managing-projects.png" alt="fig 4 managing projects" width="px"></a>
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_dashboard_and_indicators">Dashboard and Indicators</h4>
-<div class="paragraph">
-<p>Being a "world-first", the GRC platform&#8217;s implementation of the Information Security measurement standard (ISO 27004)
-allows companies to access real-time information available in the GRC platform and External Systems, associate
-<em>Decision Criteria</em> to them and create beautiful <em>Dashboard</em>s and <em>Indicator</em>s.</p>
-</div>
-<div class="paragraph">
-<p>All the business rules are on a Domain fully implemented in Apache Isis.</p>
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_implementation_details">Implementation details</h3>
-<div class="paragraph">
-<p>The GRC application require a more sophisticating and customizable viewer than is provided "out-of-the-box" by
-Apache Isis.  We chose <a href="http://wavemaker.com">Wavemaker</a> for implementing the viewer, also leveraging and integrating with
-various Wavemaker services.</p>
-</div>
-<div class="paragraph">
-<p>Even so, while GRC does (as the figures above show) include custom views, the majority of the views exposed by GRC are
-automatically generated from the underlying domain entities; the GRC viewer is a proprietary version of Isis' own
-<a href="ugvw.html">Wicket viewer</a>.  At the last count more than 400 domain entities, across 6 different
-Bounded Contexts, are surfaced in the UI in this this way.</p>
-</div>
-<div class="paragraph">
-<p>At the Domain level, we also extensively use the <a href="ugbtb.html#_ugbtb_decoupling_event-bus">domain events</a>
-functionality available in Apache Isis, along with many of the (non-ASF) <a href="http://isisaddons.org">Isis Addons</a> (such
-as <a href="http://github.com/isisaddons/isis-module-audit">audit</a>, <a href="http://github.com/isisaddons/isis-module-security">security</a>
-and the <a href="http://github.com/isisaddons/isis-module-excel">excel</a> modules).</p>
-</div>
-<div class="paragraph">
-<p>The GRC platform currently has more than 5600 automated tests, about 2000 being
-<a href="ugtst.html#_ugtst_bdd-spec-support">BDD tests</a> and 3600 <a href="ugtst.html#_ugtst_integ-test-support">integration
-tests</a>, all leveraging Apache Isis' extensive testing capabilities.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_summing_up">Summing up</h3>
-<div class="paragraph">
-<p>Three years after this major refactoring, the GRC platform was acquired by Telefonica to be used as its top-level
-Security Governance platform; a breakthrough in the Managed Security Services sector.</p>
-</div>
-<div class="paragraph">
-<p>The original development team currently work on Telefonica offices; the Product Management is co-directed by the
-<a href="http://www.govertis.com">GOVERTIS company</a> that originally developed it, and Telefonica.</p>
-</div>
-<div class="paragraph">
-<p>All this could not have been achieved as quickly nor as effectively without the Apache Isis platform.</p>
-</div>
-<div class="paragraph">
-<p><em>Case study provided by Oscar Bou, GOVERTIS</em></p>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_powered-by_contactapp">Contact App</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>The <em>Contact App</em> is a contact management application (like <a href="#_powered-by_estatio">Estatio</a>) developed for and deployed at <a href="http://eurocommercial.com">Eurocommercial</a>.</p>
-</div>
-<div class="paragraph">
-<p>This app originated out of our users' need to quickly look up different employees of Eurocommercial&#8217;s.
-At the same time the app managers would need to be able to easily edit or add to the existing contact information.
-We decided to create different Contact Groups consisting of multiple Contacts, each with their role within the group.</p>
-</div>
-<div class="paragraph">
-<p><span class="image"><img src="http://i.imgur.com/j0x7bw8.png" alt="j0x7bw8" width="97%"></span></p>
-</div>
-<div class="sect2">
-<h3 id="_apache_isis_with_ionic">Apache Isis with Ionic</h3>
-<div class="paragraph">
-<p>Because of the requirements of the app - quick and portable access - we decided to create a mobile app for it
-using the <a href="http://ionicframework.com/">Ionic Framework</a>. For the backend we decided to use <a href="http://isis.apache.org">Apache Isis</a>
-since this allowed us to rapidly develop the required backend application and surface a REST API to which the
-mobile application could connect. We found that it worked together quite well, and with part of the team
-behind <a href="http://github.com/estatio/estatio">Estatio</a> we were able to create an app that is clear to use and manage.</p>
-</div>
-<div class="paragraph">
-<p><span class="image"><img src="http://i.imgur.com/ETKG6Xe.png" alt="ETKG6Xe" width="32%"></span></p>
-</div>
-<div class="paragraph">
-<p>and:</p>
-</div>
-<div class="paragraph">
-<p><span class="image"><img src="http://i.imgur.com/zMX6OYq.png" alt="zMX6OYq" width="32%"></span></p>
-</div>
-<div class="paragraph">
-<p>and:</p>
-</div>
-<div class="paragraph">
-<p><span class="image"><img src="http://i.imgur.com/qhXhKiu.png" alt="qhXhKiu" width="32%"></span></p>
-</div>
-<div class="paragraph">
-<p>As our first Apache Isis app making use of mobile technologies it opens the doors for more to follow.
-Ionic has proven easy to learn and build apps with, and has a helpful community.  Meanwhile we&#8217;ve used
-Apache Isis' support for <a href="//http://isis.apache.org/guides/ugbtb.html#_ugbtb_view-models_jaxb">JAXB view models</a>
-and in particular the <a href="http://isis.apache.org/guides/ugvro.html#_ugvro_simplified-representations_apache-isis-profile">simplified REST representations</a> introduced in v1.12.0.  The result is code that is easy to follow and enhance.</p>
-</div>
-<div class="paragraph">
-<p>We expect that the scope of <em>Contact App</em> will expand and new features added, these will (almost certainly) remain open source.
-Meanwhile we&#8217;re now set up nicely to build further mobile apps using this technology stack.</p>
-</div>
-<div class="paragraph">
-<p><em>Case study provided by Rosco Kalis, for <a href="http://incode.org">Incode</a></em></p>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_powered-by_cqnz">CQNZ (Sequence)</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>CQNZ&#8482; (pronounced "sequence") is a thematic social network that:</p>
-</div>
-<div class="quoteblock">
-<blockquote>
-<div class="paragraph">
-<p>enables people like you and me to express our lives and experiences in the form of stories, streams or CQNZs, sharing the most exciting, thrilling and contemplative moments using photographs as the core element of interaction with others.</p>
-</div>
-</blockquote>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/powered-by/cqnz/cqnz-advert.png"><img src="images/powered-by/cqnz/cqnz-advert.png" alt="cqnz advert" width="900px"></a>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_underlying_technology">Underlying Technology</h3>
-<div class="paragraph">
-<p>With regard to the underlying technology, CQNZ&#8482; is a mobile application served by a web application using RESTful web services.
-The core, the CQNZ application server, is built on Apache Isis framework, which is hosted on a cloud service provider, configured for high availability, load balancing and fail-over with highly elastic scalability, prepared to scale from 1 server to tens, hundreds or even thousands of application servers running on Apache Isis.
-The client is a cross-platform mobile application now available on Apple Store and Google Play in the US, Mexico and Europe.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_benefits">Benefits</h3>
-<div class="paragraph">
-<p>The main benefits we have got from leveraging the Apache Isis framework are the automated RESTful web services generation and automated user interface, which allowed us to cut development work by 4 to 6 times vs traditional frameworks.
-Also, we were able to focus on our domain model instead of UI or application layers.
-Multi-tenancy add-ons allowed us a high degree of control over access control, and security and monitoring add ons provided us with out-of-the-box auditing.
-The fact that Apache Isis also automates the persistence layer using JDO allow us to combine SQL with NoSQL, which is a critical next feature we will implement for a very high scalability distributed environment.
-A great feature is the Apache Isis <code>x-ro-follow-links</code> feature, which allowed to cut the mobile client code by 70% in many cases, because it allows you to combine multiple RESTful calls into a single one, similar to what a SQL statement provides to a database, but at the web services level, improving http requests response time by two, three and up to four times.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_support">Support</h3>
-<div class="paragraph">
-<p>We&#8217;d like to thank the Apache Isis support team who provides great support, which includes multiple tutorials, detailed documentation and screencasts, so most of the learning was very straightforward.
-The quick, detailed and clear response on support helped us a great deal when facing issues and while learning.
-This is also one of the many reasons we choose Apache Isis over Spring Framework, Oracle ADF, and other frameworks we also evaluated when making our decision.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_for_more_info">For more info</h3>
-<div class="paragraph">
-<p>For further information, please see our <a href="https://www.facebook.com/pg/mycqnz/about/?ref=page_internal">facebook page</a> or visit <a href="http://cqnz.rocks/">cqnz.rocks</a>.  All images and trademarks property of their respective owners.</p>
-</div>
-<div class="paragraph">
-<p><em>Case study provided by Cesar Lugo, Research and Development Director, Vortech IT.</em></p>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_powered-by_transport-planner">TransportPlanner</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>TransportPlanner is a demo done by <a href="http://www.sintef.no/home/MARINTEK/">Marintek AS</a> to show a possible 'solution' to a multimodal transport planning problem. It&#8217;s a small part of a bigger European funded project.</p>
-</div>
-<div class="paragraph">
-<p>The domain is that:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>some cargo should be transported from a pickup destination to a delivery destination.</p>
-</li>
-<li>
-<p>A 'client' creates a transport demand</p>
-</li>
-<li>
-<p>A 'logistics service provider' plans a route from pickup to delivery using a shortest path algorithm.</p>
-</li>
-<li>
-<p>The route&#8217;s waypoints (where cargo is loaded from one providere to another) may be shown on a map.</p>
-</li>
-<li>
-<p>The costs associated with each leg may be shown as a pie chart</p>
-</li>
-<li>
-<p>The resource usage, i.e. costs and time for each leg, may be shown as a bar chart.</p>
-</li>
-<li>
-<p>An event may be generated (e.g. some customs papers are missing, therefore transport execution stops and a replan
-is necessary).</p>
-</li>
-</ul>
-</div>
-<table class="tableblock frame-all grid-all spread">
-<colgroup>
-<col style="width: 50%;">
-<col style="width: 50%;">
-</colgroup>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>TransportPlanner allows schedules of journeys to be planned.  It uses the (non-ASF) <a href="http://github.com/isisaddons/isis-wicket-gmap3">Isis addons' gmap3</a> wicket extension to provide the map.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="imageblock">
-<div class="content">
-<a class="image" href="https://www.assembla.com/code/transportplanner/git/node/blob/screenshots/TransportDemand.png?raw=1&rev=a9d5184ecb05c3d95dafec587c84cfcbc7a25b8b"><img src="https://www.assembla.com/code/transportplanner/git/node/blob/screenshots/TransportDemand.png?raw=1&rev=a9d5184ecb05c3d95dafec587c84cfcbc7a25b8b" alt="TransportDemand" width="530px"></a>
-</div>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>TransportPlanner uses (non-ASF) <a href="http://github.com/isisaddons/isis-wicket-wickedcharts">Isis addons' wickedcharts</a> wicket extension to provide custom graphs</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="imageblock">
-<div class="content">
-<a class="image" href="https://www.assembla.com/code/transportplanner/git/node/blob/screenshots/TPM_CostPie.png?raw=1&rev=a9d5184ecb05c3d95dafec587c84cfcbc7a25b8b"><img src="https://www.assembla.com/code/transportplanner/git/node/blob/screenshots/TPM_CostPie.png?raw=1&rev=a9d5184ecb05c3d95dafec587c84cfcbc7a25b8b" alt="TPM CostPie" width="530px"></a>
-</div>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Another example of TransportPlanner&#8217;s use of (non-ASF) <a href="http://github.com/isisaddons/isis-wicket-wickedcharts">wickedcharts</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="imageblock">
-<div class="content">
-<a class="image" href="https://www.assembla.com/code/transportplanner/git/node/blob/screenshots/Tpm_ResourceUsage.png?raw=1&rev=a9d5184ecb05c3d95dafec587c84cfcbc7a25b8b"><img src="https://www.assembla.com/code/transportplanner/git/node/blob/screenshots/Tpm_ResourceUsage.png?raw=1&rev=a9d5184ecb05c3d95dafec587c84cfcbc7a25b8b" alt="Tpm ResourceUsage" width="530px"></a>
-</div>
-</div></div></td>
-</tr>
-</tbody>
-</table>
-<div class="paragraph">
-<p>The author, Christian Steinebach, wrote this demo part-time over the course of a few weeks.  He commented:</p>
-</div>
-<div class="paragraph">
-<p><div class="extended-quote"><p>
-I did not have too much time to get 'something done' &#8230;&#8203; But although I had a hard time in the beginning with Isis I don&#8217;t think I would have made it in time using 'conventional' development with database, GUI etc.
-using Apache Isis.
-</p></div></p>
-</div>
-<div class="paragraph">
-<p>Because this is a demo, there is a lot of room for improvement, but it does show how a relatively simple domain model can be brought 'alive'. The source code is available <a href="https://www.assembla.com/code/transportplanner/git/nodes">here</a> (note: it was written against a snapshot version of Apache Isis).</p>
-</div>
-<div class="paragraph">
-<p><em>Case study provided by Christian Steinebach, Marintech</em></p>
-</div>
-</div>
-</div>
-        </div>
-
-        <footer>
-          <hr>
-          <p class="small">
-          Copyright &copy; 2010~2016 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0.
-          <br/>
-          Apache, the Apache feather logo, Apache&nbsp;Isis, and the Apache&nbsp;Isis project logo are all trademarks of The&nbsp;Apache&nbsp;Software&nbsp;Foundation.
-          </p>
-        </footer>
-
-    </div>
-
-    <div id="doc-content-right" class="large-3 medium-3 xcolumns">
-        <div id="toc" class="toc2">
-            <div class="fallback-toc">
-                <ul class="sectlevel1">
-<li><a href="#_powered-by_estatio">Estatio</a>
-<ul class="sectlevel2">
-<li><a href="#_supporting_open_source">Supporting Open Source</a></li>
-</ul>
-</li>
-<li><a href="#_powered-by_gesconsultor-grc">GESCONSULTOR GRC</a>
-<ul class="sectlevel2">
-<li><a href="#_key_features">Key features</a>
-<ul class="sectlevel3">
-<li><a href="#_enterprise_architecture">Enterprise Architecture</a></li>
-<li><a href="#_risk_management">Risk Management</a></li>
-<li><a href="#_project_management">Project Management</a></li>
-<li><a href="#_dashboard_and_indicators">Dashboard and Indicators</a></li>
-</ul>
-</li>
-<li><a href="#_implementation_details">Implementation details</a></li>
-<li><a href="#_summing_up">Summing up</a></li>
-</ul>
-</li>
-<li><a href="#_powered-by_contactapp">Contact App</a>
-<ul class="sectlevel2">
-<li><a href="#_apache_isis_with_ionic">Apache Isis with Ionic</a></li>
-</ul>
-</li>
-<li><a href="#_powered-by_cqnz">CQNZ (Sequence)</a>
-<ul class="sectlevel2">
-<li><a href="#_underlying_technology">Underlying Technology</a></li>
-<li><a href="#_benefits">Benefits</a></li>
-<li><a href="#_support">Support</a></li>
-<li><a href="#_for_more_info">For more info</a></li>
-</ul>
-</li>
-<li><a href="#_powered-by_transport-planner">TransportPlanner</a></li>
-</ul>
+    </style> 
+  <style>
+        .tocify {
+            margin-top: 80px;
+        }
+    </style>  
+ </head> 
+ <body> 
+  <div class="row"> 
+   <div class="fixed contain-to-grid header"> 
+    <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem"> 
+     <ul class="title-area"> 
+      <li class="name"> <h1> <a href="/index.html">Apache Isis\u2122</a> </h1> </li> 
+      <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone --> 
+      <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li> 
+     </ul> 
+     <section class="top-bar-section"> 
+      <ul class="right"> 
+       <li class="has-form"> 
+        <form class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse"> 
+         <div class="row collapse"> 
+          <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya"> 
+          <input type="hidden" name="cof" value="FORID:0"> 
+          <input class="form-control" name="q" type="text" placeholder="Search"> 
+         </div> 
+        </form> </li> 
+      </ul> 
+      <!-- Left Nav Section --> 
+      <ul class="left"> 
+       <li><a href="/documentation.html">Documentation</a></li> 
+       <li><a href="/downloads.html">Downloads</a></li> 
+       <li><a href="/help.html">Help</a></li> 
+       <li><a href="/asf.html">@ASF</a></li> 
+      </ul> 
+     </section> 
+    </nav> 
+   </div> 
+  </div> 
+  <div class="row"> 
+   <div id="doc-content-left" class="large-9 medium-9 columns"> 
+    <div id="doc-content">
+     <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/powered-by.adoc&quot;" style="float: right; font-size: small; padding: 6px;  "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+     <div id="preamble"> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>Deciding whether to use a full stack framework such as Apache Isis means in large part determining to what extent the applications you need to develop align with the strengths and philosophy of the framework.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>This page catalogues a few notable applications that are powered by Apache Isis so you can help make that determination:</p> 
+       </div> 
+       <div class="ulist"> 
+        <ul> 
+         <li> <p><a href="#_powered-by_estatio">Estatio</a></p> </li> 
+         <li> <p><a href="#_powered-by_gesconsultor-grc">GESCONSULTOR GRC</a></p> </li> 
+         <li> <p><a href="#_powered-by_contactapp">ContactApp</a></p> </li> 
+         <li> <p><a href="#_powered-by_commapp">CommApp</a></p> </li> 
+         <li> <p><a href="#_powered-by_transport-planner">TransportPlanner</a></p> </li> 
+        </ul> 
+       </div> 
+       <div class="paragraph"> 
+        <p>If you have written an app in Apache Isis that you\u2019d like to share, please mention it on the <a href="./support.html">mailing list</a>.</p> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_powered-by_estatio">Estatio</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_powered-by_estatio.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>Estatio is an estate management application developed for and deployed at <a href="http://www.eurocommercialproperties.com/">Eurocommercial</a>.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>Eurocommercial Properties is a Dutch-listed company that owns and operates over 50 shopping centres across Italy, France and Sweden, with income from property of approx. EUR150m per year. Previously the company had used one of the leading software packages for its invoicing; however this had proven on the one hand lacking in key features/functionality for some locales, while overlapping/duplicating the features/capabilities of the general ledger system. It had also been found to be extremely difficult to upgrade to new versions of the product (eg multiple regressions).</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>The decision was made to develop a bespoke application focused just on invoicing, providing the flexibility to support any of the requirements that might arise in the company\u2019s operating coutries. It would interface but not overlap in functionality with the existing general ledger. It would also be able to expand its scope over time to support more of the company\u2019s operations (eg to support purchase and disposal of shopping centres).</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>The application developed, and deployed initially in Italy, is called Estatio:</p> 
+       </div> 
+       <div class="imageblock"> 
+        <div class="content"> 
+         <a class="image" href="images/powered-by/estatio/estatio-1.png"><img src="images/powered-by/estatio/estatio-1.png" alt="estatio 1" width="900px"></a> 
+        </div> 
+       </div> 
+       <div class="paragraph"> 
+        <p>The development team for the original implementation consisted of just two developers (both of whom are Apache Isis committers); the first version of the application was developed over 2 years and 2 man-years effort. Since the initial release - as the scope of the application has grown - the team has expanded to take on a further part-time developer and also some interns.</p> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_supporting_open_source">Supporting Open Source</h3> 
+        <div class="paragraph"> 
+         <p>Much of Apache Isis' recent development has been driven out by the requirements of this application, so you can see for yourself how many of the features in Isis are used in real life. Many of the (non-ASF) <a href="http://isisaddons.org">Isis Addons</a> also originate from the requirements of Estatio.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Estatio itself is also open source, licensed under Apache Software License and available on <a href="https://github.com/estatio/estatio">github</a>.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The Apache Isis committers are extremely grateful for Eurocommercial\u2019s investment in the framework in order to make Estatio a reality. Our heart-felt thanks.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>And to learn a little more about the Estatio domain model itself, take a look at both the source code (of course) and also at <a href="https://github.com/estatio/estatio/blob/master/adocs/documentation/src/main/asciidoc/auditability.adoc">this documentation</a>, developed to allow Eurocommercial\u2019s accountants to understand and audit the application.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p><em>Case study provided by Jeroen van der Wal, <a href="http://incode.org">Incode</a></em></p> 
+        </div> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_powered-by_gesconsultor-grc">GESCONSULTOR GRC</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_powered-by_gesconsultor-grc.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p><a href="http://http://www.gesconsultor.com">GESCONSULTOR</a> GRC (currently SandaS GRC) is an IT Governance, Risk and Compliance platform to help companies be compliant with IT-related ISO Standards, laws, regulations and best practices. Its scope includes:</p> 
+       </div> 
+       <div class="ulist"> 
+        <ul> 
+         <li> <p>ISO 27001 for Information Security Management Systems,</p> </li> 
+         <li> <p>ISO 22301 for Business Continuity Management Systems,</p> </li> 
+         <li> <p>ISO 20000 for IT Service Management Systems,</p> </li> 
+         <li> <p>PCI-DSS regulation for Information Systems accessing electronic media payment Information,</p> </li> 
+         <li> <p>COBIT standard from ISACA,</p> </li> 
+         <li> <p>Critical Infrastructure Protection laws,</p> </li> 
+         <li> <p>Data Privacy laws of many countries.</p> </li> 
+        </ul> 
+       </div> 
+       <div class="paragraph"> 
+        <p>With thousands of customers of some of its modules, the application needed to support many business requirements derived from previous requisite sources and also from many Authoritative Sources loaded by users.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>In 2011 a major rearchitecting was begun, and Apache Isis was selected as the best solution - among all Java frameworks and platforms evaluated - for supporting those business rules in a domain-focused way.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>Following the principles of Domain-Driven Design for the domain layer, and with the infrastructure layer isolated by the Apache Isis framework, the new system started to grow in a highly structured and maintainable way. New modules were created really quickly, with functionality not available on competing solutions.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>The application also leveraged the flexibility of the framework, replacing the provided Wicket viewer with a custom viewer. More on this below.</p> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_key_features">Key features</h3> 
+        <div class="sect3"> 
+         <h4 id="_enterprise_architecture">Enterprise Architecture</h4> 
+         <div class="paragraph"> 
+          <p>Allows a company to model its <em>Business</em>, <em>IT Asset</em>s and their dependencies. The custom viewer in this case exposes a classical form-like interface:</p> 
+         </div> 
+         <div class="imageblock"> 
+          <div class="content"> 
+           <a class="image" href="images/powered-by/gesconsultor-grc/fig-1-custom-viewer.png"><img src="images/powered-by/gesconsultor-grc/fig-1-custom-viewer.png" alt="fig 1 custom viewer" width="800px"></a> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>Alternatively, a custom drag-n-drop visual interface can be used:</p> 
+         </div> 
+         <div class="imageblock"> 
+          <div class="content"> 
+           <a class="image" href="images/powered-by/gesconsultor-grc/fig-2-custom-drag-n-drop-interface.png"><img src="images/powered-by/gesconsultor-grc/fig-2-custom-drag-n-drop-interface.png" alt="fig 2 custom drag n drop interface" width="800px"></a> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>This is implemented with the Dojo javascript library, interfacing to Apache Isis-managed domain objects.</p> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_risk_management">Risk Management</h4> 
+         <div class="paragraph"> 
+          <p>Allows a company to manage <em>Risk Scenario</em>s through a <em>Risk Register</em>, and execute a full ISO 31000 compliant <em>Risk Assessment</em>. A custom UI visualizes these risks as a heatmap:</p> 
+         </div> 
+         <div class="imageblock"> 
+          <div class="content"> 
+           <a class="image" href="images/powered-by/gesconsultor-grc/fig-3-custom-ui-analyzing-risk-scenarios.png"><img src="images/powered-by/gesconsultor-grc/fig-3-custom-ui-analyzing-risk-scenarios.png" alt="fig 3 custom ui analyzing risk scenarios" width="800px"></a> 
+          </div> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_project_management">Project Management</h4> 
+         <div class="paragraph"> 
+          <p>Allows users to visually manage their projects and tasks through a KanBan-like interface. Again, the viewer provides drag-n-drop capabilities:</p> 
+         </div> 
+         <div class="imageblock"> 
+          <div class="content"> 
+           <a class="image" href="images/powered-by/gesconsultor-grc/fig-4-managing-projects.png"><img src="images/powered-by/gesconsultor-grc/fig-4-managing-projects.png" alt="fig 4 managing projects" width="px"></a> 
+          </div> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_dashboard_and_indicators">Dashboard and Indicators</h4> 
+         <div class="paragraph"> 
+          <p>Being a "world-first", the GRC platform\u2019s implementation of the Information Security measurement standard (ISO 27004) allows companies to access real-time information available in the GRC platform and External Systems, associate <em>Decision Criteria</em> to them and create beautiful <em>Dashboard</em>s and <em>Indicator</em>s.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>All the business rules are on a Domain fully implemented in Apache Isis.</p> 
+         </div> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_implementation_details">Implementation details</h3> 
+        <div class="paragraph"> 
+         <p>The GRC application require a more sophisticating and customizable viewer than is provided "out-of-the-box" by Apache Isis. We chose <a href="http://wavemaker.com">Wavemaker</a> for implementing the viewer, also leveraging and integrating with various Wavemaker services.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Even so, while GRC does (as the figures above show) include custom views, the majority of the views exposed by GRC are automatically generated from the underlying domain entities; the GRC viewer is a proprietary version of Isis' own <a href="ugvw.html">Wicket viewer</a>. At the last count more than 400 domain entities, across 6 different Bounded Contexts, are surfaced in the UI in this this way.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>At the Domain level, we also extensively use the <a href="ugbtb.html#_ugbtb_decoupling_event-bus">domain events</a> functionality available in Apache Isis, along with many of the (non-ASF) <a href="http://isisaddons.org">Isis Addons</a> (such as <a href="http://github.com/isisaddons/isis-module-audit">audit</a>, <a href="http://github.com/isisaddons/isis-module-security">security</a> and the <a href="http://github.com/isisaddons/isis-module-excel">excel</a> modules).</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The GRC platform currently has more than 5600 automated tests, about 2000 being <a href="ugtst.html#_ugtst_bdd-spec-support">BDD tests</a> and 3600 <a href="ugtst.html#_ugtst_integ-test-support">integration tests</a>, all leveraging Apache Isis' extensive testing capabilities.</p> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_summing_up">Summing up</h3> 
+        <div class="paragraph"> 
+         <p>Three years after this major refactoring, the GRC platform was acquired by Telefonica to be used as its top-level Security Governance platform; a breakthrough in the Managed Security Services sector.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The original development team currently work on Telefonica offices; the Product Management is co-directed by the <a href="http://www.govertis.com">GOVERTIS company</a> that originally developed it, and Telefonica.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>All this could not have been achieved as quickly nor as effectively without the Apache Isis platform.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p><em>Case study provided by Oscar Bou, GOVERTIS</em></p> 
+        </div> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_powered-by_contactapp">Contact App</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_powered-by_contactapp.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>The <em>Contact App</em> is a contact management application (like <a href="#_powered-by_estatio">Estatio</a>) developed for and deployed at <a href="http://eurocommercial.com">Eurocommercial</a>.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>This app originated out of our users' need to quickly look up different employees of Eurocommercial\u2019s. At the same time the app managers would need to be able to easily edit or add to the existing contact information. We decided to create different Contact Groups consisting of multiple Contacts, each with their role within the group.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p><span class="image"><img src="http://i.imgur.com/j0x7bw8.png" alt="j0x7bw8" width="97%"></span></p> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_apache_isis_with_ionic">Apache Isis with Ionic</h3> 
+        <div class="paragraph"> 
+         <p>Because of the requirements of the app - quick and portable access - we decided to create a mobile app for it using the <a href="http://ionicframework.com/">Ionic Framework</a>. For the backend we decided to use <a href="http://isis.apache.org">Apache Isis</a> since this allowed us to rapidly develop the required backend application and surface a REST API to which the mobile application could connect. We found that it worked together quite well, and with part of the team behind <a href="http://github.com/estatio/estatio">Estatio</a> we were able to create an app that is clear to use and manage.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p><span class="image"><img src="http://i.imgur.com/ETKG6Xe.png" alt="ETKG6Xe" width="32%"></span></p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>and:</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p><span class="image"><img src="http://i.imgur.com/zMX6OYq.png" alt="zMX6OYq" width="32%"></span></p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>and:</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p><span class="image"><img src="http://i.imgur.com/qhXhKiu.png" alt="qhXhKiu" width="32%"></span></p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>As our first Apache Isis app making use of mobile technologies it opens the doors for more to follow. Ionic has proven easy to learn and build apps with, and has a helpful community. Meanwhile we\u2019ve used Apache Isis' support for <a href="//http://isis.apache.org/guides/ugbtb.html#_ugbtb_view-models_jaxb">JAXB view models</a> and in particular the <a href="http://isis.apache.org/guides/ugvro.html#_ugvro_simplified-representations_apache-isis-profile">simplified REST representations</a> introduced in v1.12.0. The result is code that is easy to follow and enhance.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>We expect that the scope of <em>Contact App</em> will expand and new features added, these will (almost certainly) remain open source. Meanwhile we\u2019re now set up nicely to build further mobile apps using this technology stack.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p><em>Case study provided by Rosco Kalis, for <a href="http://incode.org">Incode</a></em></p> 
+        </div> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_powered-by_cqnz">CQNZ (Sequence)</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_powered-by_cqnz.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>CQNZ\u2122 (pronounced "sequence") is a thematic social network that:</p> 
+       </div> 
+       <div class="quoteblock"> 
+        <blockquote> 
+         <div class="paragraph"> 
+          <p>enables people like you and me to express our lives and experiences in the form of stories, streams or CQNZs, sharing the most exciting, thrilling and contemplative moments using photographs as the core element of interaction with others.</p> 
+         </div> 
+        </blockquote> 
+       </div> 
+       <div class="imageblock"> 
+        <div class="content"> 
+         <a class="image" href="images/powered-by/cqnz/cqnz-advert.png"><img src="images/powered-by/cqnz/cqnz-advert.png" alt="cqnz advert" width="900px"></a> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_underlying_technology">Underlying Technology</h3> 
+        <div class="paragraph"> 
+         <p>With regard to the underlying technology, CQNZ\u2122 is a mobile application served by a web application using RESTful web services. The core, the CQNZ application server, is built on Apache Isis framework, which is hosted on a cloud service provider, configured for high availability, load balancing and fail-over with highly elastic scalability, prepared to scale from 1 server to tens, hundreds or even thousands of application servers running on Apache Isis. The client is a cross-platform mobile application now available on Apple Store and Google Play in the US, Mexico and Europe.</p> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_benefits">Benefits</h3> 
+        <div class="paragraph"> 
+         <p>The main benefits we have got from leveraging the Apache Isis framework are the automated RESTful web services generation and automated user interface, which allowed us to cut development work by 4 to 6 times vs traditional frameworks. Also, we were able to focus on our domain model instead of UI or application layers. Multi-tenancy add-ons allowed us a high degree of control over access control, and security and monitoring add ons provided us with out-of-the-box auditing. The fact that Apache Isis also automates the persistence layer using JDO allow us to combine SQL with NoSQL, which is a critical next feature we will implement for a very high scalability distributed environment. A great feature is the Apache Isis <code>x-ro-follow-links</code> feature, which allowed to cut the mobile client code by 70% in many cases, because it allows you to combine multiple RESTful calls into a single one, similar to what a SQL statement provides to a database, but at the web service
 s level, improving http requests response time by two, three and up to four times.</p> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_support">Support</h3> 
+        <div class="paragraph"> 
+         <p>We\u2019d like to thank the Apache Isis support team who provides great support, which includes multiple tutorials, detailed documentation and screencasts, so most of the learning was very straightforward. The quick, detailed and clear response on support helped us a great deal when facing issues and while learning. This is also one of the many reasons we choose Apache Isis over Spring Framework, Oracle ADF, and other frameworks we also evaluated when making our decision.</p> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_for_more_info">For more info</h3> 
+        <div class="paragraph"> 
+         <p>For further information, please see our <a href="https://www.facebook.com/pg/mycqnz/about/?ref=page_internal">facebook page</a> or visit <a href="http://cqnz.rocks/">cqnz.rocks</a>. All images and trademarks property of their respective owners.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p><em>Case study provided by Cesar Lugo, Research and Development Director, Vortech IT.</em></p> 
+        </div> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_powered-by_transport-planner">TransportPlanner</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_powered-by_transport-planner.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>TransportPlanner is a demo done by <a href="http://www.sintef.no/home/MARINTEK/">Marintek AS</a> to show a possible 'solution' to a multimodal transport planning problem. It\u2019s a small part of a bigger European funded project.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>The domain is that:</p> 
+       </div> 
+       <div class="ulist"> 
+        <ul> 
+         <li> <p>some cargo should be transported from a pickup destination to a delivery destination.</p> </li> 
+         <li> <p>A 'client' creates a transport demand</p> </li> 
+         <li> <p>A 'logistics service provider' plans a route from pickup to delivery using a shortest path algorithm.</p> </li> 
+         <li> <p>The route\u2019s waypoints (where cargo is loaded from one providere to another) may be shown on a map.</p> </li> 
+         <li> <p>The costs associated with each leg may be shown as a pie chart</p> </li> 
+         <li> <p>The resource usage, i.e. costs and time for each leg, may be shown as a bar chart.</p> </li> 
+         <li> <p>An event may be generated (e.g. some customs papers are missing, therefore transport execution stops and a replan is necessary).</p> </li> 
+        </ul> 
+       </div> 
+       <table class="tableblock frame-all grid-all spread"> 
+        <colgroup> 
+         <col style="width: 50%;"> 
+         <col style="width: 50%;"> 
+        </colgroup> 
+        <tbody> 
+         <tr> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="paragraph"> 
+             <p>TransportPlanner allows schedules of journeys to be planned. It uses the (non-ASF) <a href="http://github.com/isisaddons/isis-wicket-gmap3">Isis addons' gmap3</a> wicket extension to provide the map.</p> 
+            </div>
+           </div></td> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="imageblock"> 
+             <div class="content"> 
+              <a class="image" href="https://www.assembla.com/code/transportplanner/git/node/blob/screenshots/TransportDemand.png?raw=1&amp;rev=a9d5184ecb05c3d95dafec587c84cfcbc7a25b8b"><img src="https://www.assembla.com/code/transportplanner/git/node/blob/screenshots/TransportDemand.png?raw=1&amp;rev=a9d5184ecb05c3d95dafec587c84cfcbc7a25b8b" alt="TransportDemand" width="530px"></a> 
+             </div> 
+            </div>
+           </div></td> 
+         </tr> 
+         <tr> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="paragraph"> 
+             <p>TransportPlanner uses (non-ASF) <a href="http://github.com/isisaddons/isis-wicket-wickedcharts">Isis addons' wickedcharts</a> wicket extension to provide custom graphs</p> 
+            </div>
+           </div></td> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="imageblock"> 
+             <div class="content"> 
+              <a class="image" href="https://www.assembla.com/code/transportplanner/git/node/blob/screenshots/TPM_CostPie.png?raw=1&amp;rev=a9d5184ecb05c3d95dafec587c84cfcbc7a25b8b"><img src="https://www.assembla.com/code/transportplanner/git/node/blob/screenshots/TPM_CostPie.png?raw=1&amp;rev=a9d5184ecb05c3d95dafec587c84cfcbc7a25b8b" alt="TPM CostPie" width="530px"></a> 
+             </div> 
+            </div>
+           </div></td> 
+         </tr> 
+         <tr> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="paragraph"> 
+             <p>Another example of TransportPlanner\u2019s use of (non-ASF) <a href="http://github.com/isisaddons/isis-wicket-wickedcharts">wickedcharts</a></p> 
             </div>
+           </div></td> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="imageblock"> 
+             <div class="content"> 
+              <a class="image" href="https://www.assembla.com/code/transportplanner/git/node/blob/screenshots/Tpm_ResourceUsage.png?raw=1&amp;rev=a9d5184ecb05c3d95dafec587c84cfcbc7a25b8b"><img src="https://www.assembla.com/code/transportplanner/git/node/blob/screenshots/Tpm_ResourceUsage.png?raw=1&amp;rev=a9d5184ecb05c3d95dafec587c84cfcbc7a25b8b" alt="Tpm ResourceUsage" width="530px"></a> 
+             </div> 
+            </div>
+           </div></td> 
+         </tr> 
+        </tbody> 
+       </table> 
+       <div class="paragraph"> 
+        <p>The author, Christian Steinebach, wrote this demo part-time over the course of a few weeks. He commented:</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p></p>
+        <div class="extended-quote">
+         <p> I did not have too much time to get 'something done' \u2026\u200b But although I had a hard time in the beginning with Isis I don\u2019t think I would have made it in time using 'conventional' development with database, GUI etc. using Apache Isis. </p>
         </div>
-    </div>
-
-</div>
-
-
-<script src="./js/foundation/5.5.1/vendor/jquery.js"></script>
-<script src="./js/foundation/5.5.1/foundation.min.js"></script>
-
-
-<link href="./css/jquery.tocify/1.9.0/jquery.tocify.css" rel="stylesheet">
-<script src="./js/jqueryui/1.11.4/jquery-ui.min.js"></script>
-<script src="./js/jquery.tocify/1.9.0/jquery.tocify.js"></script>
-
-
-
-<script type="text/javascript">
+        <p></p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>Because this is a demo, there is a lot of room for improvement, but it does show how a relatively simple domain model can be brought 'alive'. The source code is available <a href="https://www.assembla.com/code/transportplanner/git/nodes">here</a> (note: it was written against a snapshot version of Apache Isis).</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p><em>Case study provided by Christian Steinebach, Marintech</em></p> 
+       </div> 
+      </div> 
+     </div> 
+    </div> 
+    <footer> 
+     <hr> 
+     <p class="small"> Copyright � 2010~2016 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0. <br> Apache, the Apache feather logo, Apache&nbsp;Isis, and the Apache&nbsp;Isis project logo are all trademarks of The&nbsp;Apache&nbsp;Software&nbsp;Foundation. </p> 
+    </footer> 
+   </div> 
+   <div id="doc-content-right" class="large-3 medium-3 xcolumns"> 
+    <div id="toc" class="toc2"> 
+     <div class="fallback-toc"> 
+      <ul class="sectlevel1"> 
+       <li><a href="#_powered-by_estatio">Estatio</a> 
+        <ul class="sectlevel2"> 
+         <li><a href="#_supporting_open_source">Supporting Open Source</a></li> 
+        </ul> </li> 
+       <li><a href="#_powered-by_gesconsultor-grc">GESCONSULTOR GRC</a> 
+        <ul class="sectlevel2"> 
+         <li><a href="#_key_features">Key features</a> 
+          <ul class="sectlevel3"> 
+           <li><a href="#_enterprise_architecture">Enterprise Architecture</a></li> 
+           <li><a href="#_risk_management">Risk Management</a></li> 
+           <li><a href="#_project_management">Project Management</a></li> 
+           <li><a href="#_dashboard_and_indicators">Dashboard and Indicators</a></li> 
+          </ul> </li> 
+         <li><a href="#_implementation_details">Implementation details</a></li> 
+         <li><a href="#_summing_up">Summing up</a></li> 
+        </ul> </li> 
+       <li><a href="#_powered-by_contactapp">Contact App</a> 
+        <ul class="sectlevel2"> 
+         <li><a href="#_apache_isis_with_ionic">Apache Isis with Ionic</a></li> 
+        </ul> </li> 
+       <li><a href="#_powered-by_cqnz">CQNZ (Sequence)</a> 
+        <ul class="sectlevel2"> 
+         <li><a href="#_underlying_technology">Underlying Technology</a></li> 
+         <li><a href="#_benefits">Benefits</a></li> 
+         <li><a href="#_support">Support</a></li> 
+         <li><a href="#_for_more_info">For more info</a></li> 
+        </ul> </li> 
+       <li><a href="#_powered-by_transport-planner">TransportPlanner</a></li> 
+      </ul> 
+     </div> 
+    </div> 
+   </div> 
+  </div> 
+  <script src="./js/foundation/5.5.1/vendor/jquery.js"></script> 
+  <script src="./js/foundation/5.5.1/foundation.min.js"></script> 
+  <link href="./css/jquery.tocify/1.9.0/jquery.tocify.css" rel="stylesheet"> 
+  <script src="./js/jqueryui/1.11.4/jquery-ui.min.js"></script> 
+  <script src="./js/jquery.tocify/1.9.0/jquery.tocify.js"></script> 
+  <script type="text/javascript">
     $(function () {
         $("#toc").tocify({
             scrollTo: 50,
@@ -1022,9 +891,8 @@ using Apache Isis.
         });
         $(".fallback-toc").hide();
     });
-</script>
-
-<script type="text/javascript">
+</script> 
+  <script type="text/javascript">
 
   /****
 
@@ -1134,9 +1002,8 @@ using Apache Isis.
 
     ***/
 
-</script>
-
-<script type="text/javascript">
+</script> 
+  <script type="text/javascript">
 
 $(document).ready(function(){
     if("Documentation" === "Powered By") {
@@ -1148,10 +1015,8 @@ $(document).ready(function(){
 
 });
 
-</script>
-
-
-<script>
+</script> 
+  <script>
 
 $( document ).ready(function() {
 
@@ -1242,7 +1107,6 @@ $( document ).ready(function() {
 
 
 });
-</script>
-
-</body>
+</script>  
+ </body>
 </html>


[11/44] isis-site git commit: ISIS-1594: provide an 'edit' button

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/guides/ugvw.html
----------------------------------------------------------------------
diff --git a/content/guides/ugvw.html b/content/guides/ugvw.html
index 5d9e5cd..743ff20 100644
--- a/content/guides/ugvw.html
+++ b/content/guides/ugvw.html
@@ -1,12 +1,10 @@
 <!doctype html>
 <html class="no-js" lang="en">
-<head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-
-    <title>Wicket Viewer</title>
-
-    <!--
+ <head> 
+  <meta charset="utf-8"> 
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"> 
+  <title>Wicket Viewer</title> 
+  <!--
         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
@@ -23,31 +21,21 @@
         KIND, either express or implied.  See the License for the
         specific language governing permissions and limitations
         under the License.
-    -->
-
-    <!-- No caching headers -->
-    <meta http-equiv="cache-control" content="no-cache" />
-    <meta http-equiv="pragma" content="no-cache" />
-    <meta http-equiv="expires" content="-1" />
-
-
-    <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
-    <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet" />
-    <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script>
-    <link href="../css/asciidoctor/colony.css" rel="stylesheet">
-    <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-
-
-
-    <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
-    <!--[if lt IE 9]>
+    --> 
+  <!-- No caching headers --> 
+  <meta http-equiv="cache-control" content="no-cache"> 
+  <meta http-equiv="pragma" content="no-cache"> 
+  <meta http-equiv="expires" content="-1"> 
+  <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line --> 
+  <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet"> 
+  <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script> 
+  <link href="../css/asciidoctor/colony.css" rel="stylesheet"> 
+  <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet"> 
+  <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet"> 
+  <!--[if lt IE 9]>
       <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
-    <![endif]-->
-
-
-
-    <style type="text/css">
+    <![endif]--> 
+  <style type="text/css">
         pre code {
             background-color: inherit;
             border-style: none;
@@ -192,9 +180,8 @@ table.CodeRay td.code>pre{padding:0}
         color:#fff;
         font-size: 1.1em;
     }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         @media only screen and (min-width: 40.063em) {
           .top-bar {
             .contain-to-grid .top-bar {
@@ -205,9 +192,8 @@ table.CodeRay td.code>pre{padding:0}
         .row {
             max-width: 80rem;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .extended-quote,
         .extended-quote-first {
             margin-left: 40px;
@@ -231,9 +217,8 @@ table.CodeRay td.code>pre{padding:0}
             text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
         }
         
-    </style>
-
-    <style>
+    </style> 
+  <style>
         body {
           position: relative;
         }
@@ -255,6 +240,7 @@ table.CodeRay td.code>pre{padding:0}
 
         div#doc-content {
             margin-top: 30px;
+            padding-top: 30px;
         }
 
         div.documentation-page table.frame-all {
@@ -286,9 +272,8 @@ table.CodeRay td.code>pre{padding:0}
             min-height: 2000px;
         }
 
-    </style>
-
-    <style>
+    </style> 
+  <style>
 
         @media only screen and (min-width: 768px) {
           #toc.toc2 ul ul { margin-left: -10px; }
@@ -316,15 +301,13 @@ table.CodeRay td.code>pre{padding:0}
         body div#toc2 li.tocify-item.active a {
             color: red;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         footer {
             margin-top: 1000px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* overriding colony.css stylesheet */
         .literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
            /*padding: 1.25em 1.5625em 1.125em 1.5625em;*/
@@ -372,9 +355,8 @@ table.CodeRay td.code>pre{padding:0}
         .imageblock img {
             margin-bottom: 10px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* from http://ben.balter.com/2014/03/13/pages-anchor-links/ */
         .header-link {
           position: absolute;
@@ -395,9 +377,8 @@ table.CodeRay td.code>pre{padding:0}
         h6:hover .header-link {
           opacity: 1;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .top-bar
         {
             -webkit-transition-duration: .5s;
@@ -425,312 +406,255 @@ table.CodeRay td.code>pre{padding:0}
             -webkit-transition-property: -webkit-transform;
             transition-property: transform;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         #doc-content a.guide {
             color: white;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
+        .tocify {
+            margin-top: 80px;
+        }
+    </style> 
+  <style>
         .tocify {
             margin-top: 80px;
         }
-    </style>
-
-
-</script>
-
-</head>
-<body>
-
-<<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
-    <div class="github-fork-ribbon">
-        <a href="https://github.com/apache/isis#fork-destination-box">Fork me on GitHub</a>
-    </div>
-</div>
-
-
-<div class="row">
-
-    <div class="fixed contain-to-grid header">
-        <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
-            <ul class="title-area">
-                <li class="name">
-                    <h1>
-                        <a href="/index.html">Apache Isis&trade;</a>
-                    </h1>
-                </li>
-                <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
-                <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
-            </ul>
-
-            <section class="top-bar-section">
-                <ul class="right">
-
-                    <li class="has-form">
-                       <FORM class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
-                        <div class="row collapse">
-                            <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
-                            <INPUT type="hidden" name="cof" value="FORID:0">
-                            <INPUT class="form-control" name="q" type="text" placeholder="Search">
-                        </div>
-                    </FORM>
-                     </li>
-
-                </ul>
-
-                <!-- Left Nav Section -->
-                <ul class="left">
-
-                    <li><a href="/documentation.html">Documentation</a></li>
-                    <li><a href="/downloads.html">Downloads</a></li>
-                    <li><a href="/help.html">Help</a></li>
-                    <li><a href="/asf.html">@ASF</a></li>
-
-                </ul>
-
-            </section>
-        </nav>
-    </div>
-</div>
-
-<div class="row">
-
-    <div id="doc-content-left" class="large-9 medium-9 columns">
-
-
-        <div id="doc-content">
-          <div class="sect1">
-<h2 id="_ugvw">1. Wicket Viewer</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>The Wicket Viewer automatically exposes an Apache Isis domain object model for use by end-users.  The viewer is
-implemented using <a href="http://wicket.apache.org">Apache Wicket</a>.</p>
-</div>
-<div class="paragraph">
-<p>This user guide discuss end-user features, configuration and customization of the Wicket viewer.</p>
-</div>
-<div class="paragraph">
-<p>It also discusses how to extend the viewer, and the (non-ASF) <a href="http://isisaddons.org">Isis Addons</a> wicket components.</p>
-</div>
-<div class="sect2">
-<h3 id="_other_guides">1.1. Other Guides</h3>
-<div class="paragraph">
-<p>Apache Isis documentation is broken out into a number of user and reference guides.</p>
-</div>
-<div class="paragraph">
-<p>The user guides available are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="ugfun.html">Fundamentals</a></p>
-</li>
-<li>
-<p><a href="#">Wicket viewer</a> (this guide)</p>
-</li>
-<li>
-<p><a href="ugvro.html">Restful Objects viewer</a></p>
-</li>
-<li>
-<p><a href="ugdno.html">DataNucleus object store</a></p>
-</li>
-<li>
-<p><a href="ugsec.html">Security</a></p>
-</li>
-<li>
-<p><a href="ugtst.html">Testing</a></p>
-</li>
-<li>
-<p><a href="ugbtb.html">Beyond the Basics</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The reference guides are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="rgant.html">Annotations</a></p>
-</li>
-<li>
-<p><a href="rgsvc.html">Domain Services</a></p>
-</li>
-<li>
-<p><a href="rgcfg.html">Configuration Properties</a></p>
-</li>
-<li>
-<p><a href="rgcms.html">Classes, Methods and Schema</a></p>
-</li>
-<li>
-<p><a href="rgmvn.html">Apache Isis Maven plugin</a></p>
-</li>
-<li>
-<p><a href="rgfis.html">Framework Internal Services</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The remaining guides are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="dg.html">Developers' Guide</a> (how to set up a development environment
-for Apache Isis and contribute back to the project)</p>
-</li>
-<li>
-<p><a href="cgcom.html">Committers' Guide</a> (release procedures and related practices)</p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_ugvw_features">2. Features/end-user usage</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>This section discusses features of the wicket viewer from the perspective of an end-user actually using your Isis application.</p>
-</div>
-<div class="sect2">
-<h3 id="_ugvw_features_recent-pages">2.1. Recent pages (drop down)</h3>
-<div class="paragraph">
-<p>The Wicket viewer provides a recent pages drop-down that acts as a breadcrumb trail. Using it, the user can quickly open a recently accessed domain object.</p>
-</div>
-<div class="sect3">
-<h4 id="_screenshots">2.1.1. Screenshots</h4>
-<div class="paragraph">
-<p>The following screenshot, taken from the <a href="https://github.com/estatio/estatio">Estatio</a> application, shows the recent pages drop-down after a number of pages have been accessed.</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/wicket-viewer/recent-pages/recent-pages.png"><img src="images/wicket-viewer/recent-pages/recent-pages.png" alt="recent pages" width="800px"></a>
-</div>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>Note that this screenshot show an earlier version of the <a href="#">Wicket viewer</a> UI (specifically, pre 1.8.0).</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_domain_code">2.1.2. Domain Code</h4>
-<div class="paragraph">
-<p>The recent pages drop-down is automatically populated; no changes need to be made to the domain classes.</p>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_user_experience">2.1.3. User Experience</h4>
-<div class="paragraph">
-<p>Selecting the domain object from the list causes the viewer to automatically navigate to the page for the selected object.</p>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_related_functionality">2.1.4. Related functionality</h4>
-<div class="paragraph">
-<p>The <a href="#_ugvw_features_bookmarked-pages">bookmarked pages</a> (sliding panel) also provides links to recently visited objects, but only those explicitly marked as <code>@DomainObject(bookmarking=&#8230;&#8203;)</code>.  The bookmarks panel also nests related objects together hierarchically (the recent pages drop-down does not).</p>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_configuration">2.1.5. Configuration</h4>
-<div class="paragraph">
-<p>The number of objects is hard-coded as 10; it cannot currently be configured.</p>
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_ugvw_features_bookmarked-pages">2.2. Bookmarked pages</h3>
-<div class="paragraph">
-<p>The Wicket viewer supports the bookmarking of both domain objects and query-only (<a href="rgant.html#_rgant-Action_semantics">@Action(semantics=&#8230;&#8203;)</a>) actions.</p>
-</div>
-<div class="paragraph">
-<p>Domain objects, if bookmarkable, can be nested.</p>
-</div>
-<div class="paragraph">
-<p>Bookmarking is automatic; whenever a bookmarkable object/action is visited, then a bookmark is created. To avoid the number of bookmarks from indefinitely growing, bookmarks that have not been followed after a whle are automatically removed (an MRU/LRU algorithm). The number of bookmarks to preserve can be configured.</p>
-</div>
-<div class="sect3">
-<h4 id="_screenshots_2">2.2.1. Screenshots</h4>
-<div class="paragraph">
-<p>The following screenshot, taken from <a href="https://github.com/isisaddons/isis-app-todoapp">Isisaddons example todoapp</a> (not ASF) shows how the bookmarks are listed in a sliding panel.</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/wicket-viewer/bookmarked-pages/panel.png"><img src="images/wicket-viewer/bookmarked-pages/panel.png" alt="panel" width="800px"></a>
-</div>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>Note that these screenshots show an earlier version of the <a href="#">Wicket viewer</a> UI (specifically, pre 1.8.0).</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>Note how the list contains both domain objects and an action ("not yet complete").</p>
-</div>
-<div class="paragraph">
-<p>Bookmarks can also form a hierarchy.  The following screenshot, also taken from the <a href="https://github.com/estatio/estatio">Estatio</a> application, shows a variety of different bookmarked objects with a nested structure:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/wicket-viewer/bookmarked-pages/panel-estatio.png"><img src="images/wicket-viewer/bookmarked-pages/panel-estatio.png" alt="panel estatio" width="800px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>Some - like <code>Property</code>, <code>Lease</code> and <code>Party</code> - are root nodes. However, <code>LeaseItem</code> is bookmarkable as a child of <code>Lease</code>, and <code>LeaseTerm</code> is bookmarkable only as a child of <code>LeaseItem</code>. This parent/child relationship is reflected in the layout.</p>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_domain_code_2">2.2.2. Domain Code</h4>
-<div class="paragraph">
-<p>To indicate a class is bookmarkable, use the <a href="rgant.html#_rgant-DomainObjectLayout">@DomainObjectLayout</a> annotation:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@DomainObjectLayout</span>(
+    </style>  
+ </head> 
+ <body> 
+  <div class="row"> 
+   <div class="fixed contain-to-grid header"> 
+    <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem"> 
+     <ul class="title-area"> 
+      <li class="name"> <h1> <a href="/index.html">Apache Isis\u2122</a> </h1> </li> 
+      <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone --> 
+      <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li> 
+     </ul> 
+     <section class="top-bar-section"> 
+      <ul class="right"> 
+       <li class="has-form"> 
+        <form class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse"> 
+         <div class="row collapse"> 
+          <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya"> 
+          <input type="hidden" name="cof" value="FORID:0"> 
+          <input class="form-control" name="q" type="text" placeholder="Search"> 
+         </div> 
+        </form> </li> 
+      </ul> 
+      <!-- Left Nav Section --> 
+      <ul class="left"> 
+       <li><a href="/documentation.html">Documentation</a></li> 
+       <li><a href="/downloads.html">Downloads</a></li> 
+       <li><a href="/help.html">Help</a></li> 
+       <li><a href="/asf.html">@ASF</a></li> 
+      </ul> 
+     </section> 
+    </nav> 
+   </div> 
+  </div> 
+  <div class="row"> 
+   <div id="doc-content-left" class="large-9 medium-9 columns"> 
+    <div id="doc-content">
+     <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/ugvw.adoc&quot;" style="float: right; font-size: small; padding: 6px;  "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+     <div class="sect1"> 
+      <h2 id="_ugvw">1. Wicket Viewer</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_ugvw.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>The Wicket Viewer automatically exposes an Apache Isis domain object model for use by end-users. The viewer is implemented using <a href="http://wicket.apache.org">Apache Wicket</a>.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>This user guide discuss end-user features, configuration and customization of the Wicket viewer.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>It also discusses how to extend the viewer, and the (non-ASF) <a href="http://isisaddons.org">Isis Addons</a> wicket components.</p> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_other_guides">1.1. Other Guides</h3> 
+        <div class="paragraph"> 
+         <p>Apache Isis documentation is broken out into a number of user and reference guides.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The user guides available are:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><a href="ugfun.html">Fundamentals</a></p> </li> 
+          <li> <p><a href="#">Wicket viewer</a> (this guide)</p> </li> 
+          <li> <p><a href="ugvro.html">Restful Objects viewer</a></p> </li> 
+          <li> <p><a href="ugdno.html">DataNucleus object store</a></p> </li> 
+          <li> <p><a href="ugsec.html">Security</a></p> </li> 
+          <li> <p><a href="ugtst.html">Testing</a></p> </li> 
+          <li> <p><a href="ugbtb.html">Beyond the Basics</a></p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The reference guides are:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><a href="rgant.html">Annotations</a></p> </li> 
+          <li> <p><a href="rgsvc.html">Domain Services</a></p> </li> 
+          <li> <p><a href="rgcfg.html">Configuration Properties</a></p> </li> 
+          <li> <p><a href="rgcms.html">Classes, Methods and Schema</a></p> </li> 
+          <li> <p><a href="rgmvn.html">Apache Isis Maven plugin</a></p> </li> 
+          <li> <p><a href="rgfis.html">Framework Internal Services</a></p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The remaining guides are:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><a href="dg.html">Developers' Guide</a> (how to set up a development environment for Apache Isis and contribute back to the project)</p> </li> 
+          <li> <p><a href="cgcom.html">Committers' Guide</a> (release procedures and related practices)</p> </li> 
+         </ul> 
+        </div> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_ugvw_features">2. Features/end-user usage</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_ugvw_features.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>This section discusses features of the wicket viewer from the perspective of an end-user actually using your Isis application.</p> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_ugvw_features_recent-pages">2.1. Recent pages (drop down)</h3> 
+        <div class="paragraph"> 
+         <p>The Wicket viewer provides a recent pages drop-down that acts as a breadcrumb trail. Using it, the user can quickly open a recently accessed domain object.</p> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_screenshots">2.1.1. Screenshots</h4> 
+         <div class="paragraph"> 
+          <p>The following screenshot, taken from the <a href="https://github.com/estatio/estatio">Estatio</a> application, shows the recent pages drop-down after a number of pages have been accessed.</p> 
+         </div> 
+         <div class="imageblock"> 
+          <div class="content"> 
+           <a class="image" href="images/wicket-viewer/recent-pages/recent-pages.png"><img src="images/wicket-viewer/recent-pages/recent-pages.png" alt="recent pages" width="800px"></a> 
+          </div> 
+         </div> 
+         <div class="admonitionblock note"> 
+          <table> 
+           <tbody>
+            <tr> 
+             <td class="icon"> <i class="fa icon-note" title="Note"></i> </td> 
+             <td class="content"> 
+              <div class="paragraph"> 
+               <p>Note that this screenshot show an earlier version of the <a href="#">Wicket viewer</a> UI (specifically, pre 1.8.0).</p> 
+              </div> </td> 
+            </tr> 
+           </tbody>
+          </table> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_domain_code">2.1.2. Domain Code</h4> 
+         <div class="paragraph"> 
+          <p>The recent pages drop-down is automatically populated; no changes need to be made to the domain classes.</p> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_user_experience">2.1.3. User Experience</h4> 
+         <div class="paragraph"> 
+          <p>Selecting the domain object from the list causes the viewer to automatically navigate to the page for the selected object.</p> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_related_functionality">2.1.4. Related functionality</h4> 
+         <div class="paragraph"> 
+          <p>The <a href="#_ugvw_features_bookmarked-pages">bookmarked pages</a> (sliding panel) also provides links to recently visited objects, but only those explicitly marked as <code>@DomainObject(bookmarking=\u2026\u200b)</code>. The bookmarks panel also nests related objects together hierarchically (the recent pages drop-down does not).</p> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_configuration">2.1.5. Configuration</h4> 
+         <div class="paragraph"> 
+          <p>The number of objects is hard-coded as 10; it cannot currently be configured.</p> 
+         </div> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_ugvw_features_bookmarked-pages">2.2. Bookmarked pages</h3> 
+        <div class="paragraph"> 
+         <p>The Wicket viewer supports the bookmarking of both domain objects and query-only (<a href="rgant.html#_rgant-Action_semantics">@Action(semantics=\u2026\u200b)</a>) actions.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Domain objects, if bookmarkable, can be nested.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Bookmarking is automatic; whenever a bookmarkable object/action is visited, then a bookmark is created. To avoid the number of bookmarks from indefinitely growing, bookmarks that have not been followed after a whle are automatically removed (an MRU/LRU algorithm). The number of bookmarks to preserve can be configured.</p> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_screenshots_2">2.2.1. Screenshots</h4> 
+         <div class="paragraph"> 
+          <p>The following screenshot, taken from <a href="https://github.com/isisaddons/isis-app-todoapp">Isisaddons example todoapp</a> (not ASF) shows how the bookmarks are listed in a sliding panel.</p> 
+         </div> 
+         <div class="imageblock"> 
+          <div class="content"> 
+           <a class="image" href="images/wicket-viewer/bookmarked-pages/panel.png"><img src="images/wicket-viewer/bookmarked-pages/panel.png" alt="panel" width="800px"></a> 
+          </div> 
+         </div> 
+         <div class="admonitionblock note"> 
+          <table> 
+           <tbody>
+            <tr> 
+             <td class="icon"> <i class="fa icon-note" title="Note"></i> </td> 
+             <td class="content"> 
+              <div class="paragraph"> 
+               <p>Note that these screenshots show an earlier version of the <a href="#">Wicket viewer</a> UI (specifically, pre 1.8.0).</p> 
+              </div> </td> 
+            </tr> 
+           </tbody>
+          </table> 
+         </div> 
+         <div class="paragraph"> 
+          <p>Note how the list contains both domain objects and an action ("not yet complete").</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>Bookmarks can also form a hierarchy. The following screenshot, also taken from the <a href="https://github.com/estatio/estatio">Estatio</a> application, shows a variety of different bookmarked objects with a nested structure:</p> 
+         </div> 
+         <div class="imageblock"> 
+          <div class="content"> 
+           <a class="image" href="images/wicket-viewer/bookmarked-pages/panel-estatio.png"><img src="images/wicket-viewer/bookmarked-pages/panel-estatio.png" alt="panel estatio" width="800px"></a> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>Some - like <code>Property</code>, <code>Lease</code> and <code>Party</code> - are root nodes. However, <code>LeaseItem</code> is bookmarkable as a child of <code>Lease</code>, and <code>LeaseTerm</code> is bookmarkable only as a child of <code>LeaseItem</code>. This parent/child relationship is reflected in the layout.</p> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_domain_code_2">2.2.2. Domain Code</h4> 
+         <div class="paragraph"> 
+          <p>To indicate a class is bookmarkable, use the <a href="rgant.html#_rgant-DomainObjectLayout">@DomainObjectLayout</a> annotation:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@DomainObjectLayout</span>(
     bookmarking=BookmarkPolicy.AS_ROOT
 )
-<span class="directive">public</span> <span class="type">class</span> <span class="class">Lease</span> { ... }</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>To indicate a class is bookmarkable but only as a child of some parent bookmark, specify the bookmark policy:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@DomainObjectLayout</span>(
+<span class="directive">public</span> <span class="type">class</span> <span class="class">Lease</span> { ... }</code></pre> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>To indicate a class is bookmarkable but only as a child of some parent bookmark, specify the bookmark policy:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@DomainObjectLayout</span>(
     bookmarking=BookmarkPolicy.AS_CHILD
 )
-<span class="directive">public</span> <span class="type">class</span> <span class="class">LeaseItem</span> { ... }</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>To indicate that a safe (query only) action is bookmarkable, use the <a href="rgant.html#_rgant-ActionLayout">@ActionLayout</a> annotation:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">ToDoItem</span> ... {
+<span class="directive">public</span> <span class="type">class</span> <span class="class">LeaseItem</span> { ... }</code></pre> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>To indicate that a safe (query only) action is bookmarkable, use the <a href="rgant.html#_rgant-ActionLayout">@ActionLayout</a> annotation:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">ToDoItem</span> ... {
     <span class="annotation">@Action</span>(
         semantics=SemanticsOf.SAFE
     )
@@ -739,1249 +663,1230 @@ for Apache Isis and contribute back to the project)</p>
      )
     <span class="directive">public</span> <span class="predefined-type">List</span>&lt;ToDoItem&gt; notYetComplete() { ... }
     ...
-}</code></pre>
-</div>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>The BookmarkPolicy.AS_CHILD does not have a meaning for actions; if the <code>bookmarking</code> attribute is set to any other value, it will be ignored.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_user_experience_2">2.2.3. User Experience</h4>
-<div class="paragraph">
-<p>The sliding panel appears whenever the mouse pointer hovers over the thin blue tab (to the left of the top header region).</p>
-</div>
-<div class="paragraph">
-<p>Alternatively, <code>alt+[</code> will toggle open/close the panel; it can also be closed using <code>Esc</code> key.</p>
-</div>
-<div class="sect4">
-<h5 id="_related_functionality_2">Related functionality</h5>
-<div class="paragraph">
-<p>The <a href="#_ugvw_features_recent-pages">Recent Pages</a> also lists recently visited pages, selected from a drop-down.</p>
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_configuration_2">2.2.4. Configuration</h4>
-<div class="paragraph">
-<p>By default, the bookmarked pages panel will show a maximum of 15 'root' pages. This can be overridden using a property (in <code>isis.properties</code>), for example:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="ini">isis.viewer.wicket.bookmarkedPages.maxSize=20</code></pre>
-</div>
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_ugvw_features_hints-and-copy-url">2.3. Hints and copy URL</h3>
-<div class="paragraph">
-<p>While the user can often copy the URL of a domain object directly from the browser&#8217;s address bar, the Wicket viewer also allows the URL of domain objects to be easily copied from a dialog.</p>
-</div>
-<div class="paragraph">
-<p>More interestingly, this URL can also contain hints capturing any sorting or page numbering, or hiding/viewing of collections.  End-users can therefore share these URLs as a form of deep linking into a particular view on a domain object.</p>
-</div>
-<div class="paragraph">
-<p>The copy URL and hinting is automatic.</p>
-</div>
-<div class="sect3">
-<h4 id="_screenshots_3">2.3.1. Screenshots</h4>
-<div class="paragraph">
-<p>The following screenshots are taken from the [Estatio](<a href="https://github.com/estatio/estatio" class="bare">https://github.com/estatio/estatio</a>) application.</p>
-</div>
-<div class="sect4">
-<h5 id="_copy_url">Copy URL</h5>
-<div class="paragraph">
-<p>This screenshot shows the copy URL button (top right):</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/wicket-viewer/copy-link/010-copy-link-button.png"><img src="images/wicket-viewer/copy-link/010-copy-link-button.png" alt="010 copy link button" width="800px"></a>
-</div>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>Note that these screenshots show an earlier version of the <a href="#">Wicket viewer</a> UI (specifically, pre 1.8.0).</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>Clicking on this button brings up a dialog with the URL preselected:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/wicket-viewer/copy-link/020-copy-link-dialog.png"><img src="images/wicket-viewer/copy-link/020-copy-link-dialog.png" alt="020 copy link dialog" width="800px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>The URL in this case is something like:</p>
-</div>
-<div class="literalblock">
-<div class="content">
-<pre>http://localhost:8080/wicket/entity/org.estatio.dom.lease.Lease:0</pre>
-</div>
-</div>
-<div class="paragraph">
-<p>The user can copy the link (eg <code>ctrl+C</code>) into the clipboard, then hit <code>OK</code> or <code>Esc</code> to dismiss the dialog.</p>
-</div>
-</div>
-<div class="sect4">
-<h5 id="_hints">Hints</h5>
-<div class="paragraph">
-<p>Using the viewer the user can hide/show collection tables, can sort the tables by header columns:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/wicket-viewer/copy-link/030-hints.png"><img src="images/wicket-viewer/copy-link/030-hints.png" alt="030 hints" width="800px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>Also, if the collection spans multiple pages, then the individual page can be selected.</p>
-</div>
-<div class="paragraph">
-<p>Once the view has been customised, the URL shown in the copy URL dialog is in an extended form:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/wicket-viewer/copy-link/040-copy-link-with-hints.png"><img src="images/wicket-viewer/copy-link/040-copy-link-with-hints.png" alt="040 copy link with hints" width="800px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>The URL in this case is something like:</p>
-</div>
-<div class="literalblock">
-<div class="content">
-<pre>http://localhost:8080/wicket/entity/org.estatio.dom.lease.Lease:0?hint-1:collectionContents-view=3&amp;hint-1:collectionContents:collectionContents-3:table-DESCENDING=value&amp;hint-1:collectionContents:collectionContents-3:table-pageNumber=0&amp;hint-2:collectionContents-view=0&amp;hint-2:collectionContents:collectionContents-2:table-pageNumber=0&amp;hint-3:collectionContents-view=2&amp;hint-3:collectionContents:collectionContents-2:table-pageNumber=0&amp;hint-4:collectionContents-view=3&amp;hint-4:collectionContents:collectionContents-3:table-ASCENDING=exerciseDate&amp;hint-4:collectionContents:collectionContents-3:table-pageNumber=0&amp;hint-5:collectionContents-view=0&amp;hint-5:collectionContents:collectionContents-3:table-pageNumber=0</pre>
-</div>
-</div>
-</div>
-<div class="sect4">
-<h5 id="_copy_url_from_title">Copy URL from title</h5>
-<div class="paragraph">
-<p>When the user invokes an action on the object, the URL (necessarily) changes to indicate that the action was invoked.  This URL is specific to the user&#8217;s session and cannot be shared with others.</p>
-</div>
-<div class="paragraph">
-<p>A quick way for the user to grab a shareable URL is simply by clicking on the object&#8217;s title:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/wicket-viewer/copy-link/050-title-url.png"><img src="images/wicket-viewer/copy-link/050-title-url.png" alt="050 title url" width="800px"></a>
-</div>
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_user_experience_3">2.3.2. User Experience</h4>
-<div class="paragraph">
-<p>The copy URL dialog is typically obtained by clicking on the icon.</p>
-</div>
-<div class="paragraph">
-<p>Alternatively, <code>alt+]</code> will also open the dialog.  It can be closed with either <code>OK</code> or the <code>Esc</code> key.</p>
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_ugvw_features_titles-in-tables">2.4. Titles in Tables</h3>
-<div class="paragraph">
-<p>Object titles can often be quite long if the intention is to uniquely identify the object.  While this is appropriate for the object view, it can be cumbersome within tables.</p>
-</div>
-<div class="paragraph">
-<p>If an object&#8217;s title is specified with from <code>@Title</code> annotation then the Wicket viewer will (for parented collections) automatically "contextualize" a title by excluding the part of the title corresponding to a reference to the owning (parent) object.</p>
-</div>
-<div class="paragraph">
-<p>In other words, suppose we have:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/how-tos/ui-hints/object-titles-and-icons/cust-order-product.png"><img src="images/how-tos/ui-hints/object-titles-and-icons/cust-order-product.png" alt="cust order product" width="579px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>so that <code>Customer</code> has a collection of `Order`s:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">Customer</span> {
+}</code></pre> 
+          </div> 
+         </div> 
+         <div class="admonitionblock note"> 
+          <table> 
+           <tbody>
+            <tr> 
+             <td class="icon"> <i class="fa icon-note" title="Note"></i> </td> 
+             <td class="content"> 
+              <div class="paragraph"> 
+               <p>The BookmarkPolicy.AS_CHILD does not have a meaning for actions; if the <code>bookmarking</code> attribute is set to any other value, it will be ignored.</p> 
+              </div> </td> 
+            </tr> 
+           </tbody>
+          </table> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_user_experience_2">2.2.3. User Experience</h4> 
+         <div class="paragraph"> 
+          <p>The sliding panel appears whenever the mouse pointer hovers over the thin blue tab (to the left of the top header region).</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>Alternatively, <code>alt+[</code> will toggle open/close the panel; it can also be closed using <code>Esc</code> key.</p> 
+         </div> 
+         <div class="sect4"> 
+          <h5 id="_related_functionality_2">Related functionality</h5> 
+          <div class="paragraph"> 
+           <p>The <a href="#_ugvw_features_recent-pages">Recent Pages</a> also lists recently visited pages, selected from a drop-down.</p> 
+          </div> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_configuration_2">2.2.4. Configuration</h4> 
+         <div class="paragraph"> 
+          <p>By default, the bookmarked pages panel will show a maximum of 15 'root' pages. This can be overridden using a property (in <code>isis.properties</code>), for example:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="ini">isis.viewer.wicket.bookmarkedPages.maxSize=20</code></pre> 
+          </div> 
+         </div> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_ugvw_features_hints-and-copy-url">2.3. Hints and copy URL</h3> 
+        <div class="paragraph"> 
+         <p>While the user can often copy the URL of a domain object directly from the browser\u2019s address bar, the Wicket viewer also allows the URL of domain objects to be easily copied from a dialog.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>More interestingly, this URL can also contain hints capturing any sorting or page numbering, or hiding/viewing of collections. End-users can therefore share these URLs as a form of deep linking into a particular view on a domain object.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The copy URL and hinting is automatic.</p> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_screenshots_3">2.3.1. Screenshots</h4> 
+         <div class="paragraph"> 
+          <p>The following screenshots are taken from the [Estatio](<a href="https://github.com/estatio/estatio" class="bare">https://github.com/estatio/estatio</a>) application.</p> 
+         </div> 
+         <div class="sect4"> 
+          <h5 id="_copy_url">Copy URL</h5> 
+          <div class="paragraph"> 
+           <p>This screenshot shows the copy URL button (top right):</p> 
+          </div> 
+          <div class="imageblock"> 
+           <div class="content"> 
+            <a class="image" href="images/wicket-viewer/copy-link/010-copy-link-button.png"><img src="images/wicket-viewer/copy-link/010-copy-link-button.png" alt="010 copy link button" width="800px"></a> 
+           </div> 
+          </div> 
+          <div class="admonitionblock note"> 
+           <table> 
+            <tbody>
+             <tr> 
+              <td class="icon"> <i class="fa icon-note" title="Note"></i> </td> 
+              <td class="content"> 
+               <div class="paragraph"> 
+                <p>Note that these screenshots show an earlier version of the <a href="#">Wicket viewer</a> UI (specifically, pre 1.8.0).</p> 
+               </div> </td> 
+             </tr> 
+            </tbody>
+           </table> 
+          </div> 
+          <div class="paragraph"> 
+           <p>Clicking on this button brings up a dialog with the URL preselected:</p> 
+          </div> 
+          <div class="imageblock"> 
+           <div class="content"> 
+            <a class="image" href="images/wicket-viewer/copy-link/020-copy-link-dialog.png"><img src="images/wicket-viewer/copy-link/020-copy-link-dialog.png" alt="020 copy link dialog" width="800px"></a> 
+           </div> 
+          </div> 
+          <div class="paragraph"> 
+           <p>The URL in this case is something like:</p> 
+          </div> 
+          <div class="literalblock"> 
+           <div class="content"> 
+            <pre>http://localhost:8080/wicket/entity/org.estatio.dom.lease.Lease:0</pre> 
+           </div> 
+          </div> 
+          <div class="paragraph"> 
+           <p>The user can copy the link (eg <code>ctrl+C</code>) into the clipboard, then hit <code>OK</code> or <code>Esc</code> to dismiss the dialog.</p> 
+          </div> 
+         </div> 
+         <div class="sect4"> 
+          <h5 id="_hints">Hints</h5> 
+          <div class="paragraph"> 
+           <p>Using the viewer the user can hide/show collection tables, can sort the tables by header columns:</p> 
+          </div> 
+          <div class="imageblock"> 
+           <div class="content"> 
+            <a class="image" href="images/wicket-viewer/copy-link/030-hints.png"><img src="images/wicket-viewer/copy-link/030-hints.png" alt="030 hints" width="800px"></a> 
+           </div> 
+          </div> 
+          <div class="paragraph"> 
+           <p>Also, if the collection spans multiple pages, then the individual page can be selected.</p> 
+          </div> 
+          <div class="paragraph"> 
+           <p>Once the view has been customised, the URL shown in the copy URL dialog is in an extended form:</p> 
+          </div> 
+          <div class="imageblock"> 
+           <div class="content"> 
+            <a class="image" href="images/wicket-viewer/copy-link/040-copy-link-with-hints.png"><img src="images/wicket-viewer/copy-link/040-copy-link-with-hints.png" alt="040 copy link with hints" width="800px"></a> 
+           </div> 
+          </div> 
+          <div class="paragraph"> 
+           <p>The URL in this case is something like:</p> 
+          </div> 
+          <div class="literalblock"> 
+           <div class="content"> 
+            <pre>http://localhost:8080/wicket/entity/org.estatio.dom.lease.Lease:0?hint-1:collectionContents-view=3&amp;hint-1:collectionContents:collectionContents-3:table-DESCENDING=value&amp;hint-1:collectionContents:collectionContents-3:table-pageNumber=0&amp;hint-2:collectionContents-view=0&amp;hint-2:collectionContents:collectionContents-2:table-pageNumber=0&amp;hint-3:collectionContents-view=2&amp;hint-3:collectionContents:collectionContents-2:table-pageNumber=0&amp;hint-4:collectionContents-view=3&amp;hint-4:collectionContents:collectionContents-3:table-ASCENDING=exerciseDate&amp;hint-4:collectionContents:collectionContents-3:table-pageNumber=0&amp;hint-5:collectionContents-view=0&amp;hint-5:collectionContents:collectionContents-3:table-pageNumber=0</pre> 
+           </div> 
+          </div> 
+         </div> 
+         <div class="sect4"> 
+          <h5 id="_copy_url_from_title">Copy URL from title</h5> 
+          <div class="paragraph"> 
+           <p>When the user invokes an action on the object, the URL (necessarily) changes to indicate that the action was invoked. This URL is specific to the user\u2019s session and cannot be shared with others.</p> 
+          </div> 
+          <div class="paragraph"> 
+           <p>A quick way for the user to grab a shareable URL is simply by clicking on the object\u2019s title:</p> 
+          </div> 
+          <div class="imageblock"> 
+           <div class="content"> 
+            <a class="image" href="images/wicket-viewer/copy-link/050-title-url.png"><img src="images/wicket-viewer/copy-link/050-title-url.png" alt="050 title url" width="800px"></a> 
+           </div> 
+          </div> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_user_experience_3">2.3.2. User Experience</h4> 
+         <div class="paragraph"> 
+          <p>The copy URL dialog is typically obtained by clicking on the icon.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>Alternatively, <code>alt+]</code> will also open the dialog. It can be closed with either <code>OK</code> or the <code>Esc</code> key.</p> 
+         </div> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_ugvw_features_titles-in-tables">2.4. Titles in Tables</h3> 
+        <div class="paragraph"> 
+         <p>Object titles can often be quite long if the intention is to uniquely identify the object. While this is appropriate for the object view, it can be cumbersome within tables.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>If an object\u2019s title is specified with from <code>@Title</code> annotation then the Wicket viewer will (for parented collections) automatically "contextualize" a title by excluding the part of the title corresponding to a reference to the owning (parent) object.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>In other words, suppose we have:</p> 
+        </div> 
+        <div class="imageblock"> 
+         <div class="content"> 
+          <a class="image" href="images/how-tos/ui-hints/object-titles-and-icons/cust-order-product.png"><img src="images/how-tos/ui-hints/object-titles-and-icons/cust-order-product.png" alt="cust order product" width="579px"></a> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>so that <code>Customer</code> has a collection of `Order`s:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">Customer</span> {
     <span class="directive">public</span> <span class="predefined-type">Set</span>&lt;Order&gt; getOrders() { ... }
     ...
-}</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>and <code>Product</code> also has a collection of `Order`s (please forgive the suspect domain modelling in this example (!)):</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">Product</span> {
+}</code></pre> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>and <code>Product</code> also has a collection of `Order`s (please forgive the suspect domain modelling in this example (!)):</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">Product</span> {
     <span class="directive">public</span> <span class="predefined-type">Set</span>&lt;Order&gt; getOrders() { ... }
     ...
-}</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>and where the <code>Order</code> class references both <code>Customer</code> and <code>Product</code>.</p>
-</div>
-<div class="paragraph">
-<p>The `Order&#8217;s might involve each of these:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">Order</span> {
-    <span class="annotation">@Title</span>(sequence=<span class="string"><span class="delimiter">&quot;</span><span class="content">1</span><span class="delimiter">&quot;</span></span>)
+}</code></pre> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>and where the <code>Order</code> class references both <code>Customer</code> and <code>Product</code>.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The `Order\u2019s might involve each of these:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">Order</span> {
+    <span class="annotation">@Title</span>(sequence=<span class="string"><span class="delimiter">"</span><span class="content">1</span><span class="delimiter">"</span></span>)
     <span class="directive">public</span> Customer getCustomer() { ... }
-    <span class="annotation">@Title</span>(sequence=<span class="string"><span class="delimiter">&quot;</span><span class="content">2</span><span class="delimiter">&quot;</span></span>)
+    <span class="annotation">@Title</span>(sequence=<span class="string"><span class="delimiter">"</span><span class="content">2</span><span class="delimiter">"</span></span>)
     <span class="directive">public</span> Product getProduct() { ... }
-    <span class="annotation">@Title</span>(sequence=<span class="string"><span class="delimiter">&quot;</span><span class="content">3</span><span class="delimiter">&quot;</span></span>)
+    <span class="annotation">@Title</span>(sequence=<span class="string"><span class="delimiter">"</span><span class="content">3</span><span class="delimiter">"</span></span>)
     <span class="directive">public</span> <span class="predefined-type">String</span> getOtherInfo() { ... }
     ...
-}</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>In this case, if we view a <code>Customer</code> with its collection of <code>Order`s, then in that parented collection&#8217;s table the customer&#8217;s property will be automatically excluded from the title of the `Order</code> (but it would show the product).  Conversely, if a <code>Product</code> is viewed then its collection of `Order`s would suppress product (but would show the customer).</p>
-</div>
-<div class="admonitionblock tip">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-tip" title="Tip"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>This feature is a close cousin of the <code>@PropertyLayout(hidden=Where.REFERENCES_PARENT)</code> annotation, which will cause the property itself to be hidden as a column in the table. An Isis idiom is therefore:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">Order</span> {
-    <span class="annotation">@Title</span>(sequence=<span class="string"><span class="delimiter">&quot;</span><span class="content">1</span><span class="delimiter">&quot;</span></span>)
+}</code></pre> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>In this case, if we view a <code>Customer</code> with its collection of <code>Order`s, then in that parented collection\u2019s table the customer\u2019s property will be automatically excluded from the title of the `Order</code> (but it would show the product). Conversely, if a <code>Product</code> is viewed then its collection of `Order`s would suppress product (but would show the customer).</p> 
+        </div> 
+        <div class="admonitionblock tip"> 
+         <table> 
+          <tbody>
+           <tr> 
+            <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td> 
+            <td class="content"> 
+             <div class="paragraph"> 
+              <p>This feature is a close cousin of the <code>@PropertyLayout(hidden=Where.REFERENCES_PARENT)</code> annotation, which will cause the property itself to be hidden as a column in the table. An Isis idiom is therefore:</p> 
+             </div> 
+             <div class="listingblock"> 
+              <div class="content"> 
+               <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">Order</span> {
+    <span class="annotation">@Title</span>(sequence=<span class="string"><span class="delimiter">"</span><span class="content">1</span><span class="delimiter">"</span></span>)
     <span class="annotation">@PropertyLayout</span>(hidden=Where.REFERENCES_PARENT)
     <span class="directive">public</span> Customer getCustomer() { ... }
     ...
-}</code></pre>
-</div>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>The above annotations mean that titles usually "just work", altering according to the context in which they are viewed.</p>
-</div>
-<div class="admonitionblock tip">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-tip" title="Tip"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>It is also possible to configure the Wicket viewer to <a href="#_ugvw_configuration-properties_abbreviating-titles">abbreviate titles or suppress them</a> completely.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_ugvw_features_blob-attachments">2.5. File upload/download</h3>
-<div class="paragraph">
-<p>The Isis application library provides the <a href="rgcms.html#_rgcms_classes_value-types_Blob">Blob</a> value type (binary large objects) and also the <a href="rgcms.html#_rgcms_classes_value-types_Clob">Clob</a>
-value type (character large object), each of which also includes metadata about the data (specifically the filename and mime type).</p>
-</div>
-<div class="paragraph">
-<p>A class can define a property using either of these types, for example:</p>
-</div>
-<div class="sect3">
-<h4 id="_screenshots_4">2.5.1. Screenshots</h4>
-<div class="paragraph">
-<p>The following screenshots are taken from the Isis addons example <a href="https://github.com/isisaddons/isis-app-todoapp">todoapp</a> (not ASF):</p>
-</div>
-<div class="sect4">
-<h5 id="_view_mode_empty">View mode, empty</h5>
-<div class="paragraph">
-<p><code>Blob</code> field rendered as attachment (with no data):</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/wicket-viewer/blob-attachments/010-attachment-field.png"><img src="images/wicket-viewer/blob-attachments/010-attachment-field-940.png" alt="010 attachment field 940" width="800px"></a>
-</div>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>Note that these screenshots show an earlier version of the <a href="#">Wicket viewer</a> UI (specifically, pre 1.8.0).</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-</div>
-<div class="sect4">
-<h5 id="_edit_mode">Edit mode</h5>
-<div class="paragraph">
-<p>Hit edit; 'choose file' button appears:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/wicket-viewer/blob-attachments/020-edit-choose-file.png"><img src="images/wicket-viewer/blob-attachments/020-edit-choose-file-940.png" alt="020 edit choose file 940" width="800px"></a>
-</div>
-</div>
-</div>
-<div class="sect4">
-<h5 id="_choose_file">Choose file</h5>
-<div class="paragraph">
-<p>Choose file using the regular browser window:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/wicket-viewer/blob-attachments/030-choose-file-using-browser.png"><img src="images/wicket-viewer/blob-attachments/030-choose-file-using-browser-520.png" alt="030 choose file using browser 520" width="520px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>Chosen file is indicated:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/wicket-viewer/blob-attachments/040-edit-chosen-file-indicated.png"><img src="images/wicket-viewer/blob-attachments/040-edit-chosen-file-indicated-940.png" alt="040 edit chosen file indicated 940" width="800px"></a>
-</div>
-</div>
-</div>
-<div class="sect4">
-<h5 id="_image_rendered">Image rendered</h5>
-<div class="paragraph">
-<p>Back in view mode (ie once hit OK) if the <code>Blob</code> is an image, then it is shown:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/wicket-viewer/blob-attachments/050-ok-if-image-then-rendered.png"><img src="images/wicket-viewer/blob-attachments/050-ok-if-image-then-rendered-940.png" alt="050 ok if image then rendered 940" width="800px"></a>
-</div>
-</div>
-</div>
-<div class="sect4">
-<h5 id="_download">Download</h5>
-<div class="paragraph">
-<p><code>Blob</code> can be downloaded:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/wicket-viewer/blob-attachments/060-download.png"><img src="images/wicket-viewer/blob-attachments/060-download-940.png" alt="060 download 940" width="800px"></a>
-</div>
-</div>
-</div>
-<div class="sect4">
-<h5 id="_clear">Clear</h5>
-<div class="paragraph">
-<p>Back in edit mode, can choose a different file or clear (assuming property is not mandatory):</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/wicket-viewer/blob-attachments/070-edit-clear.png"><img src="images/wicket-viewer/blob-attachments/070-edit-clear-940.png" alt="070 edit clear 940" width="800px"></a>
-</div>
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_domain_code_3">2.5.2. Domain Code</h4>
-<div class="paragraph">
-<p>To define a <code>Blob</code>, use:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">private</span> <span class="predefined-type">Blob</span> attachment;
-<span class="annotation">@javax</span>.jdo.annotations.Persistent(defaultFetchGroup=<span class="string"><span class="delimiter">&quot;</span><span class="content">false</span><span class="delimiter">&quot;</span></span>)
-    <span class="annotation">@javax</span>.jdo.annotations.Persistent(defaultFetchGroup=<span class="string"><span class="delimiter">&quot;</span><span class="content">false</span><span class="delimiter">&quot;</span></span>, columns = {
-            <span class="annotation">@javax</span>.jdo.annotations.Column(name = <span class="string"><span class="delimiter">&quot;</span><span class="content">attachment_name</span><span class="delimiter">&quot;</span></span>),
-            <span class="annotation">@javax</span>.jdo.annotations.Column(name = <span class="string"><span class="delimiter">&quot;</span><span class="content">attachment_mimetype</span><span class="delimiter">&quot;</span></span>),
-            <span class="annotation">@javax</span>.jdo.annotations.Column(name = <span class="string"><span class="delimiter">&quot;</span><span class="content">attachment_bytes</span><span class="delimiter">&quot;</span></span>, jdbcType = <span class="string"><span class="delimiter">&quot;</span><span class="content">BLOB</span><span class="delimiter">&quot;</span></span>, sqlType = <span class="string"><span class="delimiter">&quot;</span><span class="content">BLOB</span><span class="delimiter">&quot;</span></span>)
+}</code></pre> 
+              </div> 
+             </div> </td> 
+           </tr> 
+          </tbody>
+         </table> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The above annotations mean that titles usually "just work", altering according to the context in which they are viewed.</p> 
+        </div> 
+        <div class="admonitionblock tip"> 
+         <table> 
+          <tbody>
+           <tr> 
+            <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td> 
+            <td class="content"> 
+             <div class="paragraph"> 
+              <p>It is also possible to configure the Wicket viewer to <a href="#_ugvw_configuration-properties_abbreviating-titles">abbreviate titles or suppress them</a> completely.</p> 
+             </div> </td> 
+           </tr> 
+          </tbody>
+         </table> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_ugvw_features_blob-attachments">2.5. File upload/download</h3> 
+        <div class="paragraph"> 
+         <p>The Isis application library provides the <a href="rgcms.html#_rgcms_classes_value-types_Blob">Blob</a> value type (binary large objects) and also the <a href="rgcms.html#_rgcms_classes_value-types_Clob">Clob</a> value type (character large object), each of which also includes metadata about the data (specifically the filename and mime type).</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>A class can define a property using either of these types, for example:</p> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_screenshots_4">2.5.1. Screenshots</h4> 
+         <div class="paragraph"> 
+          <p>The following screenshots are taken from the Isis addons example <a href="https://github.com/isisaddons/isis-app-todoapp">todoapp</a> (not ASF):</p> 
+         </div> 
+         <div class="sect4"> 
+          <h5 id="_view_mode_empty">View mode, empty</h5> 
+          <div class="paragraph"> 
+           <p><code>Blob</code> field rendered as attachment (with no data):</p> 
+          </div> 
+          <div class="imageblock"> 
+           <div class="content"> 
+            <a class="image" href="images/wicket-viewer/blob-attachments/010-attachment-field.png"><img src="images/wicket-viewer/blob-attachments/010-attachment-field-940.png" alt="010 attachment field 940" width="800px"></a> 
+           </div> 
+          </div> 
+          <div class="admonitionblock note"> 
+           <table> 
+            <tbody>
+             <tr> 
+              <td class="icon"> <i class="fa icon-note" title="Note"></i> </td> 
+              <td class="content"> 
+               <div class="paragraph"> 
+                <p>Note that these screenshots show an earlier version of the <a href="#">Wicket viewer</a> UI (specifically, pre 1.8.0).</p> 
+               </div> </td> 
+             </tr> 
+            </tbody>
+           </table> 
+          </div> 
+         </div> 
+         <div class="sect4"> 
+          <h5 id="_edit_mode">Edit mode</h5> 
+          <div class="paragraph"> 
+           <p>Hit edit; 'choose file' button appears:</p> 
+          </div> 
+          <div class="imageblock"> 
+           <div class="content"> 
+            <a class="image" href="images/wicket-viewer/blob-attachments/020-edit-choose-file.png"><img src="images/wicket-viewer/blob-attachments/020-edit-choose-file-940.png" alt="020 edit choose file 940" width="800px"></a> 
+           </div> 
+          </div> 
+         </div> 
+         <div class="sect4"> 
+          <h5 id="_choose_file">Choose file</h5> 
+          <div class="paragraph"> 
+           <p>Choose file using the regular browser window:</p> 
+          </div> 
+          <div class="imageblock"> 
+           <div class="content"> 
+            <a class="image" href="images/wicket-viewer/blob-attachments/030-choose-file-using-browser.png"><img src="images/wicket-viewer/blob-attachments/030-choose-file-using-browser-520.png" alt="030 choose file using browser 520" width="520px"></a> 
+           </div> 
+          </div> 
+          <div class="paragraph"> 
+           <p>Chosen file is indicated:</p> 
+          </div> 
+          <div class="imageblock"> 
+           <div class="content"> 
+            <a class="image" href="images/wicket-viewer/blob-attachments/040-edit-chosen-file-indicated.png"><img src="images/wicket-viewer/blob-attachments/040-edit-chosen-file-indicated-940.png" alt="040 edit chosen file indicated 940" width="800px"></a> 
+           </div> 
+          </div> 
+         </div> 
+         <div class="sect4"> 
+          <h5 id="_image_rendered">Image rendered</h5> 
+          <div class="paragraph"> 
+           <p>Back in view mode (ie once hit OK) if the <code>Blob</code> is an image, then it is shown:</p> 
+          </div> 
+          <div class="imageblock"> 
+           <div class="content"> 
+            <a class="image" href="images/wicket-viewer/blob-attachments/050-ok-if-image-then-rendered.png"><img src="images/wicket-viewer/blob-attachments/050-ok-if-image-then-rendered-940.png" alt="050 ok if image then rendered 940" width="800px"></a> 
+           </div> 
+          </div> 
+         </div> 
+         <div class="sect4"> 
+          <h5 id="_download">Download</h5> 
+          <div class="paragraph"> 
+           <p><code>Blob</code> can be downloaded:</p> 
+          </div> 
+          <div class="imageblock"> 
+           <div class="content"> 
+            <a class="image" href="images/wicket-viewer/blob-attachments/060-download.png"><img src="images/wicket-viewer/blob-attachments/060-download-940.png" alt="060 download 940" width="800px"></a> 
+           </div> 
+          </div> 
+         </div> 
+         <div class="sect4"> 
+          <h5 id="_clear">Clear</h5> 
+          <div class="paragraph"> 
+           <p>Back in edit mode, can choose a different file or clear (assuming property is not mandatory):</p> 
+          </div> 
+          <div class="imageblock"> 
+           <div class="content"> 
+            <a class="image" href="images/wicket-viewer/blob-attachments/070-edit-clear.png"><img src="images/wicket-viewer/blob-attachments/070-edit-clear-940.png" alt="070 edit clear 940" width="800px"></a> 
+           </div> 
+          </div> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_domain_code_3">2.5.2. Domain Code</h4> 
+         <div class="paragraph"> 
+          <p>To define a <code>Blob</code>, use:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">private</span> <span class="predefined-type">Blob</span> attachment;
+<span class="annotation">@javax</span>.jdo.annotations.Persistent(defaultFetchGroup=<span class="string"><span class="delimiter">"</span><span class="content">false</span><span class="delimiter">"</span></span>)
+    <span class="annotation">@javax</span>.jdo.annotations.Persistent(defaultFetchGroup=<span class="string"><span class="delimiter">"</span><span class="content">false</span><span class="delimiter">"</span></span>, columns = {
+            <span class="annotation">@javax</span>.jdo.annotations.Column(name = <span class="string"><span class="delimiter">"</span><span class="content">attachment_name</span><span class="delimiter">"</span></span>),
+            <span class="annotation">@javax</span>.jdo.annotations.Column(name = <span class="string"><span class="delimiter">"</span><span class="content">attachment_mimetype</span><span class="delimiter">"</span></span>),
+            <span class="annotation">@javax</span>.jdo.annotations.Column(name = <span class="string"><span class="delimiter">"</span><span class="content">attachment_bytes</span><span class="delimiter">"</span></span>, jdbcType = <span class="string"><span class="delimiter">"</span><span class="content">BLOB</span><span class="delimiter">"</span></span>, sqlType = <span class="string"><span class="delimiter">"</span><span class="content">BLOB</span><span class="delimiter">"</span></span>)
     })
 <span class="annotation">@Property</span>(
         domainEvent = AttachmentDomainEvent.class,
         optionality = Optionality.OPTIONAL
 )
 <span class="directive">public</span> <span class="predefined-type">Blob</span> getAttachment() { <span class="keyword">return</span> attachment; }
-<span class="directive">public</span> <span class="type">void</span> setAttachment(<span class="directive">final</span> <span class="predefined-type">Blob</span> attachment) { <span class="local-variable">this</span>.attachment = attachment; }</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>To define a <code>Clob</code>, use:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">private</span> <span class="predefined-type">Clob</span> doc;
-<span class="annotation">@javax</span>.jdo.annotations.Persistent(defaultFetchGroup=<span class="string"><span class="delimiter">&quot;</span><span class="content">false</span><span class="delimiter">&quot;</span></span>, columns = {
-        <span class="annotation">@javax</span>.jdo.annotations.Column(name = <span class="string"><span class="delimiter">&quot;</span><span class="content">doc_name</span><span class="delimiter">&quot;</span></span>),
-        <span class="annotation">@javax</span>.jdo.annotations.Column(name = <span class="string"><span class="delimiter">&quot;</span><span class="content">doc_mimetype</span><span class="delimiter">&quot;</span></span>),
-        <span class="annotation">@javax</span>.jdo.annotations.Column(name = <span class="string"><span class="delimiter">&quot;</span><span class="content">doc_chars</span><span class="delimiter">&quot;</span></span>, jdbcType = <span class="string"><span class="delimiter">&quot;</span><span class="content">CLOB</span><span class="delimiter">&quot;</span></span>, sqlType = <span class="string"><span class="delimiter">&quot;</span><span class="content">CLOB</span><span class="delimiter">&quot;</span></span>)
+<span class="directive">public</span> <span class="type">void</span> setAttachment(<span class="directive">final</span> <span class="predefined-type">Blob</span> attachment) { <span class="local-variable">this</span>.attachment = attachment; }</code></pre> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>To define a <code>Clob</code>, use:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">private</span> <span class="predefined-type">Clob</span> doc;
+<span class="annotation">@javax</span>.jdo.annotations.Persistent(defaultFetchGroup=<span class="string"><span class="delimiter">"</span><span class="content">false</span><span class="delimiter">"</span></span>, columns = {
+        <span class="annotation">@javax</span>.jdo.annotations.Column(name = <span class="string"><span class="delimiter">"</span><span class="content">doc_name</span><span class="delimiter">"</span></span>),
+        <span class="annotation">@javax</span>.jdo.annotations.Column(name = <span class="string"><span class="delimiter">"</span><span class="content">doc_mimetype</span><span class="delimiter">"</span></span>),
+        <span class="annotation">@javax</span>.jdo.annotations.Column(name = <span class="string"><span class="delimiter">"</span><span class="content">doc_chars</span><span class="delimiter">"</span></span>, jdbcType = <span class="string"><span class="delimiter">"</span><span class="content">CLOB</span><span class="delimiter">"</span></span>, sqlType = <span class="string"><span class="delimiter">"</span><span class="content">CLOB</span><span class="delimiter">"</span></span>)
 })
 <span class="annotation">@Property</span>(
         optionality = Optionality.OPTIONAL
 )
 <span class="directive">public</span> <span class="predefined-type">Clob</span> getDoc() { <span class="keyword">return</span> doc; }
-<span class="directive">public</span> <span class="type">void</span> setDoc(<span class="directive">final</span> <span class="predefined-type">Clob</span> doc) { <span class="local-variable">this</span>.doc = doc; }</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>The <code>Blob</code> and <code>Clob</code> types can also be used as parameters to actions.</p>
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_ugvw_features_user-registration">2.6. User Registration</h3>
-<div class="paragraph">
-<p>The Wicket viewer provides the ability for users to sign-up by providing a valid email address:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>from the login page the user can instead follow a link to take them to a sign-up page, where they enter their email address.</p>
-</li>
-<li>
-<p>a verification email is sent using this service; the email includes a link back to the running application.</p>
-</li>
-<li>
-<p>the user then completes the registration process by choosing a user name and password.</p>
-</li>
-<li>
-<p>the Wicket viewer then creates an account for them and logs them in.</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>In a similar way, if the user has forgotten their password then they can request a reset link to be sent to their email, again by providing their email address.</p>
-</div>
-<div class="paragraph">
-<p>To support this the framework requires three services to be registered and configured:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>the <a href="rgsvc.html#_rgsvc_spi_UserRegistrationService">user registration service</a>, which provides an API to create the user account</p>
-</li>
-<li>
-<p>the <a href="rgsvc.html#_rgsvc_spi_EmailNotificationService">email notification service</a>, which provides an API for to send the verification emails</p>
-</li>
-<li>
-<p>the <a href="rgsvc.html#_rgsvc_api_EmailService">email service</a>, that is used by the email notification service to actually send the email.</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The Apache Isis core framework provides a default implementation of both the email notification service and the email service. If your application uses the <a href="https://github.com/isisaddons/isis-module-security">Isis addons security module</a> (not ASF) then an implementation is provided by that module; just add to the classpath. Otherwise you will need to provide your own implementation.</p>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>There is <em>no</em> default implementation of the user registration service in the core framework.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="sect3">
-<h4 id="_screenshots_5">2.6.1. Screenshots</h4>
-<div class="paragraph">
-<p>The user is presented with a login page:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/wicket-viewer/user-registration/login-page-default.png"><img src="images/wicket-viewer/user-registration/login-page-default.png" alt="login page default" width="300px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>Navigate to the sign up page. Complete the page, and verify:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/wicket-viewer/user-registration/sign-up-page.png"><img src="images/wicket-viewer/user-registration/sign-up-page.png" alt="sign up page" width="300px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>Back to the login page:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/wicket-viewer/user-registration/sign-up-login-page-after-sign-up.png"><img src="images/wicket-viewer/user-registration/sign-up-login-page-after-sign-up.png" alt="sign up login page after sign up" width="300px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>Email arrives, with link:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/wicket-viewer/user-registration/sign-up-email-with-verification-link.png"><img src="images/wicket-viewer/user-registration/sign-up-email-with-verification-link.png" alt="sign up email with verification link" width="500px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>Follow the link, complete the page:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/wicket-viewer/user-registration/sign-up-registration-page.png"><img src="images/wicket-viewer/user-registration/sign-up-registration-page.png" alt="sign up registration page" width="300px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>Automatically logged in:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/wicket-viewer/user-registration/sign-up-after-registration.png"><img src="images/wicket-viewer/user-registration/sign-up-after-registration.png" alt="sign up after registration" width="800px"></a>
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_configuration_3">2.6.2. Configuration</h4>
-<div class="paragraph">
-<p>There are two prerequisites:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>register an implementation of the <a href="rgsvc.html#_rgsvc_spi_UserRegistrationService">user registration service</a> (eg by using the <a href="https://github.com/isisaddons/isis-module-security">Isis addons security module</a>)</p>
-</li>
-<li>
-<p>configure the <a href="rgsvc.html#_rgsvc_api_EmailService">email service</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The latter is required if you are using the default email notification service and email service. If you are using your own alternative implementation of the email notification service then it may be omitted (and configure your own alternative implementation as required).</p>
-</div>
-<div class="paragraph">
-<p>It is also possible to configure the Wicket viewer to suppress <a href="#_ugvw_configuration-properties_suppressing-sign-up">the sign-up page link</a> and/or the <a href="#_ugvw_configuration-properties_suppressing-password-reset">password reset page</a>.</p>
-</div>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_ugvw_configuration-properties">3. Configuration Properties</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Wicket configuration properties alter the way in which Apache Isis' Wicket viewer renders domain objects.  They are typically stored in <code>WEB-INF/viewer_wicket.properties</code>.</p>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>To tell Apache Isis that the Wicket viewer is in use (and should therefore search for the <code>viewer_wicket.properties</code> file), add the following to <code>WEB-INF/web.xml</code>:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="xml"><span class="tag">&lt;context-param&gt;</span>
+<span class="directive">public</span> <span class="type">void</span> setDoc(<span class="directive">final</span> <span class="predefined-type">Clob</span> doc) { <span class="local-variable">this</span>.doc = doc; }</code></pre> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>The <code>Blob</code> and <code>Clob</code> types can also be used as parameters to actions.</p> 
+         </div> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_ugvw_features_user-registration">2.6. User Registration</h3> 
+        <div class="paragraph"> 
+         <p>The Wicket viewer provides the ability for users to sign-up by providing a valid email address:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p>from the login page the user can instead follow a link to take them to a sign-up page, where they enter their email address.</p> </li> 
+          <li> <p>a verification email is sent using this service; the email includes a link back to the running application.</p> </li> 
+          <li> <p>the user then completes the registration process by choosing a user name and password.</p> </li> 
+          <li> <p>the Wicket viewer then creates an account for them and logs them in.</p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>In a similar way, if the user has forgotten their password then they can request a reset link to be sent to their email, again by providing their email address.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>To support this the framework requires three services to be registered and configured:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p>the <a href="rgsvc.html#_rgsvc_spi_UserRegistrationService">user registration service</a>, which provides an API to create the user account</p> </li> 
+          <li> <p>the <a href="rgsvc.html#_rgsvc_spi_EmailNotificationService">email notification service</a>, which provides an API for to send the verification emails</p> </li> 
+          <li> <p>the <a href="rgsvc.html#_rgsvc_api_EmailService">email service</a>, that is used by the email notification service to actually send the email.</p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The Apache Isis core framework provides a default implementation of both the email notification service and the email service. If your application uses the <a href="https://github.com/isisaddons/isis-module-security">Isis addons security module</a> (not ASF) then an implementation is provided by that module; just add to the classpath. Otherwise you will need to provide your own implementation.</p> 
+        </div> 
+        <div class="admonitionblock note"> 
+         <table> 
+          <tbody>
+           <tr> 
+            <td class="icon"> <i class="fa icon-note" title="Note"></i> </td> 
+            <td class="content"> 
+             <div class="paragraph"> 
+              <p>There is <em>no</em> default implementation of the user registration service in the core framework.</p> 
+             </div> </td> 
+           </tr> 
+          </tbody>
+         </table> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_screenshots_5">2.6.1. Screenshots</h4> 
+         <div class="paragraph"> 
+          <p>The user is presented with a login page:</p> 
+         </div> 
+         <div class="imageblock"> 
+          <div class="content"> 
+           <a class="image" href="images/wicket-viewer/user-registration/login-page-default.png"><img src="images/wicket-viewer/user-registration/login-page-default.png" alt="login page default" width="300px"></a> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>Navigate to the sign up page. Complete the page, and verify:</p> 
+         </div> 
+         <div class="imageblock"> 
+          <div class="content"> 
+           <a class="image" href="images/wicket-viewer/user-registration/sign-up-page.png"><img src="images/wicket-viewer/user-registration/sign-up-page.png" alt="sign up page" width="300px"></a> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>Back to the login page:</p> 
+         </div> 
+         <div class="imageblock"> 
+          <div class="content"> 
+           <a class="image" href="images/wicket-viewer/user-registration/sign-up-login-page-after-sign-up.png"><img src="images/wicket-viewer/user-registration/sign-up-login-page-after-sign-up.png" alt="sign up login page after sign up" width="300px"></a> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>Email arrives, with link:</p> 
+         </div> 
+         <div class="imageblock"> 
+          <div class="content"> 
+           <a class="image" href="images/wicket-viewer/user-registration/sign-up-email-with-verification-link.png"><img src="images/wicket-viewer/user-registration/sign-up-email-with-verification-link.png" alt="sign up email with verification link" width="500px"></a> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>Follow the link, complete the page:</p> 
+         </div> 
+         <div class="imageblock"> 
+          <div class="content"> 
+           <a class="image" href="images/wicket-viewer/user-registration/sign-up-registration-page.png"><img src="images/wicket-viewer/user-registration/sign-up-registration-page.png" alt="sign up registration page" width="300px"></a> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>Automatically logged in:</p> 
+         </div> 
+         <div class="imageblock"> 
+          <div class="content"> 
+           <a class="image" href="images/wicket-viewer/user-registration/sign-up-after-registration.png"><img src="images/wicket-viewer/user-registration/sign-up-after-registration.png" alt="sign up after registration" width="800px"></a> 
+          </div> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_configuration_3">2.6.2. Configuration</h4> 
+         <div class="paragraph"> 
+          <p>There are two prerequisites:</p> 
+         </div> 
+         <div class="ulist"> 
+          <ul> 
+           <li> <p>register an implementation of the <a href="rgsvc.html#_rgsvc_spi_UserRegistrationService">user registration service</a> (eg by using the <a href="https://github.com/isisaddons/isis-module-security">Isis addons security module</a>)</p> </li> 
+           <li> <p>configure the <a href="rgsvc.html#_rgsvc_api_EmailService">email service</a></p> </li> 
+          </ul> 
+         </div> 
+         <div class="paragraph"> 
+          <p>The latter is required if you are using the default email notification service and email service. If you are using your own alternative implementation of the email notification service then it may be omitted (and configure your own alternative implementation as required).</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>It is also possible to configure the Wicket viewer to suppress <a href="#_ugvw_configuration-properties_suppressing-sign-up">the sign-up page link</a> and/or the <a href="#_ugvw_configuration-properties_suppressing-password-reset">password reset page</a>.</p> 
+         </div> 
+        </div> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_ugvw_configuration-properties">3. Configuration Properties</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_ugvw_configuration-properties.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>Wicket configuration properties alter the wa

<TRUNCATED>

[38/44] isis-site git commit: ISIS-1594: provide an 'edit' button

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/guides/dg.pdf
----------------------------------------------------------------------
diff --git a/content/guides/dg.pdf b/content/guides/dg.pdf
index 05d3bcc..d4ec77f 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:20161122115028+00'00')
-/ModDate (D:20161122115028+00'00')
+/CreationDate (D:20170307233816+00'00')
+/ModDate (D:20170307233816+00'00')
 >>
 endobj
 2 0 obj
 << /Type /Catalog
 /Pages 3 0 R
 /Names 16 0 R
-/Outlines 688 0 R
-/PageLabels 747 0 R
+/Outlines 687 0 R
+/PageLabels 746 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 92
-/Kids [7 0 R 10 0 R 12 0 R 14 0 R 36 0 R 46 0 R 51 0 R 56 0 R 61 0 R 65 0 R 69 0 R 75 0 R 79 0 R 88 0 R 93 0 R 96 0 R 100 0 R 104 0 R 107 0 R 111 0 R 115 0 R 120 0 R 123 0 R 128 0 R 132 0 R 136 0 R 146 0 R 151 0 R 158 0 R 163 0 R 167 0 R 171 0 R 176 0 R 183 0 R 188 0 R 196 0 R 200 0 R 204 0 R 210 0 R 217 0 R 224 0 R 240 0 R 245 0 R 252 0 R 259 0 R 266 0 R 271 0 R 281 0 R 295 0 R 300 0 R 313 0 R 319 0 R 329 0 R 331 0 R 343 0 R 355 0 R 360 0 R 375 0 R 385 0 R 398 0 R 406 0 R 413 0 R 422 0 R 424 0 R 433 0 R 443 0 R 451 0 R 456 0 R 459 0 R 470 0 R 474 0 R 476 0 R 484 0 R 487 0 R 490 0 R 493 0 R 496 0 R 500 0 R 503 0 R 506 0 R 509 0 R 512 0 R 515 0 R 518 0 R 521 0 R 524 0 R 527 0 R 535 0 R 543 0 R 549 0 R 552 0 R 567 0 R]
+/Kids [7 0 R 10 0 R 12 0 R 14 0 R 36 0 R 46 0 R 51 0 R 56 0 R 61 0 R 65 0 R 69 0 R 75 0 R 79 0 R 88 0 R 93 0 R 96 0 R 100 0 R 104 0 R 107 0 R 111 0 R 115 0 R 120 0 R 123 0 R 128 0 R 132 0 R 136 0 R 146 0 R 151 0 R 158 0 R 163 0 R 167 0 R 171 0 R 176 0 R 183 0 R 187 0 R 195 0 R 199 0 R 203 0 R 209 0 R 216 0 R 223 0 R 239 0 R 244 0 R 251 0 R 258 0 R 265 0 R 270 0 R 280 0 R 294 0 R 299 0 R 312 0 R 318 0 R 328 0 R 330 0 R 342 0 R 354 0 R 359 0 R 374 0 R 384 0 R 397 0 R 405 0 R 412 0 R 421 0 R 423 0 R 432 0 R 442 0 R 450 0 R 455 0 R 458 0 R 469 0 R 473 0 R 475 0 R 483 0 R 486 0 R 489 0 R 492 0 R 495 0 R 499 0 R 502 0 R 505 0 R 508 0 R 511 0 R 514 0 R 517 0 R 520 0 R 523 0 R 526 0 R 534 0 R 542 0 R 548 0 R 551 0 R 566 0 R]
 >>
 endobj
 4 0 obj
@@ -78,13 +78,13 @@ endobj
 endobj
 8 0 obj
 << /Type /Font
-/BaseFont /AAAAAI+NotoSerif
+/BaseFont /AAAAAH+NotoSerif
 /Subtype /TrueType
-/FontDescriptor 749 0 R
+/FontDescriptor 748 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 751 0 R
-/ToUnicode 750 0 R
+/Widths 750 0 R
+/ToUnicode 749 0 R
 >>
 endobj
 9 0 obj
@@ -1662,7 +1662,7 @@ endobj
 /F5.0 53 0 R
 >>
 >>
-/Annots [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 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]
+/Annots [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 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]
 >>
 endobj
 11 0 obj
@@ -2417,7 +2417,7 @@ endobj
 /F5.0 53 0 R
 >>
 >>
-/Annots [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 659 0 R 660 0 R 661 0 R 662 0 R 663 0 R 664 0 R 665 0 R 666 0 R 667 0 R 668 0 R 669 0 R 670 0 R 671 0 R 672 0 R 673 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 684 0 R 685 0 R 686 0 R]
+/Annots [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 659 0 R 660 0 R 661 0 R 662 0 R 663 0 R 664 0 R 665 0 R 666 0 R 667 0 R 668 0 R 669 0 R 670 0 R 671 0 R 672 0 R 673 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 684 0 R 685 0 R]
 >>
 endobj
 13 0 obj
@@ -3102,7 +3102,7 @@ endobj
 /Font << /F2.0 18 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 687 0 R
+/XObject << /Stamp1 686 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 33 0 R 34 0 R]
@@ -3117,18 +3117,18 @@ endobj
 >>
 endobj
 17 0 obj
-<< /Kids [142 0 R 569 0 R 316 0 R 230 0 R 143 0 R 276 0 R 448 0 R 403 0 R 545 0 R]
+<< /Kids [142 0 R 568 0 R 315 0 R 229 0 R 143 0 R 275 0 R 447 0 R 402 0 R 544 0 R]
 >>
 endobj
 18 0 obj
 << /Type /Font
-/BaseFont /AAAAAJ+NotoSerif-Bold
+/BaseFont /AAAAAI+NotoSerif-Bold
 /Subtype /TrueType
-/FontDescriptor 753 0 R
+/FontDescriptor 752 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 755 0 R
-/ToUnicode 754 0 R
+/Widths 754 0 R
+/ToUnicode 753 0 R
 >>
 endobj
 19 0 obj
@@ -3625,7 +3625,7 @@ endobj
 /F4.0 44 0 R
 >>
 /XObject << /I1 43 0 R
-/Stamp1 687 0 R
+/Stamp1 686 0 R
 >>
 >>
 /Annots [42 0 R]
@@ -3639,13 +3639,13 @@ endobj
 endobj
 39 0 obj
 << /Type /Font
-/BaseFont /AAAAAK+FontAwesome
+/BaseFont /AAAAAJ+FontAwesome
 /Subtype /TrueType
-/FontDescriptor 757 0 R
+/FontDescriptor 756 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 759 0 R
-/ToUnicode 758 0 R
+/Widths 758 0 R
+/ToUnicode 757 0 R
 >>
 endobj
 40 0 obj
@@ -3741,13 +3741,13 @@ endstream
 endobj
 44 0 obj
 << /Type /Font
-/BaseFont /AAAAAL+NotoSerif-Italic
+/BaseFont /AAAAAK+NotoSerif-Italic
 /Subtype /TrueType
-/FontDescriptor 761 0 R
+/FontDescriptor 760 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 763 0 R
-/ToUnicode 762 0 R
+/Widths 762 0 R
+/ToUnicode 761 0 R
 >>
 endobj
 45 0 obj
@@ -3843,7 +3843,7 @@ endobj
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /XObject << /I2 47 0 R
 /I3 48 0 R
-/Stamp1 687 0 R
+/Stamp1 686 0 R
 >>
 /Font << /F4.0 44 0 R
 /F1.0 8 0 R
@@ -4181,7 +4181,7 @@ endobj
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /XObject << /I4 49 0 R
 /I5 52 0 R
-/Stamp1 687 0 R
+/Stamp1 686 0 R
 >>
 /Font << /F4.0 44 0 R
 /F1.0 8 0 R
@@ -4271,13 +4271,13 @@ endstream
 endobj
 53 0 obj
 << /Type /Font
-/BaseFont /AAAAAM+mplus1mn-regular
+/BaseFont /AAAAAL+mplus1mn-regular
 /Subtype /TrueType
-/FontDescriptor 765 0 R
+/FontDescriptor 764 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 767 0 R
-/ToUnicode 766 0 R
+/Widths 766 0 R
+/ToUnicode 765 0 R
 >>
 endobj
 54 0 obj
@@ -4453,7 +4453,7 @@ endobj
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /XObject << /I6 54 0 R
 /I7 57 0 R
-/Stamp1 687 0 R
+/Stamp1 686 0 R
 >>
 /Font << /F4.0 44 0 R
 /F1.0 8 0 R
@@ -4920,7 +4920,7 @@ endobj
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /XObject << /I8 59 0 R
 /I9 62 0 R
-/Stamp1 687 0 R
+/Stamp1 686 0 R
 >>
 /Font << /F4.0 44 0 R
 /F1.0 8 0 R
@@ -5166,7 +5166,7 @@ endobj
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /XObject << /I10 63 0 R
 /I11 66 0 R
-/Stamp1 687 0 R
+/Stamp1 686 0 R
 >>
 /Font << /F4.0 44 0 R
 /F1.0 8 0 R
@@ -5471,7 +5471,7 @@ endobj
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /XObject << /I12 67 0 R
 /I13 71 0 R
-/Stamp1 687 0 R
+/Stamp1 686 0 R
 >>
 /Font << /F4.0 44 0 R
 /F2.0 18 0 R
@@ -6003,7 +6003,7 @@ endobj
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /XObject << /I14 73 0 R
 /I15 77 0 R
-/Stamp1 687 0 R
+/Stamp1 686 0 R
 >>
 /Font << /F4.0 44 0 R
 /F1.0 8 0 R
@@ -6795,7 +6795,7 @@ endobj
 /F4.0 44 0 R
 >>
 /XObject << /I16 85 0 R
-/Stamp1 687 0 R
+/Stamp1 686 0 R
 >>
 >>
 /Annots [80 0 R 81 0 R 83 0 R]
@@ -7482,7 +7482,7 @@ endobj
 /Contents 87 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /XObject << /I17 86 0 R
-/Stamp1 687 0 R
+/Stamp1 686 0 R
 >>
 /Font << /F4.0 44 0 R
 /F1.0 8 0 R
@@ -7690,7 +7690,7 @@ endobj
 /Contents 92 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /XObject << /I18 91 0 R
-/Stamp1 687 0 R
+/Stamp1 686 0 R
 >>
 /Font << /F4.0 44 0 R
 /F1.0 8 0 R
@@ -7986,7 +7986,7 @@ endobj
 /Contents 95 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /XObject << /I19 94 0 R
-/Stamp1 687 0 R
+/Stamp1 686 0 R
 >>
 /Font << /F4.0 44 0 R
 /F2.0 18 0 R
@@ -8312,7 +8312,7 @@ endobj
 /Contents 99 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /XObject << /I20 98 0 R
-/Stamp1 687 0 R
+/Stamp1 686 0 R
 >>
 /Font << /F4.0 44 0 R
 /F2.0 18 0 R
@@ -8738,7 +8738,7 @@ endobj
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /XObject << /I21 102 0 R
 /I22 105 0 R
-/Stamp1 687 0 R
+/Stamp1 686 0 R
 >>
 /Font << /F4.0 44 0 R
 /F1.0 8 0 R
@@ -9199,7 +9199,7 @@ endobj
 /F5.0 53 0 R
 >>
 /XObject << /I23 108 0 R
-/Stamp1 687 0 R
+/Stamp1 686 0 R
 >>
 >>
 >>
@@ -9930,7 +9930,7 @@ endobj
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /XObject << /I24 109 0 R
 /I25 112 0 R
-/Stamp1 687 0 R
+/Stamp1 686 0 R
 >>
 /Font << /F4.0 44 0 R
 /F1.0 8 0 R
@@ -10459,7 +10459,7 @@ endobj
 /Contents 114 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /XObject << /I26 113 0 R
-/Stamp1 687 0 R
+/Stamp1 686 0 R
 >>
 /Font << /F4.0 44 0 R
 /F2.0 18 0 R
@@ -11039,7 +11039,7 @@ endobj
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /XObject << /I27 118 0 R
 /I28 121 0 R
-/Stamp1 687 0 R
+/Stamp1 686 0 R
 >>
 /Font << /F4.0 44 0 R
 /F1.0 8 0 R
@@ -11273,7 +11273,7 @@ endobj
 /F4.0 44 0 R
 >>
 /XObject << /I29 125 0 R
-/Stamp1 687 0 R
+/Stamp1 686 0 R
 >>
 >>
 >>
@@ -11695,7 +11695,7 @@ endobj
 /Contents 127 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /XObject << /I30 126 0 R
-/Stamp1 687 0 R
+/Stamp1 686 0 R
 >>
 /Font << /F4.0 44 0 R
 /F1.0 8 0 R
@@ -12002,7 +12002,7 @@ endobj
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /XObject << /I31 130 0 R
 /I32 133 0 R
-/Stamp1 687 0 R
+/Stamp1 686 0 R
 >>
 /Font << /F4.0 44 0 R
 /F1.0 8 0 R
@@ -13531,7 +13531,7 @@ endobj
 /F2.0 18 0 R
 /F4.0 44 0 R
 >>
-/XObject << /Stamp1 687 0 R
+/XObject << /Stamp1 686 0 R
 >>
 >>
 /Annots [139 0 R 140 0 R]
@@ -13570,12 +13570,12 @@ endobj
 endobj
 142 0 obj
 << /Limits [(_dg) (_dg_building-isis)]
-/Names [(_dg) 15 0 R (_dg_agilej) 568 0 R (_dg_asciidoc) 332 0 R (_dg_asciidoc-templates) 477 0 R (_dg_asciidoc_build-and-review) 347 0 R (_dg_asciidoc_instant-rebuild) 348 0 R (_dg_asciidoc_naming-conventions) 341 0 R (_dg_asciidoc_publish-procedure) 356 0 R (_dg_asciidoc_writing-the-docs) 344 0 R (_dg_building-isis) 282 0 R]
+/Names [(_dg) 15 0 R (_dg_agilej) 567 0 R (_dg_asciidoc) 331 0 R (_dg_asciidoc-templates) 476 0 R (_dg_asciidoc_build-and-review) 346 0 R (_dg_asciidoc_instant-rebuild) 347 0 R (_dg_asciidoc_naming-conventions) 340 0 R (_dg_asciidoc_publish-procedure) 355 0 R (_dg_asciidoc_writing-the-docs) 343 0 R (_dg_building-isis) 281 0 R]
 >>
 endobj
 143 0 obj
 << /Limits [(_dg_ide_intellij_installing_new-project) (add-datanucleus-support)]
-/Names [(_dg_ide_intellij_installing_new-project) 58 0 R (_dg_ide_intellij_live-templates) 76 0 R (_dg_ide_intellij_other-settings-compiler) 84 0 R (_dg_ide_intellij_other-settings-maven) 90 0 R (_dg_ide_intellij_running) 116 0 R (_dg_ide_intellij_running_integ-tests) 129 0 R (_dg_ide_intellij_running_the-app) 117 0 R (_dg_ide_intellij_running_unit-tests) 124 0 R (_dg_ide_intellij_troubleshooting) 173 0 R (_dg_project-lombok) 553 0 R (_dg_working-with-many-repos) 460 0 R (add-datanucleus-support) 238 0 R]
+/Names [(_dg_ide_intellij_installing_new-project) 58 0 R (_dg_ide_intellij_live-templates) 76 0 R (_dg_ide_intellij_other-settings-compiler) 84 0 R (_dg_ide_intellij_other-settings-maven) 90 0 R (_dg_ide_intellij_running) 116 0 R (_dg_ide_intellij_running_integ-tests) 129 0 R (_dg_ide_intellij_running_the-app) 117 0 R (_dg_ide_intellij_running_unit-tests) 124 0 R (_dg_ide_intellij_troubleshooting) 173 0 R (_dg_project-lombok) 552 0 R (_dg_working-with-many-repos) 459 0 R (add-datanucleus-support) 237 0 R]
 >>
 endobj
 144 0 obj
@@ -14560,7 +14560,7 @@ endobj
 /F5.0 53 0 R
 /F2.0 18 0 R
 >>
-/XObject << /Stamp1 687 0 R
+/XObject << /Stamp1 686 0 R
 >>
 >>
 >>
@@ -14875,7 +14875,7 @@ endobj
 /F4.0 44 0 R
 >>
 /XObject << /I33 155 0 R
-/Stamp1 687 0 R
+/Stamp1 686 0 R
 >>
 >>
 /Annots [153 0 R 154 0 R]
@@ -15156,7 +15156,7 @@ endobj
 /F5.0 53 0 R
 >>
 /XObject << /I34 159 0 R
-/Stamp1 687 0 R
+/Stamp1 686 0 R
 >>
 >>
 /Annots [160 0 R]
@@ -15397,7 +15397,7 @@ endobj
 /Contents 162 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /XObject << /I35 161 0 R
-/Stamp1 687 0 R
+/Stamp1 686 0 R
 >>
 /Font << /F1.0 8 0 R
 >>
@@ -15701,7 +15701,7 @@ endobj
 /Contents 166 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /XObject << /I36 165 0 R
-/Stamp1 687 0 R
+/Stamp1 686 0 R
 >>
 /Font << /F1.0 8 0 R
 >>
@@ -16224,7 +16224,7 @@ endobj
 /Contents 170 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /XObject << /I37 169 0 R
-/Stamp1 687 0 R
+/Stamp1 686 0 R
 >>
 /Font << /F2.0 18 0 R
 /F1.0 8 0 R
@@ -16920,7 +16920,7 @@ endobj
 /Contents 175 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /XObject << /I38 174 0 R
-/Stamp1 687 0 R
+/Stamp1 686 0 R
 >>
 /Font << /F1.0 8 0 R
 /F2.0 18 0 R
@@ -16964,7 +16964,7 @@ endobj
 >>
 endobj
 182 0 obj
-<< /Length 24118
+<< /Length 28881
 >>
 stream
 q
@@ -17030,13 +17030,24 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 92.24000000000001 767.0649999999999 Td
 /F5.0 11 Tf
-<706c7567696e3a> Tj
+<706c7567696e> 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
+125.24000000000001 767.0649999999999 Td
+/F5.0 11 Tf
+<3a> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17052,13 +17063,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 136.24 767.0649999999999 Td
 /F5.0 11 Tf
-<276a61766127> Tj
+<27> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+141.74 767.0649999999999 Td
+/F5.0 11 Tf
+<6a617661> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+163.74 767.0649999999999 Td
+/F5.0 11 Tf
+<27> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17085,13 +17118,24 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 92.24000000000001 752.3249999999999 Td
 /F5.0 11 Tf
-<706c7567696e3a> Tj
+<706c7567696e> 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
+125.24000000000001 752.3249999999999 Td
+/F5.0 11 Tf
+<3a> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17107,13 +17151,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 136.24 752.3249999999999 Td
 /F5.0 11 Tf
-<2774616e6772616d2e746f6f6c7327> Tj
+<27> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+141.74 752.3249999999999 Td
+/F5.0 11 Tf
+<74616e6772616d2e746f6f6c73> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+213.24 752.3249999999999 Td
+/F5.0 11 Tf
+<27> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17162,12 +17228,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.000 0.867 scn
-0.000 0.000 0.867 SCN
+1.000 0.400 0.000 scn
+1.000 0.400 0.000 SCN
 
 BT
 180.24 737.585 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <312e38> Tj
 ET
 
@@ -17217,12 +17283,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.000 0.867 scn
-0.000 0.000 0.867 SCN
+1.000 0.400 0.000 scn
+1.000 0.400 0.000 SCN
 
 BT
 180.24 722.845 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <312e38> Tj
 ET
 
@@ -17283,12 +17349,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 119.74000000000001 708.105 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <6e6577> Tj
 ET
 
@@ -17322,13 +17388,46 @@ ET
 BT
 191.24 708.105 Td
 /F5.0 11 Tf
-<2829292e> Tj
+<28> 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
+196.74 708.105 Td
+/F5.0 11 Tf
+<29> 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
+202.24 708.105 Td
+/F5.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+207.74 708.105 Td
+/F5.0 11 Tf
+<2e> 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.24 708.105 Td
@@ -17349,13 +17448,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 246.24 708.105 Td
 /F5.0 11 Tf
-<27706f6d2e786d6c27> Tj
+<27> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+251.74 708.105 Td
+/F5.0 11 Tf
+<706f6d2e786d6c> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+290.24 708.105 Td
+/F5.0 11 Tf
+<27> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17366,13 +17487,24 @@ ET
 BT
 295.74 708.105 Td
 /F5.0 11 Tf
-<292e> Tj
+<29> 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
+301.24 708.105 Td
+/F5.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 306.74 708.105 Td
@@ -17393,8 +17525,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 345.24 708.105 Td
@@ -17415,8 +17547,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 389.24 708.105 Td
@@ -17432,7 +17564,18 @@ ET
 BT
 411.24 708.105 Td
 /F5.0 11 Tf
-<2829> Tj
+<28> 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
+416.74 708.105 Td
+/F5.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17591,13 +17734,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 147.24 663.885 Td
 /F5.0 11 Tf
-<22687474703a2f2f6f73732e6a66726f672e6f72672f61727469666163746f72792f6f73732d736e617073686f742d6c6f63616c22> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+152.74 663.885 Td
+/F5.0 11 Tf
+<687474703a2f2f6f73732e6a66726f672e6f72672f61727469666163746f72792f6f73732d736e617073686f742d6c6f63616c> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+433.24 663.885 Td
+/F5.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17652,7 +17817,18 @@ ET
 BT
 119.74000000000001 649.145 Td
 /F5.0 11 Tf
-<2829> Tj
+<28> 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
+125.24000000000001 649.145 Td
+/F5.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17756,13 +17932,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 136.24 604.925 Td
 /F5.0 11 Tf
-<2774616e6772616d3a677261646c652d706c7567696e3a312e312e3227> Tj
+<27> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+141.74 604.925 Td
+/F5.0 11 Tf
+<74616e6772616d3a677261646c652d706c7567696e3a312e312e32> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+290.24 604.925 Td
+/F5.0 11 Tf
+<27> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17861,7 +18059,18 @@ ET
 BT
 136.24 545.9649999999999 Td
 /F5.0 11 Tf
-<2829> Tj
+<28> 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
+141.74 545.9649999999999 Td
+/F5.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17943,13 +18152,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 147.24 531.2249999999999 Td
 /F5.0 11 Tf
-<22687474703a2f2f6f73732e6a66726f672e6f72672f61727469666163746f72792f6f73732d736e617073686f742d6c6f63616c22> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+152.74 531.2249999999999 Td
+/F5.0 11 Tf
+<687474703a2f2f6f73732e6a66726f672e6f72672f61727469666163746f72792f6f73732d736e617073686f742d6c6f63616c> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+433.24 531.2249999999999 Td
+/F5.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -18004,7 +18235,18 @@ ET
 BT
 119.74000000000001 516.4849999999999 Td
 /F5.0 11 Tf
-<2829> Tj
+<28> 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
+125.24000000000001 516.4849999999999 Td
+/F5.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -18086,13 +18328,24 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 125.24000000000001 472.26499999999993 Td
 /F5.0 11 Tf
-<67726f75703a> Tj
+<67726f7570> 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
+152.74 472.26499999999993 Td
+/F5.0 11 Tf
+<3a> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -18108,13 +18361,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 163.74 472.26499999999993 Td
 /F5.0 11 Tf
-<276f72672e6170616368652e697369732e636f726527> Tj
+<27> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+169.24 472.26499999999993 Td
+/F5.0 11 Tf
+<6f72672e6170616368652e697369732e636f7265> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+279.24 472.26499999999993 Td
+/F5.0 11 Tf
+<27> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -18141,13 +18416,24 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 295.74 472.26499999999993 Td
 /F5.0 11 Tf
-<6e616d653a> Tj
+<6e616d65> 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
+317.74 472.26499999999993 Td
+/F5.0 11 Tf
+<3a> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -18163,13 +18449,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 328.74 472.26499999999993 Td
 /F5.0 11 Tf
-<27697369732d636f72652d6170706c696227> Tj
+<27> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+334.24 472.26499999999993 Td
+/F5.0 11 Tf
+<697369732d636f72652d6170706c6962> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+422.24 472.26499999999993 Td
+/F5.0 11 Tf
+<27> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -18196,13 +18504,24 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 438.74 472.26499999999993 Td
 /F5.0 11 Tf
-<76657273696f6e3a> Tj
+<76657273696f6e> 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
+477.24 472.26499999999993 Td
+/F5.0 11 Tf
+<3a> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -18290,7 +18609,18 @@ ET
 BT
 152.74 442.7849999999999 Td
 /F5.0 11 Tf
-<3c3c> Tj
+<3c> 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
+158.24 442.7849999999999 Td
+/F5.0 11 Tf
+<3c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -18394,13 +18724,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 130.74 413.3049999999999 Td
 /F5.0 11 Tf
-<276275696c642f636c61737365732f6d61696e27> Tj
+<27> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+136.24 413.3049999999999 Td
+/F5.0 11 Tf
+<6275696c642f636c61737365732f6d61696e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+235.24 413.3049999999999 Td
+/F5.0 11 Tf
+<27> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -18438,13 +18790,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 130.74 398.5649999999999 Td
 /F5.0 11 Tf
-<277461726765742f636c617373657327> Tj
+<27> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+136.24 398.5649999999999 Td
+/F5.0 11 Tf
+<7461726765742f636c6173736573> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+213.24 398.5649999999999 Td
+/F5.0 11 Tf
+<27> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -18605,7 +18979,7 @@ ET
 
 BT
 536.54 256.0859999999998 Td
-/F7.0 10.5 Tf
+/F6.0 10.5 Tf
 <c9> Tj
 ET
 
@@ -18666,39 +19040,27 @@ endobj
 /Contents 182 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F5.0 53 0 R
-/F6.0 184 0 R
 /F1.0 8 0 R
 /F4.0 44 0 R
-/F7.0 185 0 R
+/F6.0 184 0 R
 >>
-/XObject << /Stamp1 687 0 R
+/XObject << /Stamp1 686 0 R
 >>
 >>
 >>
 endobj
 184 0 obj
 << /Type /Font
-/BaseFont /AAAAAN+mplus1mn-bold
+/BaseFont /AAAAAM+mplus-1p-regular
 /Subtype /TrueType
-/FontDescriptor 769 0 R
+/FontDescriptor 768 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 771 0 R
-/ToUnicode 770 0 R
+/Widths 770 0 R
+/ToUnicode 769 0 R
 >>
 endobj
 185 0 obj
-<< /Type /Font
-/BaseFont /AAAAAO+mplus-1p-regular
-/Subtype /TrueType
-/FontDescriptor 773 0 R
-/FirstChar 32
-/LastChar 255
-/Widths 775 0 R
-/ToUnicode 774 0 R
->>
-endobj
-186 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 698
@@ -18844,7 +19206,7 @@ w
 \ufffd\ufffdRY\ufffdj\ufffd\ufffdo^s\u037fF\ufffd.\ufffd\ufffdTEe\ufffd\ufffd\ufffd\ufffd^\ufffdxQk\ufffd1\ufffd\ufffd~\ufffd\ufffd\ufffd\ufffdZ\ufffd\ufffdJe\ufffd\ufffdB_\ufffdZ\ufffdeLe\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u05a5>5\ufffdE\ufffd\ufffd\ufffdLTMW\ufffd\ufffd\ufffd(\ufffdoY\ufffd\ufffdK}j\ufffdLe\ufffd\ufffd\ufffd\ufffd.\ufffd\ufffdTEe\ufffd+\ufffdX\ufffdTV\ufffd\ufffdRY\ufffdeOe\ufffd+\ufffdX\ufffd\ufffdUDDDDj\ufffd\ufffd\ufffd\ufffd*k\ufffd\uf49f\ufffd\ufffdHu\ufffd7O\ufffd
 endstream
 endobj
-187 0 obj
+186 0 obj
 << /Length 4449
 >>
 stream
@@ -19105,25 +19467,25 @@ Q
 
 endstream
 endobj
-188 0 obj
+187 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 187 0 R
+/Contents 186 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/XObject << /I39 186 0 R
-/I40 190 0 R
-/Stamp1 687 0 R
+/XObject << /I39 185 0 R
+/I40 189 0 R
+/Stamp1 686 0 R
 >>
 /Font << /F1.0 8 0 R
 /F5.0 53 0 R
 /F2.0 18 0 R
 >>
 >>
-/Annots [189 0 R 192 0 R 194 0 R]
+/Annots [188 0 R 191 0 R 193 0 R]
 >>
 endobj
-189 0 obj
+188 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -19134,13 +19496,13 @@ endobj
 /Type /Annot
 >>
 endobj
-190 0 obj
+189 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 434
 /Width 821
 /BitsPerComponent 8
-/ColorSpace [/Indexed /DeviceRGB 255 191 0 R]
+/ColorSpace [/Indexed /DeviceRGB 255 190 0 R]
 /Length 17894
 /Filter [/FlateDecode]
 /DecodeParms [<< /Predictor 15
@@ -19210,14 +19572,14 @@ c
 \ufffd\ufffd!\ufffdd@\ufffd5A)\ufffd+M (\ufffd\ufffdF (\ufffd\ufffdF (\ufffd\ufffdF (\ufffd\ufffdF (\ufffd\ufffdF (\ufffdb\u0373\ufffd\ufffd\ufffd=\u042cy\ufffd\ufffdGX#\ufffd�\ufffdY\ufffda\ufffd@\ufffd\ufffd\\ufffd\uccd64\ufffd\ufffd\ufffd\ufffdm\ufffd#\ufffd\ufffdF \ufffd}\ufffdfI#\ufffd\ufffd o\ufffd\ufffdRk\ufffdRk\ufffdRk\ufffdRp\ufffde\ufffd\ufffdyZ\u043b
 endstream
 endobj
-191 0 obj
+190 0 obj
 << /Length 768
 >>
 stream
 
59955%%%5<<<55%9%9#6%9%955<9<9/35555W5W5t5W]]]%]%]<]<]<]%}<}%}%Wt5WWWW5W5Q9Q9Q9t5t55t5WWWQ}b]b]b]tWb}s}ttW```W\ufffd5W\ufffd5t\ufffdWt\ufffdtt\ufffd<\ufffd<\ufffd)Q\ufffdQ\ufffd)Q\ufffdQ\ufffd)b\ufffd)b\ufffdj\ufffd!h\ufffd%b\ufffds\ufffdb\ufffd%b\ufffd)s\ufffd%s\ufffd)W\ufffd\ufffdt\ufffd\ufffdt\ufffd\ufffdt\ufffd\ufffd\ufffdW\ufffdt5\ufffdt5\ufffdWW\ufffdtt\ufffdtW\ufffdtt\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd:\ufffd\ufffdW\ufffd\ufffdW\ufffd\ufffdt\ufffd\ufffd@\ufffd\ufffdG\ufffd\ufffdM\ufffd\ufffdO\ufffd\ufffdN\ufffd\ufffdt\ufffd\ufffdt\ufffd\ufffd\ufffd\ufffd%\ufffd\ufffd.\ufffd\ufffd)\ufffd\ufffd,\ufffd\ufffd/\ufffd\ufffd.\ufffd\ufffd4\ufffd\ufffd6\ufffd\ufffd5\ufffd\ufffd7\ufffd\ufffd;\ufffd\ufffd<\ufffd\ufffd=\ufffd\ufffd0\ufffd\ufffd4\ufffd\ufffd3\ufffd\ufffd4\ufffd\ufffd4\ufffd\ufffd1\ufffd\ufffd>\ufffd\ufffd?\ufffd\ufffd4\ufffd\ufffd9\ufffd\ufffd:\ufffd\ufffd;\ufffd\ufffd=\ufffd\ufffd?\ufffd\ufffdS\ufffd\ufffd[\ufffd\ufffdT\ufffd\ufffdU\ufffd\ufffdT\ufffd\ufffdT\ufffd\ufffdV\ufffd\ufffd\\ufffd\ufffd]\ufffd\ufffd_\ufffd\ufffdE\ufffd\ufffdG\u0754g\ufffdq\ufffdp\ufffdt\ufffdn\ufffd\ufffdz\ufffd\ufffdz\ufffd\ufffdk\ufffd\ufffdn\ufffd\ufffdo\ufffd\ufffdp\ufffd\ufffdx\ufffd\ufffdz\ufffd\ufffd|\ufffd\ufffd}\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u0241\ufffd\u05c0\ufffd\u0441
 \u0480\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd
 endstream
 endobj
-192 0 obj
+191 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -19228,10 +19590,10 @@ endobj
 /Type /Annot
 >>
 endobj
-193 0 obj
-[188 0 R /XYZ 0 162.06789932144065 null]
+192 0 obj
+[187 0 R /XYZ 0 162.06789932144065 null]
 endobj
-194 0 obj
+193 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -19242,8 +19604,8 @@ endobj
 /Type /Annot
 >>
 endobj
-195 0 obj
-<< /Length 21052
+194 0 obj
+<< /Length 23931
 >>
 stream
 q
@@ -19609,13 +19971,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 130.74 551.7950000000003 Td
 /F5.0 11 Tf
-<27636f70794c61796f75747327> Tj
+<27> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+136.24 551.7950000000003 Td
+/F5.0 11 Tf
+<636f70794c61796f757473> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+196.74 551.7950000000003 Td
+/F5.0 11 Tf
+<27> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -19642,12 +20026,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.400 0.733 scn
-0.000 0.400 0.733 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 86.74000000000001 537.0550000000003 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <636f70794c61796f757473> Tj
 ET
 
@@ -19664,13 +20048,24 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 152.74 537.0550000000003 Td
 /F5.0 11 Tf
-<747970653a> Tj
+<74797065> 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
+174.74 537.0550000000003 Td
+/F5.0 11 Tf
+<3a> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -19752,13 +20147,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 108.74000000000001 522.3150000000003 Td
 /F5.0 11 Tf
-<277372632f6d61696e2f6a61766127> Tj
+<27> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+114.24000000000001 522.3150000000003 Td
+/F5.0 11 Tf
+<7372632f6d61696e2f6a617661> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+185.74 522.3150000000003 Td
+/F5.0 11 Tf
+<27> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -19796,13 +20213,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 108.74000000000001 507.5750000000002 Td
 /F5.0 11 Tf
-<277461726765742f636c617373657327> Tj
+<27> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+114.24000000000001 507.5750000000002 Td
+/F5.0 11 Tf
+<7461726765742f636c6173736573> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+191.24 507.5750000000002 Td
+/F5.0 11 Tf
+<27> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -19840,13 +20279,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 125.24000000000001 492.8350000000002 Td
 /F5.0 11 Tf
-<272a2a2f2a2e6c61796f75742e786d6c27> Tj
+<27> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+130.74 492.8350000000002 Td
+/F5.0 11 Tf
+<2a2a2f2a2e6c61796f75742e786d6c> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+213.24 492.8350000000002 Td
+/F5.0 11 Tf
+<27> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -19955,13 +20416,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 130.74 385.5750000000002 Td
 /F5.0 11 Tf
-<276c69766552656c6f616427> Tj
+<27> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+136.24 385.5750000000002 Td
+/F5.0 11 Tf
+<6c69766552656c6f6164> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+191.24 385.5750000000002 Td
+/F5.0 11 Tf
+<27> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -20071,7 +20554,18 @@ ET
 BT
 141.74 341.3550000000002 Td
 /F5.0 11 Tf
-<2829> Tj
+<28> 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
+147.24 341.3550000000002 Td
+/F5.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -20175,13 +20669,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 158.24 297.1350000000002 Td
 /F5.0 11 Tf
-<276f72672e6b6f7264616d702e677261646c653a6c69766572656c6f61642d677261646c652d706c7567696e3a302e322e3127> Tj
+<27> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+163.74 297.1350000000002 Td
+/F5.0 11 Tf
+<6f72672e6b6f7264616d702e677261646c653a6c69766572656c6f61642d677261646c652d706c7567696e3a302e322e31> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+433.24 297.1350000000002 Td
+/F5.0 11 Tf
+<27> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -20241,13 +20757,24 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 92.24000000000001 252.91500000000022 Td
 /F5.0 11 Tf
-<706c7567696e3a> Tj
+<706c7567696e> 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
+125.24000000000001 252.91500000000022 Td
+/F5.0 11 Tf
+<3a> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -20263,13 +20790,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 136.24 252.91500000000022 Td
 /F5.0 11 Tf
-<276f72672e6b6f7264616d702e677261646c652e6c69766572656c6f616427> Tj
+<27> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+141.74 252.91500000000022 Td
+/F5.0 11 Tf
+<6f72672e6b6f7264616d702e677261646c652e6c69766572656c6f6164> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+301.24 252.91500000000022 Td
+/F5.0 11 Tf
+<27> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -20340,12 +20889,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 125.24000000000001 223.4350000000002 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <6e6577> Tj
 ET
 
@@ -20362,12 +20911,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.400 0.733 scn
-0.000 0.400 0.733 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 147.24 223.4350000000002 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <46696c65> Tj
 ET
 
@@ -20384,13 +20933,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 174.74 223.4350000000002 Td
 /F5.0 11 Tf
-<277461726765742f636c617373657327> Tj
+<27> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+180.24 223.4350000000002 Td
+/F5.0 11 Tf
+<7461726765742f636c6173736573> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+257.24 223.4350000000002 Td
+/F5.0 11 Tf
+<27> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -20401,13 +20972,24 @@ ET
 BT
 262.74 223.4350000000002 Td
 /F5.0 11 Tf
-<292e> Tj
+<29> 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
+268.24 223.4350000000002 Td
+/F5.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 273.74 223.4350000000002 Td
@@ -20545,29 +21127,28 @@ Q
 
 endstream
 endobj
-196 0 obj
+195 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 195 0 R
+/Contents 194 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F5.0 53 0 R
 /F3.1 39 0 R
-/F6.0 184 0 R
 >>
-/XObject << /Stamp1 687 0 R
+/XObject << /Stamp1 686 0 R
 >>
 >>
 >>
 endobj
-197 0 obj
+196 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 706
 /Width 821
 /BitsPerComponent 8
-/ColorSpace [/Indexed /DeviceRGB 255 198 0 R]
+/ColorSpace [/Indexed /DeviceRGB 255 197 0 R]
 /Length 27749
 /Filter [/FlateDecode]
 /DecodeParms [<< /Predictor 15
@@ -20672,15 +21253,15 @@ f
 kF\ufffd\ufffd \ufffd\ufffd
 endstream
 endobj
-198 0 obj
+197 0 obj
 << /Length 768
 >>
 stream
 559955%%%5<<<55%9%9%9%955<9<9555Wt5W5t5W5tW]]]tt5%]%]5W<]<]<]%}5t<}%}%WWWt5WWWW5W5Q9Q9Q9tt5t5t55ttt5WWWWtQ}b]b]b]tWb}tts}ttW```\ufffd5\ufffd5\ufffdW\ufffdt\ufffd5W\ufffd5t\ufffdW\ufffdW\ufffdt\ufffdWt\ufffdtt\ufffd\ufffd\ufffd\ufffd<\ufffd<\ufffd)\ufffdW\ufffdt\ufffdtW\ufffdQ\ufffdQ\ufffd)Q\ufffdQ\ufffd)b\ufffd)b\ufffdt\ufffdj\ufffd!b\ufffds\ufffdb\ufffd%b\ufffd)s\ufffd%s\ufffd)\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdW\ufffd\ufffdt\ufffd\ufffdt\ufffd\ufffdt\ufffd\ufffd\ufffd\ufffd5\ufffdt\ufffdW\ufffdW\ufffdt\ufffdW\ufffdt\ufffdt5\ufffdt\ufffdt5\ufffdtt\ufffdtW\ufffdtt\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd:\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdW\ufffd\ufffdW\ufffd\ufffdt\ufffd\ufffd@\ufffd\ufffdG\ufffd\ufffdM\ufffd\ufffdO\ufffd\ufffdN\ufffd\ufffdt\ufffd\ufffdt\ufffd\ufffd\ufffd\ufffd%\ufffd\ufffd.\ufffd\ufffd)\ufffd\ufffd,\ufffd\ufffd/\ufffd\ufffd.\ufffd\ufffd4\ufffd\ufffd6\ufffd\ufffd5\ufffd\ufffd7\ufffd\ufffd;\ufffd\ufffd<\ufffd\ufffd=\ufffd\ufffd0\ufffd\ufffd4\ufffd\ufffd3\ufffd\ufffd4\ufffd\ufffd4\ufffd\ufffd1\ufffd\ufffd>\ufffd\ufffd?\ufffd\ufffd4\ufffd\ufffd9\ufffd\ufffd:\ufffd\ufffd;\ufffd\ufffd=\ufffd\ufffd?\ufffd\ufffdS\ufffd\ufffd[\ufffd\ufffdT\ufffd\ufffdU\ufffd\ufffdT\ufffd\ufffdT\ufffd\ufffdV\ufffd\ufffd\\ufffd\ufffd]\ufffd
 _\ufffd\ufffdE\ufffd\ufffdG\u0754g\ufffdq\ufffdp\ufffdt\ufffdn\ufffd\ufffdz\ufffd\ufffdz\ufffd\ufffdk\ufffd\ufffdn\ufffd\ufffdo\ufffd\ufffdp\ufffd\ufffdx\ufffd\ufffdz\ufffd\ufffd|\ufffd\ufffd}\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u0241\ufffd\u05c0\ufffd\u0441\ufffd\u0480\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd
 endstream
 endobj
-199 0 obj
-<< /Length 2959
+198 0 obj
+<< /Length 2673
 >>
 stream
 q
@@ -20785,35 +21366,13 @@ f
 h
 S
 Q
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-59.24 324.53788672350794 Td
-/F6.0 11 Tf
-<697369732e7669657765722e7769636b65742e6c69766552656c6f616455726c> 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
-235.24 324.53788672350794 Td
-/F5.0 11 Tf
-<3d> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-240.74 324.53788672350794 Td
+59.24 324.53788672350794 Td
 /F5.0 11 Tf
-<687474703a2f2f6c6f63616c686f73743a33353732392f6c69766572656c6f61642e6a733f736e69707665723d31> Tj
+<697369732e7669657765722e7769636b65742e6c69766552656c6f616455726c3d687474703a2f2f6c6f63616c686f73743a33353732392f6c69766572656c6f61642e6a733f736e69707665723d31> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -20853,24 +21412,23 @@ Q
 
 endstream
 endobj
-200 0 obj
+199 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 199 0 R
+/Contents 198 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/XObject << /I41 197 0 R
-/Stamp1 687 0 R
+/XObject << /I41 196 0 R
+/Stamp1 686 0 R
 >>
 /Font << /F1.0 8 0 R
 /F5.0 53 0 R
-/F6.0 184 0 R
 >>
 >>
-/Annots [201 0 R]
+/Annots [200 0 R]
 >>
 endobj
-201 0 obj
+200 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -20881,7 +21439,7 @@ endobj
 /Type /Annot
 >>
 endobj
-202 0 obj
+201 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 887
@@ -21223,7 +21781,7 @@ gi\u0628&UU
 g\ufffdQ.C\ufffd\ufffd\ufffdF\ufffd\ufffd\u0428\ufffd\ufffdQ@B\ufffd\ufffdYhT\ufffd\ufffd\u0428 \ufffdQ\ufffd,4*\ufffde*\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdd\ufffdQy\ufffd\ufffd\ufffd\ufffd<x\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdj[
 endstream
 endobj
-203 0 obj
+202 0 obj
 << /Length 6959
 >>
 stream
@@ -21587,14 +22145,14 @@ Q
 
 endstream
 endobj
-204 0 obj
+203 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 203 0 R
+/Contents 202 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/XObject << /I42 202 0 R
-/Stamp1 687 0 R
+/XObject << /I42 201 0 R
+/Stamp1 686 0 R
 >>
 /Font << /F2.0 18 0 R
 /F1.0 8 0 R
@@ -21602,10 +22160,10 @@ endobj
 /F3.1 39 0 R
 >>
 >>
-/Annots [205 0 R 207 0 R 208 0 R]
+/Annots [204 0 R 206 0 R 207 0 R]
 >>
 endobj
-205 0 obj
+204 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -21616,10 +22174,10 @@ endobj
 /Type /Annot
 >>
 endobj
-206 0 obj
-[204 0 R /XYZ 0 439.6581345076061 null]
+205 0 obj
+[203 0 R /XYZ 0 439.6581345076061 null]
 endobj
-207 0 obj
+206 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -21630,7 +22188,7 @@ endobj
 /Type /Annot
 >>
 endobj
-208 0 obj
+207 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -21641,7 +22199,7 @@ endobj
 /Type /Annot
 >>
 endobj
-209 0 obj
+208 0 obj
 << /Length 1515
 >>
 stream
@@ -21748,24 +22306,24 @@ Q
 
 endstream
 endobj
-210 0 obj
+209 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 209 0 R
+/Contents 208 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/XObject << /I43 211 0 R
-/I44 213 0 R
-/Stamp1 687 0 R
+/XObject << /I43 210 0 R
+/I44 212 0 R
+/Stamp1 686 0 R
 >>
 /Font << /F1.0 8 0 R
 /F5.0 53 0 R
 >>
 >>
-/Annots [212 0 R 214 0 R]
+/Annots [211 0 R 213 0 R]
 >>
 endobj
-211 0 obj
+210 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 621
@@ -21877,7 +22435,7 @@ P:\u0557
 f\ufffd\ufffd\ufffd#\ufffd\ufffd\ufffd\ufffd\ufffdl\ufffde?\ufffd\ufffd\ufffd\ufffd\ufffdw\ufffd\ufffdO<\ufffd\ufffdW^\ufffd\ufffd\ufffdE\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdR\ufffd\ufffdZ\ufffd\ufffd\ufffd\ufffd7?\ufffd\ufffd?\ufffd\ufffd?\ufffd.L\ufffdF\u0392H$\ufffdD"M0\ufffd\ufffdo\ufffd^\ufffde?\ufffd\ufffd\ufffd\ufffd\ufffd_+\ufffd\ufffd\ufffd\u0677\ufffd\ufffd\ufffdB\ufffd?~\ufffds\ufffdG/i"\ufffd\ufffd\u060a*
 endstream
 endobj
-212 0 obj
+211 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -21888,7 +22446,7 @@ endobj
 /Type /Annot
 >>
 endobj
-213 0 obj
+212 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 621
@@ -22020,7 +22578,7 @@ r
 \ufffd\ufffd\ufffdP\ufffdvj\u06ad2\ufffdo,\ufffd\ufffdWr*9\ufffd\ufffd\ufffd\ufffdA\ufffd@\ufffd g\ufffdb\ufffd\ufffdP1\ufffdY\ufffd\ufffd,Tr*93\ufffdY\ufffdD"\ufffdH$\ufffd\ufffd\ufffd\ufffd\ufffd$\5
 endstream
 endobj
-214 0 obj
+213 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -22031,7 +22589,7 @@ endobj
 /Type /Annot
 >>
 endobj
-215 0 obj
+214 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 869
@@ -22229,7 +22787,7 @@ y
 P\ufffd\ufffdc\ufffdM\ufffd\ufffd\ufffd\ufffd$\ufffd\ufffd\ufffdx\ufffd\ufffd\ufffd\ufffd\ufffdO\ufffd\u9eff\ufffdo7\ufffd}\ufffdF~\ufffdg?\ufffd\ufffd\ufffd\ufffd{\ufffd\ufffd^\ufffd\ufffd\u019d\ufffd\ufffd\ufffd\ufffd^
\ufffd\ufffd\ufffd\ufffdO\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdy\ufffdm\ufffd~s|~\ufffd\ufffd/\ufffd~\ufffdu\ufffdu\u022bK\ufffd\ufffd\u0297~\ufffd7o\ufffd\ufffd/\ufffdv\ufffd\ufffd'~\ufffdW\ufffd\ufffd\ufffd\ufffdW\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd?\ufffd\ufffd#\ufffd\ufffd\ufffdWT\ufffd\u05ce\ufffd\ufffdW%\ufffd\ufffdU\ufffd%\ufffdD\ufffd\ufffd\ufffdydt\ufffd\u0565q\ufffdB>\ufffd\ufffd$<ZvJr\ufffd\ufffd\ufffd\ufffd~\ufffd\ufffd\u05bf\ufffd\ufffd/\ufffd\ufffd+\ufffd\ufffd\ufffd=*\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdZ\ufffd\ufffd\ufffde.\ufffd?\ufffd|#\ufffd\ufffd\ufffd\ufffdrss\ufffd\u07d8\ufffd\ufffd\u01bb\ufffd\ufffd_\ufffd{\ufffd_\ufffd\ufffd\u05ff>\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\w_f_zW|<\ufffd\ufffd_\ufffd\ufffd_\ufffd\ufffd\ufffdC\ufffd]\ufffd];i\ufffd\ufffd(\ufffd.\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdvGEP\ufffd\ufffd\u0757w\ufffdKv\ufffd"\ufffdP2\ufffd<2\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd|\ufffd(Ix\ufffd\ufffd\ufffd+\ufffd\ufffd\ufffd\ufffd\ufffd\u068b\ufffda\ufffd7\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd:\ufffd\ufffd3\ufffd\ufffd\ufffd\ufffd\ufffd2\ufffd]\ufffdX\ufffd\ufffd\ufffdC\ufffd\ufffd\ufffd\ufffd/\ufffd\ufffdo\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd[>\ufffd\ufffdAi\ufffd\ufffd\ufffd/\ufffd\ufffd\u50df\ufffdP\ufffd\ufffd\ufffd\ufffd}\ufffd\ufffdt\ufffd*|~WX9T\ufffd\ufffd\ufffd\ufffd\ufffd?\ufffd\u0639\ufffd\ufffdK\ufffd\ufffdp\ufffd\ufffd\u07ab\ufffd\u0643\ufffd\u01cfQ\ufffdQ\ufffd\ufffdD\ufffd*\ufffda\ufffdH\ufffd\ufffd\ufffd|*(Ix\ufffd
 \ufffd{_i\ufffd\ufffdu\ufffd\ufffdm\ufffd\ufffd~\ufffdk\ufffd~\ufffd\ufffd\ufffd_\ufffdZ\ufffdq]l(5\u8da5b\ufffd\ufffd\ufffd\u0310AI\ufffd\ufffd\ufffd\ufffd\ufffdG\ufffd\ufffd\ufffdo\ufffdh\ufffd:\ufffdkmr\ufffd\ufffd\ufffdv_\ufffd\ufffd^>}\ufffd\ufffd\ufffd\ufffdw<,\ufffd\ufffd|\ufffd $\ufffdz\ufffdE\ufffd	9\ufffd$<Z\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdw_o\ufffd2\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdM8\ufffd\ufffd|\ufffdw\u07bc\ufffd|%\ufffd\ufffd\ufffdpz\ufffd;_8\ufffd\ufffdW;\ufffd\ufffd!g\ufffd\ufffd\ufffdG\ufffd^I\ufffd\u0722\ufffd\ub42f\ufffd	v\ufffdJ\ufffda\ufffd$\ufffd\ufffd\ufffd-Z\ufffd2\ufffd\ufffd\ufffd\ufffd\ufffd\u0684;	p%	\ufffd0(\ufffd\ufffdW_k\ufffd>\ufffd\ufffdO\ufffd8\ufffd\ufffd\ufffd&\ufffdI\ufffd(Ih\ufffd\ufffd\ufffd>\ufffdc\ufffd\ufffd\ufffd\u045f\ufffdj[\ufffd\ufffd\ufffd\ufffd_|1'\ufffd\ufffd\ufffd\ufffd\ufffdG\ufffd\ufffd\ufffd?\ufffdy\ufffd$\ufffd	\ufffd$4�\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdG\ufffdO\ufffd\ufffd\ufffd\ufffd~\ufffdS\ufffd\ufffd\ufffd7\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd}\ufffds\ufffd\ufffdM1\ufffd\ufffdO\ufffd{	p%	\ufffd\ufffd\ufffdo\ufffd\ufffd\ufffdO\ufffd�>\ufffd\ufffd_|\ufffd\ufffd_&@\ufffdNN
p%	\ufffd\ufffd\ufffd\ufffd\ufffd@I\ufffdi\ufffd$\ufffd4P\ufffdp(I8
\ufffd$\ufffdJN%	\ufffd\ufffd\ufffd\ufffd\ufffd@I\ufffdi\ufffd$\ufffda\ufffda\ufffda\ufffd\ufffd\ufffd\ufffdq{\ufffd\ufffd
 endstream
 endobj
-216 0 obj
+215 0 obj
 << /Length 2040
 >>
 stream
@@ -22363,24 +22921,24 @@ Q
 
 endstream
 endobj
-217 0 obj
+216 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 216 0 R
+/Contents 215 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/XObject << /I45 215 0 R
-/I46 219 0 R
-/Stamp1 687 0 R
+/XObject << /I45 214 0 R
+/I46 218 0 R
+/Stamp1 686 0 R
 >>
 /Font << /F1.0 8 0 R
 /F2.0 18 0 R
 >>
 >>
-/Annots [218 0 R 220 0 R 222 0 R]
+/Annots [217 0 R 219 0 R 221 0 R]
 >>
 endobj
-218 0 obj
+217 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -22391,7 +22949,7 @@ endobj
 /Type /Annot
 >>
 endobj
-219 0 obj
+218 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 829
@@ -22496,7 +23054,7 @@ G
 D\ufffd\ufffd\ufffd\ufffd\ufffdB\ufffd\ufffd\ufffdD\ufffd\ufffd\ufffd\ufffdp\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd|0@\ufffd3\ufffd\ufffd`tt8\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd0::FG\ufffd\ufffd\ufffd\ufffdp\ufffd\ufffd\ufffd`tt8\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd0::FG\ufffd\ufffd\ufffd\ufffdp\ufffd\ufffd\ufffd`tt8\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd0/<\ufffd\u0126EK\ufffd=\ufffdS_\ufffd\ufffd\ufffd\ufffd^v\ufffd\ufffd?8p\ufffd@\ufffdn\u07bcy\u0672e\ufffd\ufffd\ufffd+\ufffd\ufffd\ufffd;\uec03\ufffdd3:\ufffd$\ufffd\ufffdz\u025a\ufffd|e\ufffd[.\ufffd?.\ufffd_\u0679\u88bb'''Cv0I\ufffdG}\ufffd\u0421C\ufffd\ufffdc\ufffd\ufffd\ufffd\ufffdW\ufffd\ufffd\ufffd\ufffdd3:\u6173\ufffd\ufffd\ufffdo\ufffd\ufffd\ufffd\\ufffdo\ufffd\u01a5\ufffd^\ufffd\ufffd\ufffdl<2\ufffd\ufffd\ufffd<\ufffd\ufffd\ufffd\ufffdy\u1b3f\ufffd\ufffd[\ufffd\ufffdwG`\ufffd|\ufffd\ufffd8<\ufffd\ufffd\ufffd<\ufffd\ufffd\ufffd\ufffdya>t\ufffd\ufffd\ufffdd\ufffd\ufffdft8\ufffdI\ufffd\ufffd\ufffd{\ufffdqF\ufffd\u05ff\ufffd\ufffd\ufffd\u0193\ufffd';\ufffd\ufffd\ufffd0/4;|\ufffd8\ufffd\ufffd;0\ufffd\ufffd\ufffd<\ufffd\ufffd\ufffd\ufffdy\u1b3f\ufffd\ufffd\ufffd/\ufffd\ufffd^q\ufffd\u0193\ufffd';\ufffd\ufffd\ufffd0/\ufffd\ufffd\ufffd\ufffd\ufffd}m\ufffdx\ufffd\ufffd\ufffdd3:\ufffd\ufffd\ufffd\ufffd%g|i\ufffd8\ufffd\ufffd\ufffd3\ufffd\ufffd\ufffd<\ufffd\ufffd\ufffd\ufffdy\ufffd\ufffd\ufffd;f>N;\ufffd\ufffd=\u03ff\ufffd\ufffd\ufffd\ufffdG/>{\ufffd5\ufffdmo~\ufffd\ufffd\ufffd/\ufffd\u07f0&k\ufffd\ufffd\ufffd\ufffd~r\ufffd)\ufffdS.\ufffd\u026e]\ufffd
\ufffdk\ufffd-
 \ufffd\ufffd\ufffd-\ufffd>;\ufffd\u0646\ufffd&1\ufffd4\ufffd\ufffd5fu\ufffd\ufffd%\ufffda~Jc\ufffd?zK\ufffd\ufffd3\u07e3\ufffdhtx\ufffd3\ufffd]up\ufffd\ufffdo\ufffd\ufffd/W\\ufffd\ufffdq\ufffdw\ufffd:\ufffd\ufffd\u0197\ufffd\ufffd\ufffd{~\ufffd\ufffd\ufffdf\ufffd\ufffd\ufffd\u0239\ufffdKv\u0631c\ufffdG\ufffd\ufffd>\ufffd\ufffdkv\ufffdhMY\U000513ec\ufffdr\ufffdA5\u05d5,\ufffd\ufffd\ufffd\ufffd\ufffd`Ac>\ufffd\u060a\ufffd\ufffd\ufffd!p/j\ufffd\ufffd\ufffdl\ufffdc\ufffdx\u69ec\ufffd\ufffd\ufffd5\ufffd<\ufffd=*\ufffd\ufffd@\ufffd\ufffdwx\ufffd\ufffd\ufffd??}\ufffd\ufffd\ufffd;\ufffd\ufffd|\ufffd\ufffdv\ufffdt>\ufffdG\ufffd\ufffd;,O*\ufffd#\ufffdC\u6739\ufffd\u06d3\ufffd}d\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd
\u068c\ufffdE\ufffd\ufffd\ufffd\ufffdT\ufffd}'_\ufffd&?e\u0345'\ufffd<\ufffd3\u07e3\ufffdx\ufffd\ufffd]|\ufffd\ufffd\ufffdf2\u0483\ufffd\u0374\ufffdZ\ufffd\ufffdl\ufb67}qg\ufffd\ufffd\ufffd\ufffdiO\ufffd\ufffdJ\ufffd^q\ufffd\ufffd\ufffd\ufffdP\ufffdg'_\ufffd\u0436\ufffdko\ufffdp\ufffdT\ufffd\ufffd<\ufffd7H.gW|\ufffd\ufffdm\ufffd\ufffd6\ufffd\ufffdNmoL\u07d6\ufffd}\ufffdus\ufffddJ\ufffd&U"\ufffd`\ufffd}\ufffd\ufffd\ufffdB\ufffd\ufffdd7\ufffd[\ufffdnU\ufffd\ufffd\ufffd\ufffd\ufffdO\u07d6_Hk\ufffdY\ufffd\ufffd\u076c\ufffd`\ufffd\ufffda\ufffd\ufffdc\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd?.U\ufffd<(\ufffdx\ufffd'/>\ufffd\ufffd[g2N\ufffd\ufffdH\ufffd\ufffd\ufffds?\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u06d1v\ufffd\ufffd=\ufffdh\ufffd\ufffd\ufffd=3\c:#\ufffd\ufffd/\ufffd\ufffd\ufffd\ufffdF\ufffd]\ufffd\ufffd\u05ad\ufffd\ufffd\ufffdtA\ufffdl\ufffd\ufffd[\ufffd\ufffd\ufffdf\ufffd5\ufffd7r\ufffd\ufffdo\ufffd\ufffdi\ufffdm\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u0254\ufffdF\ufffdk
 \ufffd\ufffd73\ufffdbu\ufffd\ufffd;X\u0723\ufffd\ufffd;\ufffd\u072a\ufffdNmM\ufffdj\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd)\ufffd=\ufffd.\ufffd\ufffd\ufffd\ufffd\ufffdl7K\ufffd\ufffd\ufffd\u01e5j\ufffd\ufffd\ufffdhv\ufffd\ufffd3\ufffd\ufffd\ufffd\u07d2M\ufffd\ufffd{\ufffd-[\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd87\ufffd\ufffd#\ufffd\ufffd\ufffdg\u02cd\ufffd8\ufffd+l\ufffd\ufffdg\ufffd\ufffd|\ufffdqK\u206f\ufffd\u0538Akz\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdE\ufffd\ufffd\ufffd\ufffdH\ufffd\ufffd\ufffd\ufffd-\ufffd\ufffd+\n~\u065e\ufffdnzvo4.\ufffd\ufffd,\ufffd`&\ufffd\ufffd\ufffd\ufffdt\ufffd\ufffd\ufffd\ufffdT\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd?\ufffd\u0659\ufffd\ufffdnn\ufffd+\ufffd\ufffd\u0499x\ufffds\u0353\ufffdO[\ufffdn\ufffd[\ufffd_\ufffdg\ufffd+MF`\ufffd\t\ufffdE[\ufffd\ufffd|\ufffd?\ufffd4\ufffd\ufffd6o\ufffd\ufffd6\u04d8msc\ufffdI\ufffdp\ufffd\ufffd\ufffd\ufffd\ufffd6o\ufffd\ufffd\ufffd\ufffd\ufffd&S\ufffd5\ufffdO\ufffdV\ufffd.q\ufffd\ufffd\ufffd\ufffdO\ufffdM\ufffd\u066a\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd-\ufffd\ufffd,lgq\ufffd\u04dd\ufffd}\\ufffdvy\ufffd
\ufffd\ufffd@\ufffd\ufffd}\ufffd\ufffd\ufffd\ufffd2\ufffdq\ufffdm\ufffd[\ufffd\ufffdv\ufffd%\ufffd\ufffd\ufffd\ufffd9\ufffd%\ufffd\ufffd/\ufffd\u073c\ufffd\ufffd+\ufffd\ufffd\ufffdv\u07f6\ufffd7\ufffd\ufffd6\ufffd\ufffdi\ufffd}_>i\ufffd/\ufffdWrU#\ufffd>x�M\ufffd\u065ay\ufffdiSs\ufffdd\ufffdM\ufffdyZ_5\ufffdo^\ufffdy\ufffd\ufffd\ufffdr\ufffd*\ufffd\ufffd4Yw\ufffdf[_\ufffd\ufffdvz\ufffd\u96b3\ufffd\ufffd\ufffd\ufffd\ufffdtk\ufffdS\ufffdM\ufffd\ufffd\ufffdq\ufffd\ufffd\ufffdA7@\ufffd%\ufffd\ufffd\ufffd\ufffd\u01a9W\ufffd/\ufffd\ufffde\ufffdX~\u0166\u01b5_hw\ufffd\ufffd\u0197\ufffd\ufffd\ufffdk\ufffd\ufffd\ufffd
 \u056f~\ufffd\ufffdO\ufffd\ufffd\ufffd7OLL\ufffd\ufffd\ufffd\u0394\ufffd}\ufffdw\ufffdN\ufffd\ufffdx\ufffd\ufffd}\ufffd\ufffddJs\ufffd\u01b4\ufffds7\ufffdvn\u06dc\ufffd9wc\ufffdt\ufffd\ufffd_\ufffd\ufffd\ufffd\ufffd\ufffdOi\ufffd\u07d8\ufffd\ufffd\ufffd\ufffdM\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdZ\ufffd\ufffd\u0664\ufffd\ufffdg\ufffd@cjn\ufffd*\ufffdw\ufffd\ufffd\ufffd\ufffd\ufffdw`_\ufffd\ufffd\ufffdy\ufffdC\ufffd\ufffd\ufffd\ufffd\ufffd3\ufffd\ufffd\ufffd\ufffdq\ufffd\ufffd\ufffdA7@\ufffd%\ufffd\ufffdi\ufffd\ufffd\ufffd/l]\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd3\ufffd\ufffd\u05acx\ufffd\ufffd\ufffd\ufffd#\ufffd\ufffd\ufffd\ufffd\ufffd1\ufffd+\ufffd\ufffd07\ufffds\ufffd\ufffdsg*\ufffd}}a\ufffd\ufffd??\ufffd\ufffd7nlN|\ufffd\ufffd\ufffdll\u0770\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdnpOc\ufffd\u0714\ufffd\u036fO\ufffdS\ufffd=\ufffdw0\ufffd\u0614\ufffd~\ufffd5\ufffd\ufffd\ufffd9\u036d\ufffdllk\ufffdLo\ufffdE\ufffd\ufffd\ufffd\ufffd\ufffd3;X\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdW?.U\ufffd<(\ufffdht\ufffd6\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdi\ufffd;\ufffd\ufffdS\ufffd\ufffdx\ufffd\ufffdSON/\u0396\u0315To\ufffd\ufffd\ufffd\ufffd\ufffd#\ufffd\ufffd}\ufffdp\ufffd\ufffd{?\ufffd\ufffdS\ufffd\ufffd\ufffd8\ufffd\ufffd{j<\ufffd\ufffd?\ufffd-g�f|n\ufffdP\ufffdI\ufffd\ufffd\ufffdy\ufffd>\ufffd\ufffdI\ufffd\ufffd}\ufffdw0\ufffd\ufffd]\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdWO\ufffd\ufffd\ufffd\ufffd8#\ufffd\ufffd/\ufffd\ufffdx\ufffd\ufffd_\ufffdYg]\ufffd~}\ufffd\ufffdLru\ufffdY\ufffd
\ufffd\ufffd9\ufffd\ufffd\ufffd\ufffd@:(\ufffd\ufffd\ufffd\ufffd8\ufffd+n\ufffdx\ufffd\ufffd\ufffdd3:\ufffdF\ufffdn\ufffd8\ufffd\ufffd\u0239\ufffd\u058d';8Ov0\ufffd\ufffd`^H:|\ufffd\ufffd\ufffdq\ufffde\ufffd\ufffd\ufffd`RqO
 ';8Ov0\ufffd\ufffd`^\ufffd\ufffd\u2bdf\ufffd\ufffd\ufffdl\ufffdg7\ufffd\ufffd\ufffd\ufffdE\ufffd/_\ufffd<d/\ufffd\u4487~\ufffd\ufffdqs\ufffd=\ufffd\ufffd\ufffdy\ufffd\ufffd\ufffd\ufffd\ufffd[\ufffd\t\ufffd|\ufffd\ufffdc4>v\ufffd}\u07f8\ufffd\ufffdg\ufffdy&d\ufffd\ufffd\ufffd\ufffdn\ufffd\ufffdgc%I\ufffd+\ufffd\ufffd\ufffd\ufffde3:\ufffdLNN^:>.\ufffd\ufffd\ufffd\u02d7o\u0738\ufffd\ufffd\ufffd\ufffdi\ufffd\ufffd\ufffdp\ufffd\ufffd\ufffd`tt8\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd0::FG\ufffd\ufffd\ufffd\ufffdp\ufffd\ufffd\ufffd`tZn\ufffda\ufffda\ufffda\ufffdh\ufffd\ufffd\ufffdu
 endstream
 endobj
-220 0 obj
+219 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -22507,10 +23065,10 @@ endobj
 /Type /Annot
 >>
 endobj
-221 0 obj
-[217 0 R /XYZ 0 151.76709598031175 null]
+220 0 obj
+[216 0 R /XYZ 0 151.76709598031175 null]
 endobj
-222 0 obj
+221 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -22521,7 +23079,7 @@ endobj
 /Type /Annot
 >>
 endobj
-223 0 obj
+222 0 obj
 << /Length 13951
 >>
 stream
@@ -23332,27 +23890,27 @@ Q
 
 endstream
 endobj
-224 0 obj
+223 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 223 0 R
+/Contents 222 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F2.0 18 0 R
 /F3.1 39 0 R
 /F5.0 53 0 R
 >>
-/XObject << /Stamp1 687 0 R
+/XObject << /Stamp1 686 0 R
 >>
 >>
-/Annots [226 0 R 227 0 R 228 0 R 231 0 R 233 0 R 234 0 R 235 0 R 236 0 R]
+/Annots [225 0 R 226 0 R 227 0 R 230 0 R 232 0 R 233 0 R 234 0 R 235 0 R]
 >>
 endobj
-225 0 obj
-[224 0 R /XYZ 0 778.86 null]
+224 0 obj
+[223 0 R /XYZ 0 778.86 null]
 endobj
-226 0 obj
+225 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -23363,7 +23921,7 @@ endobj
 /Type /Annot
 >>
 endobj
-227 0 obj
+226 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -23374,7 +23932,7 @@ endobj
 /Type /Annot
 >>
 endobj
-228 0 obj
+227 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -23385,15 +23943,15 @@ endobj
 /Type /Annot
 >>
 endobj
-229 0 obj
-[224 0 R /XYZ 0 453.6400000000003 null]
+228 0 obj
+[223 0 R /XYZ 0 453.6400000000003 null]
 endobj
-230 0 obj
+229 0 obj
 << /Limits [(_dg_ide_intellij_file-templates) (_dg_ide_intellij_installing_download)]
 /Names [(_dg_ide_intellij_file-templates) 70 0 R (_dg_ide_intellij_hints-and-tips) 137 0 R (_dg_ide_intellij_hints-and-tips_editing) 147 0 R (_dg_ide_intellij_hints-and-tips_keyboard-cheat-sheets) 138 0 R (_dg_ide_intellij_hints-and-tips_navigating-around) 144 0 R (_dg_ide_intellij_hints-and-tips_plugins) 152 0 R (_dg_ide_intellij_hints-and-tips_plugins_maven-helper-plugin) 156 0 R (_dg_ide_intellij_hints-and-tips_refactoring) 149 0 R (_dg_ide_intellij_importing-maven-modules) 101 0 R (_dg_ide_intellij_installing) 40 0 R (_dg_ide_intellij_installing_download) 41 0 R]
 >>
 endobj
-231 0 obj
+230 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -23404,10 +23962,10 @@ endobj
 /Type /Annot
 >>
 endobj
-232 0 obj
-[224 0 R /XYZ 0 376.8000000000003 null]
+231 0 obj
+[223 0 R /XYZ 0 376.8000000000003 null]
 endobj
-233 0 obj
+232 0 obj
 << /Border [0 0 0]
 /Dest (_dg_ide_intellij_live-templates)
 /Subtype /Link
@@ -23415,7 +23973,7 @@ endobj
 /Type /Annot
 >>
 endobj
-234 0 obj
+233 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -23426,7 +23984,7 @@ endobj
 /Type /Annot
 >>
 endobj
-235 0 obj
+234 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -23437,7 +23995,7 @@ endobj
 /Type /Annot
 >>
 endobj
-236 0 obj
+235 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -23448,13 +24006,13 @@ endobj
 /Type /Annot
 >>
 endobj
+236 0 obj
+[223 0 R /XYZ 0 185.06000000000031 null]
+endobj
 237 0 obj
-[224 0 R /XYZ 0 185.06000000000031 null]
+[223 0 R /XYZ 0 124.00000000000028 null]
 endobj
 238 0 obj
-[224 0 R /XYZ 0 124.00000000000028 null]
-endobj
-239 0 obj
 << /Length 1120
 >>
 stream
@@ -23534,23 +24092,23 @@ Q
 
 endstream
 endobj
-240 0 obj
+239 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 239 0 R
+/Contents 238 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F4.0 44 0 R
 >>
-/XObject << /I47 241 0 R
-/Stamp1 687 0 R
+/XObject << /I47 240 0 R
+/Stamp1 686 0 R
 >>
 >>
-/Annots [242 0 R]
+/Annots [241 0 R]
 >>
 endobj
-241 0 obj
+240 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 557
@@ -23698,7 +24256,7 @@ DC
 \ufffdc\ufffd\ufffd\ufffd\ufffdJWi\ufffd|(\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdzgi\ufffd\ufffdbI\ufffd~y\ufffd\ufffd:\ufffdr\u0372\ufffd\ufffdx\ufffdW\ufffd\ufffd\u03b4x>;\ufffd7\ufffd\ufffd\ufffd\ufffd\ufffdg47\ufffdJe\ufffd\ufffd\ufffd\ufffdY'\ufffd62y\ufffd\ufffdj\ufffd2!\ufffd\ufffd\ufffdo\ufffd\u07f1\ufffd\ufffd\ufffd\ufffd\\ufffd\ufffdA.;\ufffdZX;\ufffd\ufffd\u0670\ufffdz\ufffd\ufffd\ufffd\ufffd[\ufffd\ufffdAi\ufffdZ\ufffd.p6\ufffd.Yf~\ufffd?s\ufffd\ufffd&k\ufffd\u05a8\ufffd\ufffd\ufffd\ufffd\ufffdo\ufffdWr3U\ufffd\ufffd\ufffd&s\ufffd\ufffdmtnZ\ufffd\ufffd\ufffd2\ve\ufffdHu\u8ec2\ufffd\ufffdA\ufffd&P> \ufffdau\ufffdf\ufffd;\ufffd\ufffdg\ufffd{\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdZ!Jmd\ufffdM\ufffdJNnp\u04f9\ufffdj\ufffd\ufffdX\ufffd8\ufffdJ\ufffd\ufffd\ufffd\ufffdm\ufffd2\u076d\ufffd*\ufffd\ufffdL&\ufffd\ufffd\ufffd\ufffdm\ufffd7\ufffd~\ufffd@\ufffd\ufffd!\ufffd\ufffd\ufffd\ufffdYIsWp?3(\ufffd\ufffdd\ufffd\ufffd\ufffdU#\ufffd\ufffd\\ufffd\ufffd\ufffd<\ufffd\ufffdh#\ufffdt\ufffdm\F\ufffd\u031a\ufffdV\ufffd\ufffd\ufffdu\ufffd)\ufffdt94'{\u0352a\ufffd)\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd1\ufffd.\ufffd\ufffd9\ufffd\ufffd\ufffd"}%\ufffd]\ufffd\ufffd\ufffd\ufffd?pgF\ufffd
 endstream
 endobj
-242 0 obj
+241 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -23709,7 +24267,7 @@ endobj
 /Type /Annot
 >>
 endobj
-243 0 obj
+242 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 544
@@ -23903,7 +24461,7 @@ G
 h\ufffdsF\ufffdGK\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd;\ufffd\ufffd.\ufffd\ufffd\ufffd\ufffd%e*\ufffd\u06ed\ufffdji\ufffds\u1c1b;L\ufffd"fg\ufffd\ufffdCKY}0\ufffd\ufffd\ufffd\ufffd\ufffdY\ufffd@\ufffd\u0539\ufffdr\ufffd\ufffd\ufffd\ufffdGL\ufffd\ufffd\ufffdy\ufffdx\ufffd"\ufffdn\ufffdpx\ufffd.\ufffd8l\ufffdPLy\ufffd\ufffd0r\ufffd&\ufffd\ufffdMn!\ufffd=\ufffdA"=\ufffd\ufffd\ufffd+\ufffdaD\ufffde\ufffd\ufffd\u039b\ufffdvc\ufffd9\ufffdn\ufffdpx\ufffd/\ufffdg\ufffd\ufffd}\ufffd\ufffd9\ufffd8\ufffd`\ufffd7h\ufffd+\ufffd\ufffdt\ufffd\ufffd\ufffd`\ufffd\ufffd\u0335N\ufffd
 endstream
 endobj
-244 0 obj
+243 0 obj
 << /Length 3279
 >>
 stream
@@ -24110,24 +24668,24 @@ Q
 
 endstream
 endobj
-245 0 obj
+244 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 244 0 R
+/Contents 243 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/XObject << /I48 243 0 R
-/Stamp1 687 0 R
+/XObject << /I48 242 0 R
+/Stamp1 686 0 R
 >>
 /Font << /F2.0 18 0 R
 /F1.0 8 0 R
 /F5.0 53 0 R
 >>
 >>
-/Annots [246 0 R 248 0 R 249 0 R]
+/Annots [245 0 R 247 0 R 248 0 R]
 >>
 endobj
-246 0 obj
+245 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -24138,10 +24696,10 @@ endobj
 /Type /Annot
 >>
 endobj
-247 0 obj
-[245 0 R /XYZ 0 453.89 null]
+246 0 obj
+[244 0 R /XYZ 0 453.89 null]
 endobj
-248 0 obj
+247 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -24152,7 +24710,7 @@ endobj
 /Type /Annot
 >>
 endobj
-249 0 obj
+248 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -24163,7 +24721,7 @@ endobj
 /Type /Annot
 >>
 endobj
-250 0 obj
+249 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 549
@@ -24274,7 +24832,7 @@ g
 \u07250\ufffd{xu\ufffd\ufffd,\ufffd_\ufffdG%\ufffdu\ufffd_\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd#\ufffd\ufffd\ufffd\u01a1\ufffd\ufffd\ufffd\ufffd:-
*\ufffd\ufffd\ufffdt\u03deS\ufffd\u0270=\ufffd\ufffd\ufffd0\ufffdh|\ufffdm\ufffd\ufffd\ufffd\ufffd\ufffd23qb\ufffddB\ufffd5\ufffd(OL>9`\ufffdY\ufffd\\ufffd\ufffd=\ufffd\ufffd\ufffd-\ufffd\ufffd\ufffd\ufffd~\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdF\ufffd\ufffdQZ\ufffd\ufffd8z\ufffd*\ufffd\ufffd%Y\ufffd+A+\ufffd\ufffd5\ufffdi\ufffdo\ufffdq\ufffdV\ufffd|Sa\ufffd\ufffda3\ufffd\ufffd6o\ufffd\ufffd\ufffdVO\ufffd\ufffdE\ufffd\ufffd\ufffd[\ufffd8\ufffd\ufffd']p`\ufffd=\ufffd~#\ufffd{\ufffd2n\ufffdn*\ufffd\ufffd\ufffd\ufffd\ufffd.\ufffd\ufffd\ufffd\ufffd!\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdE\ufffdXz\ufffd\ufffd\ufffd\u0370\ufffd\ufffd\ufffd&\ufffd\ufffdV\ufffd\ufffd\ufffd(v&\ufffd\ufffd\ufffd|\ufffd\ufffd\ufffd\ufffdt:\ufffdv\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdy\ufffd\ufffdO\u01aa\ufffdZ\ufffd\ufffd,\ufffd\ufffd,\ufffd\ufffd5\u058f\ufffd\ufffd\ufffd]\ufffd\ufffd\ufffd,_6a\ufffd\ufffd(\ufffd\ufffd\ufffd\ufffddB\ufffd5\ufffd\ufffd\ufffd\ufffdk7'K5\ufffd\ufffd2y\ufffd}\ufffd\ufffd\ufffd\ufffdw\ufffd\ufffd\ufffd\ufffdtL\ufffdpR\ufffd\u05cf\ufffd>\ufffd\ufffd~j5ld\ufffd\ufffdg\ufffd
/D[\ufffd\ufffdkj\ufffd\ufffdm\ufffdQ\ufffd\ufffd\ufffd3\ufffd%Rc\ufffd~\u027f\ufffd\ufffd\u07b1\ufffd\ufffd\ufffd\ufffd5\ufffdn\ufffd\ufffdu6\ufffd|\u0644\ufffd[\ufffd\ufffd\ufffd\ufffdO6!D[\ufffdF\ufffd\ufffd\ufffd\ufffd\ufffd	\ufffd=\ufffdf\u0351\ufffdE\ufffd\ufffdk\ufffdj4ld\ufffd\ufffd	\ufffd\u06a5\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdz\ufffd\ufffd\ufffd&\ufffdV\ufffd\ufffd\ufffd\ufffd\ufffdF\ufffd\ufffd9[\ufffd\ufffdswQ\ufffd\ufffd\ufffdQ\ufffdF\ufffd/\ufffd [
 ]2\ufffdL\ufffd\ufffd\ufffdf\ufffdY50Y\ufffdl\ufffdl\ufffdl\ufffd\ufffdh\ufffd|\ufffdN\ufffd5~\ufffdy\ufffd\ufffd\ufffd
Y\ufffdl\ufffd\u033b\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd``\ufffd|\u0644Y~Q\ufffd\ufffd\ufffd\ufffd}\ufffdF\ufffd5@\ufffd\ufffdh\ufffd\ufffdGk\ufffd>Z#\ufffd\ufffd\ufffd\ufffd\ufffd}\ufffdF\ufffd5@\ufffd\ufffdh\ufffd\u0427\ufffd\ufffd4!\ufffdB!S\ufffdY\ufffd\ufffd\ufffdH!\ufffdBtBk$\ufffdB!\ufffd\ufffd5B!\ufffd\ufffd\ufffd	!\ufffdB\ufffd~h\ufffd\ufffdB!D?\ufffd[\ufffd\ufffd!\ufffdB\ufffdP`6\ufffd\ufffd\ufffd\ufffd|
 endstream
 endobj
-251 0 obj
+250 0 obj
 << /Length 3154
 >>
 stream
@@ -24459,25 +25017,25 @@ Q
 
 endstream
 endobj
-252 0 obj
+251 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 251 0 R
+/Contents 250 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/XObject << /I49 250 0 R
-/I50 254 0 R
-/Stamp1 687 0 R
+/XObject << /I49 249 0 R
+/I50 253 0 R
+/Stamp1 686 0 R
 >>
 /Font << /F1.0 8 0 R
 /F2.0 18 0 R
 /F5.0 53 0 R
 >>
 >>
-/Annots [253 0 R 255 0 R]
+/Annots [252 0 R 254 0 R]
 >>
 endobj
-253 0 obj
+252 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -24488,7 +25046,7 @@ endobj
 /Type /Annot
 >>
 endobj
-254 0 obj
+253 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 234
@@ -24540,7 +25098,7 @@ aC
 Un\ufffd\u06b5\ufffd\ufffdk8r\ufffd\ufffd\ufffd\ufffdZ888\ufffd\ufffdg\ufffd}\ufffd\ufffd[IxU\a\ufffd5Ju\ufffd\ufffd\ufffd
6,\ufffd\ufffd\ufffd\ufffd\u06fe}{\ufffd3\ufffd"\ufffd=^\ufffdQ\ufffd\ufffd\ufffd\ufffd\ufffdF\ufffd?w"\u0305\ufffd\ufffd\ufffd\ufffd^r\ufffd
 endstream
 endobj
-255 0 obj
+254 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -24551,10 +25109,10 @@ endobj
 /Type /Annot
 >>
 endobj
-256 0 obj
-[252 0 R /XYZ 0 289.4545284116824 null]
+255 0 obj
+[251 0 R /XYZ 0 289.4545284116824 null]
 endobj
-257 0 obj
+256 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 555
@@ -24745,7 +25303,7 @@ b5
 \ufffd\ufffdi\ufffdLG\ufffd\u06ed\ufffdB\\ufffd\ufffd\W\ufffdA\ufffd\ufffd\uc6fa\ufffd\ufffd\ufffdc\ufffd'\ufffd\ufffd\ufffdZ\ufffd\ufffd\u0521G\u0742\ufffd\ufffd\ufffd\ufffd+O=3\ufffdc\\\FF\ufffdhO\ufffd\ufffd>\ufffd\ufffd/\ufffd\ufffd{\ufffd=\ufffd\ufffd\ufffd
!\ufffd\ufffdO\ufffd\ufffd\ufffd\ufffd?\ufffd4\ufffd\ufffdG?\ufffdO\ufffdK\ufffd\ufffd8T\ufffd$\ufffd|\u03bc?y\ufffd?\ufffd\ufffdR\ufffd,W\ufffd\ufffdI\ufffd_?{\u046a?\ufffd\ufffdS\ufffd>I|\ufffd/\ufffd?}\ufffdNKg\ufffd\ufffd\ufffd(\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd3\ufffdro-Z\ufffde\ufffd\u020e\ufffdv\ufffd\ufffd\ufffd&\ufffd\ufffd
 endstream
 endobj
-258 0 obj
+257 0 obj
 << /Length 2140
 >>
 stream
@@ -24871,25 +25429,25 @@ Q
 
 endstream
 endobj
-259 0 obj
+258 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 258 0 R
+/Contents 257 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/XObject << /I51 257 0 R
-/I52 262 0 R
-/Stamp1 687 0 R
+/XObject << /I51 256 0 R
+/I52 261 0 R
+/Stamp1 686 0 R
 >>
 /Font << /F2.0 18 0 R
 /F1.0 8 0 R
 /F5.0 53 0 R
 >>
 >>
-/Annots [260 0 R 263 0 R]
+/Annots [259 0 R 262 0 R]
 >>
 endobj
-260 0 obj
+259 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -24900,10 +25458,10 @@ endobj
 /Type /Annot
 >>
 endobj
-261 0 obj
-[259 0 R /XYZ 0 477.1462929061785 null]
+260 0 obj
+[258 0 R /XYZ 0 477.1462929061785 null]
 endobj
-262 0 obj
+261 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 198
@@ -24990,7 +25548,7 @@ $
  P a\ufffd@\ufffd;\ufffd@\ufffd\ufffd+P\ufffdE\ufffd\ufffd\ufffdY
 endstream
 endobj
-263 0 obj
+262 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -25001,7 +25559,7 @@ endobj
 /Type /Annot
 >>
 endobj
-264 0 obj
+263 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 458
@@ -25127,7 +25685,7 @@ e(
 [+b\ufffdjvv\ufffd\ufffd\u0673'\ufffd9u\ufffd\ufffd\ufffd_\ufffd\ufffd\ufffdP\ufffd\ufffdEd\ufffdm\ufffd\ufffdvk\ufffd^(\ufffd\ufffd\ufffd|\ufffd\ufffd*	\ufffd0\ufffd\ufffd/o\ufffd\ufffd8\ufffd\ufffd\ufffdj\ufffd\ufffd
 endstream
 endobj
-265 0 obj
+264 0 obj
 << /Length 1594
 >>
 stream
@@ -25216,23 +25774,23 @@ Q
 
 endstream
 endobj
-266 0 obj
+265 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 265 0 R
+/Contents 264 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/XObject << /I53 264 0 R
-/I54 268 0 R
-/Stamp1 687 0 R
+/XObject << /I53 263 0 R
+/I54 267 0 R
+/Stamp1 686 0 R
 >>
 /Font << /F1.0 8 0 R
 >>
 >>
-/Annots [267 0 R 269 0 R]
+/Annots [266 0 R 268 0 R]
 >>
 endobj
-267 0 obj
+266 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -25243,7 +25801,7 @@ endobj
 /Type /Annot
 >>
 endobj
-268 0 obj
+267 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 543
@@ -25399,7 +25957,7 @@ K<
 \ufffd\u06121KD\ufffd\ufffdi\ufffd|p\ufffd.\ufffd}\ufffd\ue858\ufffd\ufffdMaD\ufffd]d27T\ufffd\ufffd\ufffd;\ufffd\ufffdQ`\ufffd\ufffd \ufffdOO\ufffdH\ufffd\ufffd\ufffdXP	8\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd]\ufffd\ufffd
 endstream
 endobj
-269 0 obj
+268 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -25410,7 +25968,7 @@ endobj
 /Type /Annot
 >>
 endobj
-270 0 obj
+269 0 obj
 << /Length 9906
 >>
 stream
@@ -25931,30 +26489,30 @@ Q
 
 endstream
 endobj
-271 0 obj
+270 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 270 0 R
+/Contents 269 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 18 0 R
 /F1.0 8 0 R
 /F5.0 53 0 R
 /F3.1 39 0 R
 >>
-/XObject << /Stamp1 687 0 R
+/XObject << /Stamp1 686 0 R
 >>
 >>
-/Annots [274 0 R 278 0 R 279 0 R]
+/Annots [273 0 R 277 0 R 278 0 R]
 >>
 endobj
+271 0 obj
+[270 0 R /XYZ 0 841.89 null]
+endobj
 272 0 obj
-[271 0 R /XYZ 0 841.89 null]
+[270 0 R /XYZ 0 682.2900000000001 null]
 endobj
 273 0 obj
-[271 0 R /XYZ 0 682.2900000000001 null]
-endobj
-274 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -25965,18 +26523,18 @@ endobj
 /Type /Annot
 >>
 endobj
-275 0 obj
-[271 0 R /XYZ 0 534.1100000000002 null]
+274 0 obj
+[270 0 R /XYZ 0 534.1100000000002 null]
 endobj
-276 0 obj
+275 0 obj
 << /Limits [(adding-new-files) (if-your-pull-request-is-accepted)]
-/Names [(adding-new-files) 430 0 R (advanced) 275 0 R (alternative-workflow-jira-patches) 379 0 R (backing-up-a-local-branch) 438 0 R (bash-functions) 471 0 R (callouts) 480 0 R (code-_repos-txt-code) 468 0 R (commit-messages) 396 0 R (common-workflows) 435 0 R (create-a-topic-branch) 408 0 R (creating-the-patch-file) 400 0 R (deleting-files) 431 0 R (future-thoughts) 563 0 R (if-accidentally-push-to-remote) 449 0 R (if-you-ve-accidentally-worked-on-code-master-code-branch) 453 0 R (if-you-ve-forgotten-to-prefix-your-commits-but-not-pushed) 454 0 R (if-your-pull-request-is-accepted) 417 0 R]
+/Names [(adding-new-files) 429 0 R (advanced) 274 0 R (alternative-workflow-jira-patches) 378 0 R (backing-up-a-local-branch) 437 0 R (bash-functions) 470 0 R (callouts) 479 0 R (code-_repos-txt-code) 467 0 R (commit-messages) 395 0 R (common-workflows) 434 0 R (create-a-topic-branch) 407 0 R (creating-the-patch-file) 399 0 R (deleting-files) 430 0 R (future-thoughts) 562 0 R (if-accidentally-push-to-remote) 448 0 R (if-you-ve-accidentally-worked-on-code-master-code-branch) 452 0 R (if-you-ve-forgotten-to-prefix-your-commits-but-not-pushed) 453 0 R (if-your-pull-request-is-accepted) 416 0 R]
 >>
 endobj
-277 0 obj
-[271 0 R /XYZ 0 457.27000000000027 null]
+276 0 obj
+[270 0 R /XYZ 0 457.27000000000027 null]
 endobj
-278 0 obj
+277 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -25987,7 +26545,7 @@ endobj
 /Type /Annot
 >>
 endobj
-279 0 obj
+278 0 obj
 << /Border [0 0 0]
 /Dest (_dg_ide_intellij_advanced_dcevm)
 /Subtype /Link
@@ -25995,7 +26553,7 @@ endobj
 /Type /Annot
 >>
 endobj
-280 0 obj
+279 0 obj
 << /Length 8817
 >>
 stream
@@ -26513,33 +27071,33 @@ Q
 
 endstream
 endobj
-281 0 obj
+280 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 280 0 R
+/Contents 279 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 18 0 R
 /F1.0 8 0 R
 /F5.0 53 0 R
 >>
-/XObject << /I55 286 0 R
-/Stamp1 687 0 R
+/XObject << /I55 285 0 R
+/Stamp1 686 0 R
 >>
 >>
-/Annots [285 0 R 287 0 R 288 0 R 289 0 R 290 0 R 291 0 R 293 0 R]
+/Annots [284 0 R 286 0 R 287 0 R 288 0 R 289 0 R 290 0 R 292 0 R]
 >>
 endobj
+281 0 obj
+[280 0 R /XYZ 0 841.89 null]
+endobj
 282 0 obj
-[281 0 R /XYZ 0 841.89 null]
+[280 0 R /XYZ 0 765.1700000000001 null]
 endobj
 283 0 obj
-[281 0 R /XYZ 0 765.1700000000001 null]
+[280 0 R /XYZ 0 697.3100000000002 null]
 endobj
 284 0 obj
-[281 0 R /XYZ 0 697.3100000000002 null]
-endobj
-285 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -26550,7 +27108,7 @@ endobj
 /Type /Annot
 >>
 endobj
-286 0 obj
+285 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 388
@@ -26621,7 +27179,7 @@ l6h
 \ufffd\ufffd\ufffd\ufffd<\ufffdB@@@@p/\ufffd\ufffd\ufffd\ufffd?\ufffd\ufffd`1
 endstream
 endobj
-287 0 obj
+286 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -26632,7 +27190,7 @@ endobj
 /Type /Annot
 >>
 endobj
-288 0 obj
+287 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -26643,7 +27201,7 @@ endobj
 /Type /Annot
 >>
 endobj
-289 0 obj
+288 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -26654,7 +27212,7 @@ endobj
 /Type /Annot
 >>
 endobj
-290 0 obj
+289 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -26665,7 +27223,7 @@ endobj
 /Type /Annot
 >>
 endobj
-291 0 obj
+290 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -26676,10 +27234,10 @@ endobj
 /Type /Annot
 >>
 endobj
-292 0 obj
-[281 0 R /XYZ 0 229.5249105367798 null]
+291 0 obj
+[280 0 R /XYZ 0 229.5249105367798 null]
 endobj
-293 0 obj
+292 0 obj
 << /Border [0 0 0]
 /Dest (_dg_contributing)
 /Subtype /Link
@@ -26687,8 +27245,8 @@ endobj
 /Type /Annot
 >>
 endobj
-294 0 obj
-<< /Length 17165
+293 0 obj
+<< /Length 14937
 >>
 stream
 q
@@ -26771,18 +27329,7 @@ Q
 BT
 59.24 730.205 Td
 /F5.0 11 Tf
-<67697420636f6e66696720757365722e6e616d6520> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-174.74 730.205 Td
-/F5.0 11 Tf
-<223c693e4d79204e616d6520486572653c2f693e22> Tj
+<67697420636f6e66696720757365722e6e616d6520223c693e4d79204e616d6520486572653c2f693e22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -26935,18 +27482,7 @@ Q
 BT
 77.24000000000001 595.3850000000001 Td
 /F5.0 11 Tf
-<67697420636f6e66696720636f72652e6175746f63726c6620> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.200 0.533 scn
-0.000 0.200 0.533 SCN
-
-BT
-214.74 595.3850000000001 Td
-/F5.0 11 Tf
-<74727565> Tj
+<67697420636f6e66696720636f72652e6175746f63726c662074727565> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -27130,18 +27666,7 @@ Q
 BT
 59.24000000000001 377.00500000000017 Td
 /F5.0 11 Tf
-<67697420636f6e66696720636f72652e7361666563726c6620> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.200 0.533 scn
-0.000 0.200 0.533 SCN
-
-BT
-196.74 377.00500000000017 Td
-/F5.0 11 Tf
-<74727565> Tj
+<67697420636f6e66696720636f72652e7361666563726c662074727565> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -27336,40 +27861,7 @@ Q
 BT
 59.24000000000001 225.36500000000015 Td
 /F5.0 11 Tf
-<5b> 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
-64.74000000000001 225.36500000000015 Td
-/F5.0 11 Tf
-<72656d6f746520> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-103.24000000000001 225.36500000000015 Td
-/F5.0 11 Tf
-<226f726967696e22> 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
-147.24 225.36500000000015 Td
-/F5.0 11 Tf
-<5d> Tj
+<5b72656d6f746520226f726967696e225d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -27380,29 +27872,7 @@ ET
 BT
 59.24000000000001 210.62500000000017 Td
 /F5.0 11 Tf
-<ca20202075726c20> 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
-103.24000000000001 210.62500000000017 Td
-/F5.0 11 Tf
-<3d> 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
-108.74000000000001 210.62500000000017 Td
-/F5.0 11 Tf
-<202e2e2e207768617465766572202e2e2e> Tj
+<ca20202075726c203d202e2e2e207768617465766572202e2e2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -27413,29 +27883,7 @@ ET
 BT
 59.24000000000001 195.88500000000016 Td
 /F5.0 11 Tf
-<ca202020666574636820> 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
-114.24000000000001 195.88500000000016 Td
-/F5.0 11 Tf
-<3d> 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
-119.74000000000001 195.88500000000016 Td
-/F5.0 11 Tf
-<202e2e2e207768617465766572202e2e2e> Tj
+<ca2020206665746368203d202e2e2e207768617465766572202e2e2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -27446,62 +27894,7 @@ ET
 BT
 59.24000000000001 181.14500000000015 Td
 /F5.0 11 Tf
-<ca202020666574636820> 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
-114.24000000000001 181.14500000000015 Td
-/F5.0 11 Tf
-<3d> 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
-119.74000000000001 181.14500000000015 Td
-/F5.0 11 Tf
-<202b726566732f746167732f> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
-
-BT
-185.74 181.14500000000015 Td
-/F6.0 11 Tf
-<2a> 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
-191.24 181.14500000000015 Td
-/F5.0 11 Tf
-<3a726566732f746167732f6f726967696e2f> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
-
-BT
-290.24 181.14500000000015 Td
-/F6.0 11 Tf
-<2a> Tj
+<ca2020206665746368203d202b726566732f746167732f2a3a726566732f746167732f6f726967696e2f2a> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -27698,27 +28091,26 @@ Q
 
 endstream
 endobj
-295 0 obj
+294 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 294 0 R
+/Contents 293 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 18 0 R
 /F1.0 8 0 R
 /F5.0 53 0 R
-/F6.0 184 0 R
 >>
-/XObject << /Stamp1 687 0 R
+/XObject << /Stamp1 686 0 R
 >>
 >>
-/Annots [297 0 R 298 0 R]
+/Annots [296 0 R 297 0 R]
 >>
 endobj
-296 0 obj
-[295 0 R /XYZ 0 841.89 null]
+295 0 obj
+[294 0 R /XYZ 0 841.89 null]
 endobj
-297 0 obj
+296 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -27729,7 +28121,7 @@ endobj
 /Type /Annot
 >>
 endobj
-298 0 obj
+297 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -27740,7 +28132,7 @@ endobj
 /Type /Annot
 >>
 endobj
-299 0 obj
+298 0 obj
 << /Length 12563
 >>
 stream
@@ -27800,7 +28192,7 @@ ET
 
 BT
 113.49000000000001 737.666 Td
-/F8.0 10.5 Tf
+/F7.0 10.5 Tf
 <636f6d6d616e64> Tj
 ET
 
@@ -28482,40 +28874,40 @@ Q
 
 endstream
 endobj
-300 0 obj
+299 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 299 0 R
+/Contents 298 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 18 0 R
 /F1.0 8 0 R
 /F5.0 53 0 R
-/F8.0 302 0 R
+/F7.0 301 0 R
 /F4.0 44 0 R
 /F3.1 39 0 R
 >>
-/XObject << /Stamp1 687 0 R
+/XObject << /Stamp1 686 0 R
 >>
 >>
-/Annots [303 0 R 304 0 R 305 0 R 306 0 R 308 0 R 309 0 R 311 0 R]
+/Annots [302 0 R 303 0 R 304 0 R 305 0 R 307 0 R 308 0 R 310 0 R]
 >>
 endobj
-301 0 obj
-[300 0 R /XYZ 0 841.89 null]
+300 0 obj
+[299 0 R /XYZ 0 841.89 null]
 endobj
-302 0 obj
+301 0 obj
 << /Type /Font
-/BaseFont /AAAAAP+mplus1mn-italic
+/BaseFont /AAAAAN+mplus1mn-italic
 /Subtype /TrueType
-/FontDescriptor 777 0 R
+/FontDescriptor 772 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 779 0 R
-/ToUnicode 778 0 R
+/Widths 774 0 R
+/ToUnicode 773 0 R
 >>
 endobj
-303 0 obj
+302 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -28526,7 +28918,7 @@ endobj
 /Type /Annot
 >>
 endobj
-304 0 obj
+303 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -28537,7 +28929,7 @@ endobj
 /Type /Annot
 >>
 endobj
-305 0 obj
+304 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -28548,7 +28940,7 @@ endobj
 /Type /Annot
 >>
 endobj
-306 0 obj
+305 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -28559,10 +28951,10 @@ endobj
 /Type /Annot
 >>
 endobj
-307 0 obj
-[300 0 R /XYZ 0 418.49000000000035 null]
+306 0 obj
+[299 0 R /XYZ 0 418.49000000000035 null]
 endobj
-308 0 obj
+307 0 obj
 << /Border [0 0 0]
 /Dest (_cgcom_cutting-a-release)
 /Subtype /Link
@@ -28570,7 +28962,7 @@ endobj
 /Type /Annot
 >>
 endobj
-309 0 obj
+308 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -28581,10 +28973,10 @@ endobj
 /Type /Annot
 >>
 endobj
-310 0 obj
-[300 0 R /XYZ 0 227.7300000000003 null]
+309 0 obj
+[299 0 R /XYZ 0 227.7300000000003 null]
 endobj
-311 0 obj
+310 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -28595,8 +28987,8 @@ endobj
 /Type /Annot
 >>
 endobj
-312 0 obj
-<< /Length 18068
+311 0 obj
+<< /Length 17640
 >>
 stream
 q
@@ -28630,24 +29022,24 @@ h
 S
 Q
 /DeviceRGB cs
-0.800 0.000 0.000 scn
+0.200 0.200 0.200 scn
 /DeviceRGB CS
-0.800 0.000 0.000 SCN
+0.200 0.200 0.200 SCN
 
 BT
 59.24 783.0649999999999 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <3c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d2255544638223f3e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 59.24 768.3249999999999 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <3c746f6f6c636861696e733e> Tj
 ET
 
@@ -28664,12 +29056,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 81.24000000000001 753.585 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <3c746f6f6c636861696e3e> Tj
 ET
 
@@ -28686,12 +29078,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 103.24000000000001 738.845 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <3c747970653e> Tj
 ET
 
@@ -28708,12 +29100,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 152.74 738.845 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <3c2f747970653e> Tj
 ET
 
@@ -28730,12 +29122,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 103.24000000000001 724.105 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <3c70726f76696465733e> Tj
 ET
 
@@ -28752,12 +29144,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 125.24000000000001 709.365 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <3c76657273696f6e3e> Tj
 ET
 
@@ -28774,12 +29166,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 191.24 709.365 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <3c2f76657273696f6e3e> Tj
 ET
 
@@ -28796,12 +29188,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 125.24000000000001 694.625 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <3c76656e646f723e> Tj
 ET
 
@@ -28818,12 +29210,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 202.24 694.625 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <3c2f76656e646f723e> Tj
 ET
 
@@ -28840,12 +29232,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 103.24000000000001 679.885 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <3c2f70726f76696465733e> Tj
 ET
 
@@ -28862,12 +29254,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 103.24000000000001 665.145 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <3c636f6e66696775726174696f6e3e> Tj
 ET
 
@@ -28884,12 +29276,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 125.24000000000001 650.405 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <3c6a646b486f6d653e> Tj
 ET
 
@@ -28906,12 +29298,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 317.74 650.405 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <3c2f6a646b486f6d653e> Tj
 ET
 
@@ -28928,8 +29320,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.600 0.600 0.600 scn
+0.600 0.600 0.600 SCN
 
 BT
 125.24000000000001 635.665 Td
@@ -28939,8 +29331,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.600 0.600 0.600 scn
+0.600 0.600 0.600 SCN
 
 BT
 59.24 620.925 Td
@@ -28950,8 +29342,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.600 0.600 0.600 scn
+0.600 0.600 0.600 SCN
 
 BT
 59.24 606.185 Td
@@ -28972,12 +29364,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 103.24000000000001 591.4449999999999 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <3c2f636f6e66696775726174696f6e3e> Tj
 ET
 
@@ -28994,12 +29386,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 81.24000000000001 576.7049999999999 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <3c2f746f6f6c636861696e3e> Tj
 ET
 
@@ -29016,12 +29408,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 81.24000000000001 561.9649999999999 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <3c746f6f6c636861696e3e> Tj
 ET
 
@@ -29038,12 +29430,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 103.24000000000001 547.2249999999999 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <3c747970653e> Tj
 ET
 
@@ -29060,12 +29452,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 152.74 547.2249999999999 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <3c2f747970653e> Tj
 ET
 
@@ -29082,12 +29474,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 103.24000000000001 532.4849999999999 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <3c70726f76696465733e> Tj
 ET
 
@@ -29104,12 +29496,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 125.24000000000001 517.7449999999999 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <3c76657273696f6e3e> Tj
 ET
 
@@ -29126,12 +29518,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 191.24 517.7449999999999 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <3c2f76657273696f6e3e> Tj
 ET
 
@@ -29170,12 +29562,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 125.24000000000001 503.00499999999994 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <3c76656e646f723e> Tj
 ET
 
@@ -29192,12 +29584,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 202.24 503.00499999999994 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <3c2f76656e646f723e> Tj
 ET
 
@@ -29214,12 +29606,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 103.24000000000001 488.26499999999993 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <3c2f70726f76696465733e> Tj
 ET
 
@@ -29236,12 +29628,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 103.24000000000001 473.5249999999999 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <3c636f6e66696775726174696f6e3e> Tj
 ET
 
@@ -29258,12 +29650,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 125.24000000000001 458.7849999999999 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <3c6a646b486f6d653e> Tj
 ET
 
@@ -29280,12 +29672,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 317.74 458.7849999999999 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <3c2f6a646b486f6d653e> Tj
 ET
 
@@ -29302,8 +29694,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.600 0.600 0.600 scn
+0.600 0.600 0.600 SCN
 
 BT
 125.24000000000001 444.0449999999999 Td
@@ -29313,8 +29705,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.600 0.600 0.600 scn
+0.600 0.600 0.600 SCN
 
 BT
 59.24 429.3049999999999 Td
@@ -29324,8 +29716,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.600 0.600 0.600 scn
+0.600 0.600 0.600 SCN
 
 BT
 59.24 414.5649999999999 Td
@@ -29346,12 +29738,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 103.24000000000001 399.8249999999999 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <3c2f636f6e66696775726174696f6e3e> Tj
 ET
 
@@ -29368,23 +29760,23 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 81.24000000000001 385.08499999999987 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <3c2f746f6f6c636861696e3e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 59.24 370.34499999999986 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <3c2f746f6f6c636861696e733e> Tj
 ET
 
@@ -29593,46 +29985,13 @@ f
 h
 S
 Q
-0.000 0.200 0.533 scn
-0.000 0.200 0.533 SCN
-
-BT
-59.239999999999995 176.40499999999983 Td
-/F5.0 11 Tf
-<6578706f727420> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-97.74 176.40499999999983 Td
-/F5.0 11 Tf
-<4d4156454e5f4f505453> 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
-152.74 176.40499999999983 Td
-/F5.0 11 Tf
-<3d> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-158.24 176.40499999999983 Td
+59.239999999999995 176.40499999999983 Td
 /F5.0 11 Tf
-<222d586d733531326d202d586d78313032346d22> Tj
+<6578706f7274204d4156454e5f4f5054533d222d586d733531326d202d586d78313032346d22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -29754,45 +30113,44 @@ Q
 
 endstream
 endobj
-313 0 obj
+312 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 312 0 R
+/Contents 311 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F6.0 184 0 R
-/F5.0 53 0 R
-/F5.1 314 0 R
+/Font << /F5.0 53 0 R
+/F5.1 313 0 R
 /F1.0 8 0 R
 /F2.0 18 0 R
 /F3.1 39 0 R
 >>
-/XObject << /Stamp1 687 0 R
+/XObject << /Stamp1 686 0 R
 >>
 >>
-/Annots [317 0 R]
+/Annots [316 0 R]
 >>
 endobj
-314 0 obj
+313 0 obj
 << /Type /Font
-/BaseFont /AAAAAQ+mplus1mn-regular
+/BaseFont /AAAAAO+mplus1mn-regular
 /Subtype /TrueType
-/FontDescriptor 781 0 R
+/FontDescriptor 776 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 783 0 R
-/ToUnicode 782 0 R
+/Widths 778 0 R
+/ToUnicode 777 0 R
 >>
 endobj
-315 0 obj
-[313 0 R /XYZ 0 294.8699999999999 null]
+314 0 obj
+[312 0 R /XYZ 0 294.8699999999999 null]
 endobj
-316 0 obj
+315 0 obj
 << /Limits [(_dg_contributing) (_dg_ide_intellij_coding-standards)]
-/Names [(_dg_contributing) 361 0 R (_dg_git-cookbook) 425 0 R (_dg_ide) 37 0 R (_dg_ide_eclipse) 225 0 R (_dg_ide_eclipse_editor-templates) 232 0 R (_dg_ide_eclipse_importing-the-project) 237 0 R (_dg_ide_eclipse_screencast) 229 0 R (_dg_ide_intellij) 38 0 R (_dg_ide_intellij_advanced) 179 0 R (_dg_ide_intellij_advanced_dcevm) 206 0 R (_dg_ide_intellij_advanced_gradle-compile-enhance) 180 0 R (_dg_ide_intellij_advanced_gradle-liveReload) 193 0 R (_dg_ide_intellij_coding-standards) 82 0 R]
+/Names [(_dg_contributing) 360 0 R (_dg_git-cookbook) 424 0 R (_dg_ide) 37 0 R (_dg_ide_eclipse) 224 0 R (_dg_ide_eclipse_editor-templates) 231 0 R (_dg_ide_eclipse_importing-the-project) 236 0 R (_dg_ide_eclipse_screencast) 228 0 R (_dg_ide_intellij) 38 0 R (_dg_ide_intellij_advanced) 179 0 R (_dg_ide_intellij_advanced_dcevm) 205 0 R (_dg_ide_intellij_advanced_gradle-compile-enhance) 180 0 R (_dg_ide_intellij_advanced_gradle-liveReload) 192 0 R (_dg_ide_intellij_coding-standards) 82 0 R]
 >>
 endobj
-317 0 obj
+316 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -29803,8 +30161,8 @@ endobj
 /Type /Annot
 >>
 endobj
-318 0 obj
-<< /Length 14785
+317 0 obj
+<< /Length 14378
 >>
 stream
 q
@@ -30024,46 +30382,13 @@ f
 h
 S
 Q
-0.000 0.200 0.533 scn
-0.000 0.200 0.533 SCN
-
-BT
-59.24 568.365 Td
-/F5.0 11 Tf
-<6578706f727420> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-97.74000000000001 568.365 Td
-/F5.0 11 Tf
-<4d4156454e5f4f505453> 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
-152.74 568.365 Td
-/F5.0 11 Tf
-<3d> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-158.24 568.365 Td
+59.24 568.365 Td
 /F5.0 11 Tf
-<222d586d733531326d202d586d78313032346d202d58583a2b546965726564436f6d70696c6174696f6e202d58583a54696572656453746f7041744c6576656c3d3122> Tj
+<6578706f7274204d4156454e5f4f5054533d222d586d733531326d202d586d78313032346d202d58583a2b546965726564436f6d70696c6174696f6e202d58583a54696572656453746f7041744c6576656c3d3122> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -30625,27 +30950,27 @@ Q
 
 endstream
 endobj
-319 0 obj
+318 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 318 0 R
+/Contents 317 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 18 0 R
 /F1.0 8 0 R
 /F5.0 53 0 R
 /F3.1 39 0 R
 >>
-/XObject << /Stamp1 687 0 R
+/XObject << /Stamp1 686 0 R
 >>
 >>
-/Annots [321 0 R 323 0 R 324 0 R 325 0 R 327 0 R]
+/Annots [320 0 R 322 0 R 323 0 R 324 0 R 326 0 R]
 >>
 endobj
-320 0 obj
-[319 0 R /XYZ 0 841.89 null]
+319 0 obj
+[318 0 R /XYZ 0 841.89 null]
 endobj
-321 0 obj
+320 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -30656,10 +30981,10 @@ endobj
 /Type /Annot
 >>
 endobj
-322 0 obj
-[319 0 R /XYZ 0 424.81000000000006 null]
+321 0 obj
+[318 0 R /XYZ 0 424.81000000000006 null]
 endobj
-323 0 obj
+322 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -30670,7 +30995,7 @@ endobj
 /Type /Annot
 >>
 endobj
-324 0 obj
+323 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -30681,7 +31006,7 @@ endobj
 /Type /Annot
 >>
 endobj
-325 0 obj
+324 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -30692,10 +31017,10 @@ endobj
 /Type /Annot
 >>
 endobj
-326 0 obj
-[319 0 R /XYZ 0 173.30999999999997 null]
+325 0 obj
+[318 0 R /XYZ 0 173.30999999999997 null]
 endobj
-327 0 obj
+326 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -30706,7 +31031,7 @@ endobj
 /Type /Annot
 >>
 endobj
-328 0 obj
+327 0 obj
 << /Length 2282
 >>
 stream
@@ -30843,22 +31168,22 @@ Q
 
 endstream
 endobj
-329 0 obj
+328 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 328 0 R
+/Contents 327 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F5.0 53 0 R
 /F1.0 8 0 R
 /F3.1 39 0 R
 >>
-/XObject << /Stamp1 687 0 R
+/XObject << /Stamp1 686 0 R
 >>
 >>
 >>
 endobj
-330 0 obj
+329 0 obj
 << /Length 13254
 >>
 stream
@@ -31571,26 +31896,26 @@ Q
 
 endstream
 endobj
-331 0 obj
+330 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 330 0 R
+/Contents 329 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 18 0 R
 /F1.0 8 0 R
 /F5.0 53 0 R
 >>
-/XObject << /Stamp1 687 0 R
+/XObject << /Stamp1 686 0 R
 >>
 >>
-/Annots [333 0 R 334 0 R 335 0 R 336 0 R 337 0 R 338 0 R 340 0 R]
+/Annots [332 0 R 333 0 R 334 0 R 335 0 R 336 0 R 337 0 R 339 0 R]
 >>
 endobj
-332 0 obj
-[331 0 R /XYZ 0 841.89 null]
+331 0 obj
+[330 0 R /XYZ 0 841.89 null]
 endobj
-333 0 obj
+332 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -31601,7 +31926,7 @@ endobj
 /Type /Annot
 >>
 endobj
-334 0 obj
+333 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -31612,7 +31937,7 @@ endobj
 /Type /Annot
 >>
 endobj
-335 0 obj
+334 0 obj
 << /Border [0 0 0]
 /Dest (_dg_asciidoc-templates)
 /Subtype /Link
@@ -31620,7 +31945,7 @@ endobj
 /Type /Annot
 >>
 endobj
-336 0 obj
+335 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -31631,7 +31956,7 @@ endobj
 /Type /Annot
 >>
 endobj
-337 0 obj
+336 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -31642,7 +31967,7 @@ endobj
 /Type /Annot
 >>
 endobj
-338 0 obj
+337 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -31653,10 +31978,10 @@ endobj
 /Type /Annot
 >>
 endobj
-339 0 obj
-[331 0 R /XYZ 0 575.1500000000001 null]
+338 0 obj
+[330 0 R /XYZ 0 575.1500000000001 null]
 endobj
-340 0 obj
+339 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -31667,10 +31992,10 @@ endobj
 /Type /Annot
 >>
 endobj
-341 0 obj
-[331 0 R /XYZ 0 491.51000000000016 null]
+340 0 obj
+[330 0 R /XYZ 0 491.51000000000016 null]
 endobj
-342 0 obj
+341 0 obj
 << /Length 12720
 >>
 stream
@@ -32383,27 +32708,27 @@ Q
 
 endstream
 endobj
-343 0 obj
+342 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 342 0 R
+/Contents 341 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 18 0 R
 /F1.0 8 0 R
 /F5.0 53 0 R
 /F3.1 39 0 R
 >>
-/XObject << /Stamp1 687 0 R
+/XObject << /Stamp1 686 0 R
 >>
 >>
-/Annots [345 0 R 346 0 R 350 0 R 351 0 R 352 0 R]
+/Annots [344 0 R 345 0 R 349 0 R 350 0 R 351 0 R]
 >>
 endobj
-344 0 obj
-[343 0 R /XYZ 0 841.89 null]
+343 0 obj
+[342 0 R /XYZ 0 841.89 null]
 endobj
-345 0 obj
+344 0 obj
 << /Border [0 0 0]
 /Dest (_dg_ide_intellij_live-templates)
 /Subtype /Link
@@ -32411,7 +32736,7 @@ endobj
 /Type /Annot
 >>
 endobj
-346 0 obj
+345 0 obj
 << /Border [0 0 0]
 /Dest (_dg_appendix_asciidoc-templates)
 /Subtype /Link
@@ -32419,16 +32744,16 @@ endobj
 /Type /Annot
 >>
 endobj
+346 0 obj
+[342 0 R /XYZ 0 699.2700000000001 null]
+endobj
 347 0 obj
-[343 0 R /XYZ 0 699.2700000000001 null]
+[342 0 R /XYZ 0 479.7700000000002 null]
 endobj
 348 0 obj
-[343 0 R /XYZ 0 479.7700000000002 null]
+[342 0 R /XYZ 0 380.35000000000014 null]
 endobj
 349 0 obj
-[343 0 R /XYZ 0 380.35000000000014 null]
-endobj
-350 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -32439,7 +32764,7 @@ endobj
 /Type /Annot
 >>
 endobj
-351 0 obj
+350 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -32450,7 +32775,7 @@ endobj
 /Type /Annot
 >>
 endobj
-352 0 obj
+351 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -32461,10 +32786,10 @@ endobj
 /Type /Annot
 >>
 endobj
-353 0 obj
-[343 0 R /XYZ 0 111.13000000000008 null]
+352 0 obj
+[342 0 R /XYZ 0 111.13000000000008 null]
 endobj
-354 0 obj
+353 0 obj
 << /Length 9481
 >>
 stream
@@ -33035,26 +33360,26 @@ Q
 
 endstream
 endobj
-355 0 obj
+354 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 354 0 R
+/Contents 353 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F5.0 53 0 R
 /F1.0 8 0 R
 /F2.0 18 0 R
 >>
-/XObject << /Stamp1 687 0 R
+/XObject << /Stamp1 686 0 R
 >>
 >>
-/Annots [357 0 R 358 0 R]
+/Annots [356 0 R 357 0 R]
 >>
 endobj
-356 0 obj
-[355 0 R /XYZ 0 425.42999999999995 null]
+355 0 obj
+[354 0 R /XYZ 0 425.42999999999995 null]
 endobj
-357 0 obj
+356 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -33065,7 +33390,7 @@ endobj
 /Type /Annot
 >>
 endobj
-358 0 obj
+357 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -33076,7 +33401,7 @@ endobj
 /Type /Annot
 >>
 endobj
-359 0 obj
+358 0 obj
 << /Length 8439
 >>
 stream
@@ -33607,27 +33932,27 @@ Q
 
 endstream
 endobj
-360 0 obj
+359 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 359 0 R
+/Contents 358 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 18 0 R
 /F1.0 8 0 R
 /F5.0 53 0 R
 >>
-/XObject << /I56 369 0 R
-/Stamp1 687 0 R
+/XObject << /I56 368 0 R
+/Stamp1 686 0 R
 >>
 >>
-/Annots [362 0 R 363 0 R 365 0 R 366 0 R

<TRUNCATED>

[37/44] isis-site git commit: ISIS-1594: provide an 'edit' button

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/guides/rgant.html
----------------------------------------------------------------------
diff --git a/content/guides/rgant.html b/content/guides/rgant.html
index 5baf362..b21b706 100644
--- a/content/guides/rgant.html
+++ b/content/guides/rgant.html
@@ -1,12 +1,10 @@
 <!doctype html>
 <html class="no-js" lang="en">
-<head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-
-    <title>Annotations</title>
-
-    <!--
+ <head> 
+  <meta charset="utf-8"> 
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"> 
+  <title>Annotations</title> 
+  <!--
         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
@@ -23,31 +21,21 @@
         KIND, either express or implied.  See the License for the
         specific language governing permissions and limitations
         under the License.
-    -->
-
-    <!-- No caching headers -->
-    <meta http-equiv="cache-control" content="no-cache" />
-    <meta http-equiv="pragma" content="no-cache" />
-    <meta http-equiv="expires" content="-1" />
-
-
-    <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
-    <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet" />
-    <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script>
-    <link href="../css/asciidoctor/colony.css" rel="stylesheet">
-    <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-
-
-
-    <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
-    <!--[if lt IE 9]>
+    --> 
+  <!-- No caching headers --> 
+  <meta http-equiv="cache-control" content="no-cache"> 
+  <meta http-equiv="pragma" content="no-cache"> 
+  <meta http-equiv="expires" content="-1"> 
+  <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line --> 
+  <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet"> 
+  <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script> 
+  <link href="../css/asciidoctor/colony.css" rel="stylesheet"> 
+  <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet"> 
+  <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet"> 
+  <!--[if lt IE 9]>
       <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
-    <![endif]-->
-
-
-
-    <style type="text/css">
+    <![endif]--> 
+  <style type="text/css">
         pre code {
             background-color: inherit;
             border-style: none;
@@ -192,9 +180,8 @@ table.CodeRay td.code>pre{padding:0}
         color:#fff;
         font-size: 1.1em;
     }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         @media only screen and (min-width: 40.063em) {
           .top-bar {
             .contain-to-grid .top-bar {
@@ -205,9 +192,8 @@ table.CodeRay td.code>pre{padding:0}
         .row {
             max-width: 80rem;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .extended-quote,
         .extended-quote-first {
             margin-left: 40px;
@@ -231,9 +217,8 @@ table.CodeRay td.code>pre{padding:0}
             text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
         }
         
-    </style>
-
-    <style>
+    </style> 
+  <style>
         body {
           position: relative;
         }
@@ -255,6 +240,7 @@ table.CodeRay td.code>pre{padding:0}
 
         div#doc-content {
             margin-top: 30px;
+            padding-top: 30px;
         }
 
         div.documentation-page table.frame-all {
@@ -286,9 +272,8 @@ table.CodeRay td.code>pre{padding:0}
             min-height: 2000px;
         }
 
-    </style>
-
-    <style>
+    </style> 
+  <style>
 
         @media only screen and (min-width: 768px) {
           #toc.toc2 ul ul { margin-left: -10px; }
@@ -316,15 +301,13 @@ table.CodeRay td.code>pre{padding:0}
         body div#toc2 li.tocify-item.active a {
             color: red;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         footer {
             margin-top: 1000px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* overriding colony.css stylesheet */
         .literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
            /*padding: 1.25em 1.5625em 1.125em 1.5625em;*/
@@ -372,9 +355,8 @@ table.CodeRay td.code>pre{padding:0}
         .imageblock img {
             margin-bottom: 10px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* from http://ben.balter.com/2014/03/13/pages-anchor-links/ */
         .header-link {
           position: absolute;
@@ -395,9 +377,8 @@ table.CodeRay td.code>pre{padding:0}
         h6:hover .header-link {
           opacity: 1;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .top-bar
         {
             -webkit-transition-duration: .5s;
@@ -425,1567 +406,1917 @@ table.CodeRay td.code>pre{padding:0}
             -webkit-transition-property: -webkit-transform;
             transition-property: transform;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         #doc-content a.guide {
             color: white;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .tocify {
             margin-top: 80px;
         }
-    </style>
-
-
-</script>
-
-</head>
-<body>
-
-<<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
-    <div class="github-fork-ribbon">
-        <a href="https://github.com/apache/isis#fork-destination-box">Fork me on GitHub</a>
-    </div>
-</div>
-
-
-<div class="row">
-
-    <div class="fixed contain-to-grid header">
-        <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
-            <ul class="title-area">
-                <li class="name">
-                    <h1>
-                        <a href="/index.html">Apache Isis&trade;</a>
-                    </h1>
-                </li>
-                <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
-                <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
-            </ul>
-
-            <section class="top-bar-section">
-                <ul class="right">
-
-                    <li class="has-form">
-                       <FORM class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
-                        <div class="row collapse">
-                            <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
-                            <INPUT type="hidden" name="cof" value="FORID:0">
-                            <INPUT class="form-control" name="q" type="text" placeholder="Search">
-                        </div>
-                    </FORM>
-                     </li>
-
-                </ul>
-
-                <!-- Left Nav Section -->
-                <ul class="left">
-
-                    <li><a href="/documentation.html">Documentation</a></li>
-                    <li><a href="/downloads.html">Downloads</a></li>
-                    <li><a href="/help.html">Help</a></li>
-                    <li><a href="/asf.html">@ASF</a></li>
-
-                </ul>
-
-            </section>
-        </nav>
-    </div>
-</div>
-
-<div class="row">
-
-    <div id="doc-content-left" class="large-9 medium-9 columns">
-
-
-        <div id="doc-content">
-          <div class="sect1">
-<h2 id="_rgant">1. Annotations</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>This guide describes the various annotations used by Apache Isis to provide additional metadata about the domain objects.
-Most of these are defined by Isis itself, but some are from other libraries.  It also identifies a number of
-annotations that are now deprecated, and indicates their replacement.</p>
-</div>
-<div class="sect2">
-<h3 id="_other_guides">1.1. Other Guides</h3>
-<div class="paragraph">
-<p>Apache Isis documentation is broken out into a number of user, reference and "supporting procedures" guides.</p>
-</div>
-<div class="paragraph">
-<p>The user guides available are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="ugfun.html">Fundamentals</a></p>
-</li>
-<li>
-<p><a href="ugvw.html">Wicket viewer</a></p>
-</li>
-<li>
-<p><a href="ugvro.html">Restful Objects viewer</a></p>
-</li>
-<li>
-<p><a href="ugdno.html">DataNucleus object store</a></p>
-</li>
-<li>
-<p><a href="ugsec.html">Security</a></p>
-</li>
-<li>
-<p><a href="ugtst.html">Testing</a></p>
-</li>
-<li>
-<p><a href="ugbtb.html">Beyond the Basics</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The reference guides are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="#">Annotations</a> (this guide)</p>
-</li>
-<li>
-<p><a href="rgsvc.html">Domain Services</a></p>
-</li>
-<li>
-<p><a href="rgcfg.html">Configuration Properties</a></p>
-</li>
-<li>
-<p><a href="rgcms.html">Classes, Methods and Schema</a></p>
-</li>
-<li>
-<p><a href="rgmvn.html">Apache Isis Maven plugin</a></p>
-</li>
-<li>
-<p><a href="rgfis.html">Framework Internal Services</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The remaining guides are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="dg.html">Developers' Guide</a> (how to set up a development environment
-for Apache Isis and contribute back to the project)</p>
-</li>
-<li>
-<p><a href="cgcom.html">Committers' Guide</a> (release procedures and related practices)</p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_examples">1.2. Examples</h3>
-<div class="paragraph">
-<p>To give just a few examples of annotations supported by Apache Isis:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>if a property is read-only, then this can be annotated with <code>@Property(editing=EditingDISABLED)</code>.</p>
-</li>
-<li>
-<p>if a class has a small fixed set of instances (eg a picklist), then it can be annotated using <code>@DomainObject(bounded=true)</code></p>
-</li>
-<li>
-<p>if a class is a domain service and should be automatically instantiated as a singleton, then it can be annotated using <code>@DomainService</code></p>
-</li>
-<li>
-<p>if an action is idempotent, then it can be annotated using <code>@Action(semantics=SemanticsOf.IDEMPOTENT)</code>.</p>
-</li>
-<li>
-<p>if an action parameter is optional, it can be annotated using <code>@Parameter(optionality=Optionality.OPTIONAL)</code></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>Some annotations act as UI hints, for example:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>if a collection should be rendered "open" rather than collapsed, it can be annotated using <code>@CollectionLayout(render=RenderType.EAGERLY)</code></p>
-</li>
-<li>
-<p>if an action has a tooltip, it can be annotated using <code>@ActionLayout(describedAs=&#8230;&#8203;)</code></p>
-</li>
-<li>
-<p>if a domain object is bookmarkable, it can be annotated using <code>@DomainObjectLayout(bookmarking=BookmarkPolicy.AS_ROOT</code>).</p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_rgant_aaa">2. Summary</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>This section summarizes the various annotations supported by Apache Isis.  They break out into five categories.</p>
-</div>
-<div class="sect2">
-<h3 id="_rgant_aaa_main">2.1. Core annotations</h3>
-<div class="paragraph">
-<p>In Apache Isis every domain object is either a domain entity, a view model or a domain service.  And each of these are made up of properties, collections and actions (domain services only have actions).</p>
-</div>
-<div class="paragraph">
-<p>For each of these domain types and members there are two annotations.  One covers the semantics intrinsic to the domain (eg whether an action parameter is optional or not), then other (suffix <code>&#8230;&#8203;Layout</code>) captures semantics relating to the UI/presentation layer.</p>
-</div>
-<div class="admonitionblock tip">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-tip" title="Tip"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>Most UI semantics can also be specified using <a href="ugfun.html#_ugfun_object-layout_dynamic">dynamic object layout</a>.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>The table below summarizes these most commonly used annotations in Apache Isis.</p>
-</div>
-<table class="tableblock frame-all grid-all spread">
-<caption class="title">Table 1. Core annotations for domain objects, services and members (as of 1.8.0)</caption>
-<colgroup>
-<col style="width: 25%;">
-<col style="width: 50%;">
-<col style="width: 12.5%;">
-<col style="width: 12.5%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">Annotation</th>
-<th class="tableblock halign-left valign-top">Purpose</th>
-<th class="tableblock halign-left valign-top">Layer</th>
-<th class="tableblock halign-left valign-top"><a href="ugfun.html#_ugfun_object-layout_dynamic">Dynamic layout</a>?</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgant-Action"><code>@Action</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Domain semantics for actions</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Domain</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgant-ActionLayout"><code>@ActionLayout</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>User interface hints for actions</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">UI</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Yes</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgant-Collection"><code>@Collection</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Domain semantics for collections</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Domain</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgant-CollectionLayout"><code>@CollectionLayout</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>User interface hints for collections</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">UI</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Yes</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgant-DomainObject"><code>@DomainObject</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Domain semantics for domain object (entities and optionally view models, see also <code>@ViewModel)</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Domain</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgant-DomainObjectLayout"><code>@DomainObjectLayout</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>User interface hints for domain object (entities and optionally view models, see also <code>@ViewModelLayout)</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">UI</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Yes</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgant-DomainService"><code>@DomainService</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Class is a domain service (rather than an entity or view model)</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Domain</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgant-DomainServiceLayout"><code>@DomainServiceLayout</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>User interface hints for domain services</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">UI</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgant-Parameter"><code>@Parameter</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Domain semantics for action parameters</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Domain</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgant-ParameterLayout"><code>@ParameterLayout</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Layout hints for an action parameter (currently: its label position either to top or the left).</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">UI</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Yes</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgant-Property"><code>@Property</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Domain semantics for properties</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Domain</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgant-PropertyLayout"><code>@PropertyLayout</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Layout hints for a property</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">UI</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Yes</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgant-ViewModel"><code>@ViewModel</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Specify that a class is a view model (as opposed to an entity or domain service); equivalent to <code>@DomainObject(nature</code>=VIEW_MODEL).</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Domain, Persistence</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgant-ViewModelLayout"><code>@ViewModelLayout</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>User interface hints for view models.
-For use with <code>@ViewModel</code>. If specifying view models using <code>@DomainObject(nature=VIEW_MODEL)</code> then use <code>@DomainObjectLayout</code>)</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">UI</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Yes</p></td>
-</tr>
-</tbody>
-</table>
-</div>
-<div class="sect2">
-<h3 id="_rgant_aaa_other">2.2. Other Isis Annotations</h3>
-<div class="paragraph">
-<p>These annotations are also commonly used, but relate <em>not</em> to objects or object members but instead to other aspects of the Apache Isis metamodel.</p>
-</div>
-<table class="tableblock frame-all grid-all spread">
-<caption class="title">Table 2. Other Isis Annotations</caption>
-<colgroup>
-<col style="width: 25%;">
-<col style="width: 50%;">
-<col style="width: 12.5%;">
-<col style="width: 12.5%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">Annotation</th>
-<th class="tableblock halign-left valign-top">Purpose</th>
-<th class="tableblock halign-left valign-top">Layer</th>
-<th class="tableblock halign-left valign-top"><a href="ugfun.html#_ugfun_object-layout_dynamic">Dynamic layout</a>?</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgant-Facets"><code>@Facets</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Install arbitrary facets within the Apache Isis metamodel.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">(any)</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgant-HomePage"><code>@HomePage</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Query-only action (on domain service) to be invoked, result of which is rendered as the user&#8217;s home page.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">UI</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgant-MemberOrder"><code>@MemberOrder</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Ordering of properties, collections and actions, and also associating actions with either a property or a collection.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">UI</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Yes</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgant-MinLength"><code>@MinLength</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Minimum number of characters required for an auto-complete search argument.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">UI</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgant-Programmatic"><code>@Programmatic</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Ignore a public method, excluded from the Apache Isis metamodel.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Domain</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-</tbody>
-</table>
-</div>
-<div class="sect2">
-<h3 id="_rgant_aaa_jee">2.3. JDO Annotations</h3>
-<div class="paragraph">
-<p>Apache Isis uses JDO/DataNucleus as its ORM, and infers some of its own metadata from the JDO annotations.</p>
-</div>
-<div class="admonitionblock warning">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-warning" title="Warning"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>Isis (currently) builds up metadata by parsing the JDO annotations from source, <em>not</em> by querying the JDO metamodel.  The upshot is that, for the annotations documented here at least, your domain entities must use JDO annotations rather than XML.</p>
-</div>
-<div class="paragraph">
-<p>Furthermore, note that although JDO (the property-related) annotations to be placed on either the field or on the getter, Apache Isis requires that annotations are placed on the getter.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>The table below lists the JDO annotations currently recognized by Apache Isis.</p>
-</div>
-<table class="tableblock frame-all grid-all spread">
-<caption class="title">Table 3. JDO Annotations</caption>
-<colgroup>
-<col style="width: 25%;">
-<col style="width: 50%;">
-<col style="width: 12.5%;">
-<col style="width: 12.5%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">Annotation</th>
-<th class="tableblock halign-left valign-top">Purpose</th>
-<th class="tableblock halign-left valign-top">Layer</th>
-<th class="tableblock halign-left valign-top">Applies to</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgant-Column"><code>@javax.jdo.annotations.</code><br>
-<code>Column</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Used to determine whether a property is mandatory or optional.  For <code>String</code> and <code>BigDecimal</code> properties, used to determine length/precision/scale.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Domain / persistence</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Property</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgant-Discriminator"><code>@javax.jdo.annotations.</code><br>
-<code>Discriminator</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Override for the object type, as used in `Bookmark`s, URLs for <a href="ugvro.html">RestfulObjects viewer</a> and elsewhere.<br></p>
-</div>
-<div class="paragraph">
-<p>Note that the discriminator overrides the object type that may otherwise be inferred from the <a href="#_rgant-PersistenceCapable"><code>@PersistenceCapable</code></a> annotation.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Domain / persistence</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Class</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgant-NotPersistent"><code>@javax.jdo.annotations.</code><br>
-<code>NotPersistent</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Used to determine whether to enforce or skip some <a href="ugbtb.html#_ugbtb_programming-model_custom-validator">metamodel validation</a> for <code>@Column</code> versus equivalent Isis annotations.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Domain / persistence</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Property</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgant-PersistenceCapable"><code>@javax.jdo.annotations.</code><br>
-<code>PersistenceCapable</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Used to build Apache Isis' own internal identifier for objects.<br></p>
-</div>
-<div class="paragraph">
-<p>If the <code>schema()</code> attribute is specified (and if <a href="#<em>rgant-Discriminator"><code>@Discriminator</code></a> _hasn&#8217;t</em> been specified), is also used to derive the object type, as used in `Bookmark`s, URLs for <a href="ugvro.html">RestfulObjects viewer</a> and elsewhere.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Domain / persistence</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Class</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgant-PrimaryKey"><code>@javax.jdo.annotations.</code><br>
-<code>PrimaryKey</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Used to ensure Apache Isis does not overwrite application-defined primary keys, and to ensure is read-only in the UI.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Domain / persistence</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Property</p></td>
-</tr>
-</tbody>
-</table>
-<div class="paragraph">
-<p>Isis also parses the following JDO annotations, but the metadata is currently unused.</p>
-</div>
-<table class="tableblock frame-all grid-all spread">
-<caption class="title">Table 4. JDO Annotations (unused within Apache Isis)</caption>
-<colgroup>
-<col style="width: 25%;">
-<col style="width: 50%;">
-<col style="width: 12.5%;">
-<col style="width: 12.5%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">Annotation</th>
-<th class="tableblock halign-left valign-top">Purpose</th>
-<th class="tableblock halign-left valign-top">Layer</th>
-<th class="tableblock halign-left valign-top">Applies to</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@javax.jdo.annotations.</code><br>
-<code>DataStoreIdentity</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Unused</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Persistence</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Class</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@javax.jdo.annotations.</code><br>
-<code>EmbeddedOnly</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Unused</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Persistence</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Class</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@javax.jdo.annotations.</code><br>
-<code>Query</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Unused</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Persistence</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Class</p></td>
-</tr>
-</tbody>
-</table>
-</div>
-<div class="sect2">
-<h3 id="_rgant_aaa_jee">2.4. Java EE Annotations</h3>
-<div class="paragraph">
-<p>While Apache Isis does, as of today, define a good number of its own annotations, the policy is to reuse standard Java/JEE annotations wherever they exist or are added to the Java platform.</p>
-</div>
-<div class="paragraph">
-<p>The table below lists the JEE annotations currently recognized.  Expect to see more added in future releases of Apache Isis.</p>
-</div>
-<table class="tableblock frame-all grid-all spread">
-<caption class="title">Table 5. Java EE Annotations</caption>
-<colgroup>
-<col style="width: 25%;">
-<col style="width: 50%;">
-<col style="width: 12.5%;">
-<col style="width: 12.5%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">Annotation</th>
-<th class="tableblock halign-left valign-top">Purpose</th>
-<th class="tableblock halign-left valign-top">Layer</th>
-<th class="tableblock halign-left valign-top"><a href="ugfun.html#_ugfun_object-layout_dynamic">Dynamic layout</a>?</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgant-Digits"><code>@javax.validation.</code><br>
-<code>constraints.</code><br>
-<code>Digits</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Precision/scale for BigDecimal values.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Domain</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgant-Inject"><code>@javax.inject.</code><br>
-<code>Inject</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Inject domain service into a domain object (entity or view model) or another domain service.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Domain</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgant-Digits"><code>@javax.annotation.</code><br>
-<code>Nullable</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Specify that a property/parameter is optional.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Domain</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgant-PostConstruct"><code>@javax.annotation.</code><br>
-<code>PostConstruct</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Callback for domain services (either singleton or <a href="#_rgant-RequestScoped">request-scoped</a>) to initialize themselves once instantiated.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Domain</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgant-PreDestroy"><code>@javax.annotation.</code><br>
-<code>PreDestroy</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Callback for domain services (either singleton or <a href="#_rgant-RequestScoped">request-scoped</a>) to clean up resources prior to destruction.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Domain</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgant-RequestScoped"><code>@javax.enterprise.</code><br>
-<code>context.</code><br>
-<code>RequestScoped</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Specify that a domain service has request-scope (rather than a singleton).</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Domain</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgant-XmlRootElement"><code>javax.xml.bind</code><br>
-<code>.annotation</code><br>
-<code>XmlRootElement</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>JAXB annotation indicating the XML root element when serialized to XML; also used by the framework for view models (whose memento is the XML), often also acting as a DTO.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Application</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgant-XmlJavaTypeAdapter"><code>javax.xml.bind</code><br>
-<code>.annotation</code><br>
-<code>XmlJavaTypeAdapter</code></a></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>JAXB annotation defining how to serialize an entity.  Used in conjunction with the (framework provided) <code>PersistentEntityAdapter</code> class to serialize persistent entities into a canonical OID (equivalent to the <code>Bookmark</code> provided by the <a href="rgsvc.html#_rgsvc_api_BookmarkService"><code>BookmarkService</code></a>).</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Domain</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-</tbody>
-</table>
-</div>
-<div class="sect2">
-<h3 id="_rgant_aaa_deprecated">2.5. Deprecated Annotations</h3>
-<div class="paragraph">
-<p>As Apache Isis has evolved and grown, we found ourselves adding more and more annotations; but most of these related to either an object type (entity, view model, service) or an object member (property, collection, action).
-Over time it became harder and harder for end programmers to discover these new features.</p>
-</div>
-<div class="paragraph">
-<p>Accordingly, (in v1.8.0) we decided to unify the semantics into the main (core) annotations listed <a href="#_rgant-aaa_main">above</a>.</p>
-</div>
-<div class="paragraph">
-<p>The annotations listed in the table below are still supported by Apache Isis, but will be retired in Apache Isis v2.0.</p>
-</div>
-<table class="tableblock frame-all grid-all spread">
-<caption class="title">Table 6. Deprecated Annotations</caption>
-<colgroup>
-<col style="width: 18.1818%;">
-<col style="width: 36.3636%;">
-<col style="width: 27.2727%;">
-<col style="width: 9.0909%;">
-<col style="width: 9.091%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">Annotation</th>
-<th class="tableblock halign-left valign-top">Purpose</th>
-<th class="tableblock halign-left valign-top">Use instead</th>
-<th class="tableblock halign-left valign-top">Layer</th>
-<th class="tableblock halign-left valign-top"><a href="ugfun.html#_ugfun_object-layout_dynamic">Dynamic layout</a>?</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@ActionOrder</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Order of buttons and menu items representing actions.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="#_rgant-MemberOrder"><code>@MemberOrder</code></a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">UI</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Yes</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@ActionInteraction</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Enable subscribers on the Event Bus Service to either veto, validate or take further steps before/after an action has been invoked.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="#_rgant-Action_domainEvent"><code>@Action#domainEvent()</code></a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Domain</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@ActionSemantics</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Query-only, idempotent or non-idempotent.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="#_rgant-Action_semantics"><code>@Action#semantics()</code></a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Domain</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@Audited</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Audit changes to an object.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="#_rgant-DomainObject_auditing"><code>@DomainObject#</code><br>
-<code>auditing()</code></a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Domain</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@AutoComplete</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Repository method to search for entities</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="#_rgant-DomainObject_autoCompleteRepository"><code>@DomainObject</code><br>
-<code>#autoCompleteRepository()</code></a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">UI/Domain</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@Bookmarkable</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Whether (and how) to create a bookmark for visited object.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="#_rgant-DomainObjectLayout_bookmarking"><code>@DomainObjectLayout</code><br>
-<code>#bookmarking()</code></a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">UI</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@Bounded</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Bounded (and limited) number of instances of an entity type, translates into a drop-down for any property of that type.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="#_rgant-DomainObject_bounded"><code>@DomainObject#bounded()</code></a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Domain</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@Bulk</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Indicates an action is a bulk action, can be applied to multiple instances.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="#_rgant-Action_invokeOn"><code>@Action#invokeOn()</code></a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">UI, Domain</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@CollectionInteraction</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Enable subscribers on the Event Bus Service to either veto, validate or take further steps before/after a collection has been added to or removed from.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="#_rgant-Collection_domainEvent"><code>@Collection#domainEvent()</code></a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Domain</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@Command</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Action invocation should be reified as a command object, optionally persistable for profiling and enhanced auditing, and background/async support.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="#_rgant-Action_command"><code>@Action#command()</code></a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Domain</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@CssClass</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Allow visual representation of individual objects or object members layout to be customized by application-specific CSS.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>#cssClass()</code> attribute for: <a href="#_rgant-DomainObjectLayout_cssClass"><code>@DomainObjectLayout</code></a>, <a href="#_rgant-PropertyLayout_cssClass"><code>@PropertyLayout</code></a>,  <a href="#_rgant-CollectionLayout_cssClass"><code>@CollectionLayout</code></a>, <a href="#_rgant-ActionLayout_cssClass"><code>@ActionLayout</code></a> and <a href="#_rgant-ParameterLayout_cssClass"><code>@ParameterLayout</code></a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">UI</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Yes</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@CssClassFa</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>So that font awesome icons can be applied to action buttons/menu items and optionally as an object icon.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>cssClassFa()</code> attribute for: <a href="#_rgant-ActionLayout_cssClassFa"><code>@ActionLayout</code></a>, <a href="#_rgant-DomainObjectLayout_cssClassFa"><code>DomainObjectLayout</code></a> and <a href="#_rgant-ViewModelLayout_cssClassFa"><code>ViewModelLayout</code></a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">UI</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Yes</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@Debug</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Action only invokable in debug mode.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Not supported by either the <a href="ugvw.html">Wicket viewer</a> or the <a href="ugvro.html">RestfulObjects viewer</a>; use prototype mode instead (<a href="#_rgant-Action_restrictTo"><code>@Action#restrictTo()</code></a>)</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">UI</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@DescribedAs</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Provide a longer description/tool-tip of an object or object member.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>#describedAs()</code> attribute for <a href="#_rgant-DomainObject_describedAs"><code>@DomainObjectLayout</code></a>, <a href="#_rgant-PropertyLayout_describedAs"><code>@PropertyLayout</code></a>, <a href="#_rgant-CollectionLayout_describedAs"><code>@CollectionLayout</code></a>, <a href="#_rgant-ActionLayout_describedAs"><code>@ActionLayout</code></a> and <a href="#_rgant-ParameterLayout_describedAs"><code>@ParameterLayout</code></a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">UI</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Yes</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@Disabled</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Object property cannot be edited, an object collection cannot be added to/removed from, or an object action cannot be invoked.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>#editing()</code> attribute for <a href="#_rgant-Property_editing"><code>@Property</code></a>,  <a href="#_rgant-Collection_editing"><code>@Collection</code></a> and <a href="#_rgant-DomainObject_editing"><code>@DomainObject</code></a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">UI, Domain</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Yes</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@Exploration</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Action available in special 'exploration' mode.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Not supported by either the <a href="ugvw.html">Wicket viewer</a> or the <a href="ugvro.html">RestfulObjects viewer</a>; use prototype mode instead (<a href="#_rgant-Action_restrictTo"><code>@Action#restrictTo()</code></a>)</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">UI</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@FieldOrder</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Order of properties and collections.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="#_rgant-MemberOrder"><code>@MemberOrder</code></a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">UI</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Yes</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@Hidden</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Object member is not visible, or on domain service (to indicate that none of its actions are visible).</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>For domain object members, use <code>#hidden()</code> attribute of <a href="#_rgant-Action_hidden"><code>Action</code></a>, <a href="#_rgant-Property_hidden"><code>Property</code></a> or <a href="#_rgant-Collection_hidden"><code>Collection</code></a>. <br>
-For domain service, use <a href="#_rgant-DomainService_nature"><code>@DomainService(</code><br>
-<code>nature=DOMAIN)</code></a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">UI, Domain</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Yes</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@Idempotent</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Whether an action is idempotent (can be invoked multiple times with same post-condition).</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="#_rgant-Action_semantics"><code>@Action#semantics</code></a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Domain</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@Ignore</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Exclude this method from the metamodel.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="#_rgant-Programmatic"><code>@Programmatic</code></a>.<br></p>
-</div>
-<div class="paragraph">
-<p><code>@Ignore</code> was deprecated because it can easily clash with <code>@org.junit.Ignore</code>.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Domain</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@Immutable</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>An object&#8217;s state cannot be changed (properties cannot be edited, collections cannot be added to or removed from).
-Actions can still be invoked.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="#_rgant-DomainObject_editing"><code>@DomainObject#editing()</code></a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Domain</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@Mask</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>How to parse/render values (never properly supported)</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"><p class="tableblock">UI/domain</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@MaxLength</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Maximum length of a property value (strings).</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>#maxLength()</code> attribute for <a href="#_rgant-Property_maxLength"><code>@Property</code></a> or <a href="#_rgant-Parameter_maxLength"><code>@Parameter</code></a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Domain</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@MemberGroups</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Layout of properties and collections of a domain object or view model object.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="ugfun.html#_ugfun_object-layout_dynamic_xml">dynamic <code>.layout.xml</code></a> files</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">UI</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Yes</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">@MemberGroupLayout`</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Grouping of properties into groups, and organizing of properties, collections into columns.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="ugfun.html#_ugfun_object-layout_dynamic_xml">dynamic <code>.layout.xml</code></a> files</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">UI</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Yes</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@MultiLine</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Render string property over multiple lines (a textarea rather than a textbox).</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>#multiLine()</code> attribute for <a href="#_rgant-Property_multiLine"><code>@Property</code></a> or <a href="#_rgant-Parameter_multiLine"><code>@Parameter</code></a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">UI</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Yes</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@MustSatisfy</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Specify arbitrary specification constraints on a property or action parameter.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>#mustSatisfy()</code> attribute for <a href="#_rgant-Property_mustSatisfy"><code>@Property</code></a> or <a href="#_rgant-Parameter_mustSatisfy"><code>@Parameter</code></a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Domain</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@Named</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Override name inferred from class. Required for parameter names (prior to Java8).</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>#named()</code> attribute for <a href="#_rgant-DomainServiceLayout_named"><code>@DomainServiceLayout</code></a>, <a href="#_rgant-DomainObjectLayout_named"><code>@DomainObjectLayout</code></a>, <a href="#_rgant-PropertyLayout_named"><code>@PropertyLayout</code></a>, <a href="#_rgant-CollectionLayout_named"><code>@CollectionLayout</code></a>, <a href="#_rgant-ActionLayout_named"><code>@ActionLayout</code></a> and <a href="#_rgant-ParameterLayout_named"><code>@ParameterLayout</code></a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">UI</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Yes</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@NotContributed</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Indicates that a domain service action is not rendered as an action on the (entity) types of its parameters.
-For 1-arg query-only actions, controls whether the domain service action is rendered as a property or collection on the entity type of its parameter.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Use <a href="#_rgant-DomainService_nature"><code>@DomainService#nature()</code></a> to specify whether any of the actions in a domain service should appear in the menu bars (applies at type level, not action level).
-For individual actions, use <a href="#_rgant-ActionLayout_contributedAs"><code>@ActionLayout#</code><br>
-<code>contributedAs()</code></a> to specify whether any individual action should be contributed only as an action or as an association (property or collection).</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">UI</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@NotInServiceMenu</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Indicates that a domain service should not be rendered in the application menu (at top of page in Wicket viewer).</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="#_rgant-DomainService_nature"><code>@DomainService#nature()</code></a> to signify that none of the actions in a domain service should appear in the menu bars</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">UI</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@NotPersisted</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Indicates that an object property is not persisted (meaning it is excluded from view model mementos, and should not be audited).</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>#notPersisted()</code> attribute of <a href="#_rgant-Property_notPersisted"><code>@Property</code></a> and <a href="#_rgant-Collection_notPersisted"><code>@Collection</code></a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Domain, Persistence</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@ObjectType</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>For constructing the external identifier (URI) of an entity instance (part of its URL in both Wicket viewer and Restful Objects viewer).
-Also part of the toString representation of bookmarks, if using the Bookmark Service</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="#_rgant-DomainObject_objectType"><code>@DomainObject#objectType()</code></a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Domain</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@Optional</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Specifies that a property or action parameter is not mandatory.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>#optionality()</code> attribute for <a href="#_rgant-Property_optionality"><code>@Property</code></a> or  <a href="#_rgant-Parameter_optionality"><code>@Parameter</code></a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Domain</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@Paged</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Number of instances to display in tables representing (standalone or parented) collections.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>#paged()</code> attribute for <a href="#_rgant-DomainObjectLayout_paged"><code>@DomainObjectLayout</code></a> or <a href="#_rgant-CollectionLayout_paged"><code>@CollectionLayout</code></a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">UI</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Yes</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@Plural</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>For the irregular plural form of an entity type.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="#_rgant-DomainObject_plural"><code>@DomainObjectLayout</code><br>
-<code>#plural()</code></a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">UI</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@PostsAction</code><br>
-<code>InvokedEvent</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Post a domain event to the Event Bus Service indicating that an action has been invoked.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="#_rgant-Action_domainEvent"><code>@Action#domainEvent()</code></a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Domain</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@PostsCollection</code><br>
-<code>AddedToEvent</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Post a domain event to the Event Bus Service indicating that an element has been added to a collection.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="#_rgant-Collection_domainEvent"><code>@Collection#domainEvent()</code></a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Domain</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@PostsCollection</code><br>
-<code>RemovedFromEvent</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Post a domain event to the Event Bus Service indicating that an element has been removed from a collection.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="#_rgant-Collection_domainEvent"><code>@Collection#domainEvent()</code></a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Domain</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@PostsProperty</code><br>
-<code>ChangedEvent</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Post a domain event to the Event Bus Service indicating that the value of a property has changed.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="#_rgant-Property_domainEvent"><code>@Property#domainEvent()</code></a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Domain</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@PropertyInteraction</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Enable subscribers on the Event Bus Service to either veto, validate or take further steps before/after a property has been modified or cleared.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="#_rgant-Property_domainEvent"><code>@Property#domainEvent()</code></a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Domain</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@Prototype</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Indicates that an action should only be visible in 'prototype' mode.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="#_rgant-Action_restrictTo"><code>@Action#restrictTo()</code></a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">UI</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Yes</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@PublishedAction</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Action invocation should be serialized and published by configured PublishingService (if any), eg to other systems.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="#_rgant-Action_publishing"><code>@Action#publishing()</code></a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Domain</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@PublishedObject</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Change to object should be serialized and published by configured PublishingService (if any), eg to other systems.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="#_rgant-DomainObject_publishing"><code>@DomainObject#publishing()</code></a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Domain</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@QueryOnly</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Whether an action is query-only (has no side-effects).</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="#_rgant-Action_semantics"><code>@Action#semantics()</code></a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Domain</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@RegEx</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Validate change to value of string property.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>#regexPattern()</code> for <a href="#_rgant-Property_regexPattern"><code>@Property</code></a> or  <a href="#_rgant-Property_regexPattern"><code>@Parameter</code></a>.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Domain</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@Render</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Eagerly (or lazily) render the contents of a collection.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="#_rgant-CollectionLayout_render"><code>@CollectionLayout</code><br>
-<code>#render()</code></a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">UI</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Yes</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@RenderedAsDayBefore</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Render dates as the day before; ie store [a,b) internally but render [a,b-1]) to end-user.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>#renderedAsDayBefore()</code> attribute for <a href="#_rgant-PropertyLayout_renderedAsDayBefore"><code>@PropertyLayout</code></a> and <a href="#_rgant-ParameterLayout_renderedAsDayBefore"><code>@ParameterLayout</code></a>.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">UI</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@Resolve</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Eagerly (or lazily) render the contents of a collection (same as <code>@Render)</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="#_rgant-CollectionLayout_render"><code>@CollectionLayout</code><br>
-<code>#render()</code></a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">UI</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Yes</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@SortedBy</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Display instances in collections in the order determined by the provided Comparator.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><a href="#_rgant-CollectionLayout_sortedBy"><code>@CollectionLayout</code><br>
-<code>#sortedBy()</code></a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">UI</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Yes</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@TypeOf</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>The type of entity stored within a collection, or as the result of invoking an action, if cannot be otherwise inferred, eg from generics.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>#typeOf()</code> attribute for <a href="#_rgant-Collection_typeOf"><code>@Collection</code></a> and <a href="#_rgant-Action_typeOf"><code>@Action</code></a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Domain</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@TypicalLength</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>The typical length of a string property, eg to determine a sensible length for a textbox.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>#typicalLength()</code> attribute for <a href="#_rgant-PropertyLayout_typicalLength"><code>@PropertyLayout</code></a> and <a href="#_rgant-ParameterLayout_typicalLength"><code>@ParameterLayout</code></a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">UI</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Yes</p></td>
-</tr>
-</tbody>
-</table>
-</div>
-<div class="sect2">
-<h3 id="_rgant_aaa_partial">2.6. Incomplete/partial support</h3>
-<div class="paragraph">
-<p>These annotations have only incomplete/partial support, primarily relating to the management of value types.  We recommend that you do not use them for now.  Future versions of Apache Isis may either formally deprecate/retire them, or we may go the other way and properly support them.  This will depend in part on the interactions between the Apache Isis runtime, its two viewer implementations, and DataNucleus persistence.</p>
-</div>
-<table class="tableblock frame-all grid-all spread">
-<caption class="title">Table 7. Annotations with incomplete/partial support</caption>
-<colgroup>
-<col style="width: 28.5714%;">
-<col style="width: 57.1428%;">
-<col style="width: 14.2858%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">Annotation</th>
-<th class="tableblock halign-left valign-top">Purpose</th>
-<th class="tableblock halign-left valign-top">Layer</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@Aggregated</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Indicates that the object is aggregated, or wholly owned, by a root object.<br></p>
-</div>
-<div class="paragraph">
-<p>This information could in theory provide useful semantics for some object store implementations, eg to store the aggregated objects "inline". <br></p>
-</div>
-<div class="paragraph">
-<p>Currently neither the JDO ObjectStore nor any of the viewers exploit this metadata.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Domain, Persistence</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@Defaulted</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Indicates that a (value) class has a default value.<br></p>
-</div>
-<div class="paragraph">
-<p>The concept of "defaulted" means being able to provide a default value for the type by way of the <code>o.a.i.applib.adapters.DefaultsProvider</code> interface. Generally this only applies to value types, where the <code>@Value</code> annotation implies encodability through the <code>ValueSemanticsProvider</code> interface.<br></p>
-</div>
-<div class="paragraph">
-<p>For these reasons the <code>@Defaulted</code> annotation is generally never applied directly, but can be thought of as a placeholder for future enhancements whereby non-value types might also have a default value provided for them.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Domain</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@Encodable</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Indicates that a (value) class can be serialized/encoded.<br></p>
-</div>
-<div class="paragraph">
-<p>Encodability means the ability to convert an object to-and-from a string, by way of the <code>o.a.i.applib.adapters.EncoderDecoder</code> interface. Generally this only applies to value types, where the <code>@Value</code> annotation implies encodability through the <code>ValueSemanticsProvider</code> interface.</p>
-</div>
-<div class="paragraph">
-<p>For these reasons the <code>@Encodable</code> annotation is generally never applied directly, but can be thought of as a placeholder for future enhancements whereby non-value types might also be directly encoded.</p>
-</div>
-<div class="paragraph">
-<p>Currently neither the Wicket viewer nor the RO viewer use this API.  The Wicket viewer uses Wicket APIs, while RO viewer has its own mechanisms (parsing data from input JSON representations, etc.)</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Persistence</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>@NotPersistable</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Indicates that a domain object may not be programmatically persisted.<br></p>
-</div>
-<div class="paragraph">
-<p>+
-This annotation  indicates that transient instances of this class may be created but may not be persisted. The framework will not provide the user with an option to 'save' the object, and attempting to persist such an object programmatically would be an error.</p>
-</div>
-<div class="paragraph">
-<p>For example:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@NotPersistable</span>(By.USER)
+    </style> 
+  <style>
+        .tocify {
+            margin-top: 80px;
+        }
+    </style>  
+ </head> 
+ <body> 
+  <div class="row"> 
+   <div class="fixed contain-to-grid header"> 
+    <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem"> 
+     <ul class="title-area"> 
+      <li class="name"> <h1> <a href="/index.html">Apache Isis\u2122</a> </h1> </li> 
+      <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone --> 
+      <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li> 
+     </ul> 
+     <section class="top-bar-section"> 
+      <ul class="right"> 
+       <li class="has-form"> 
+        <form class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse"> 
+         <div class="row collapse"> 
+          <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya"> 
+          <input type="hidden" name="cof" value="FORID:0"> 
+          <input class="form-control" name="q" type="text" placeholder="Search"> 
+         </div> 
+        </form> </li> 
+      </ul> 
+      <!-- Left Nav Section --> 
+      <ul class="left"> 
+       <li><a href="/documentation.html">Documentation</a></li> 
+       <li><a href="/downloads.html">Downloads</a></li> 
+       <li><a href="/help.html">Help</a></li> 
+       <li><a href="/asf.html">@ASF</a></li> 
+      </ul> 
+     </section> 
+    </nav> 
+   </div> 
+  </div> 
+  <div class="row"> 
+   <div id="doc-content-left" class="large-9 medium-9 columns"> 
+    <div id="doc-content">
+     <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/rgant.adoc&quot;" style="float: right; font-size: small; padding: 6px;  "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+     <div class="sect1"> 
+      <h2 id="_rgant">1. Annotations</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_rgant.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>This guide describes the various annotations used by Apache Isis to provide additional metadata about the domain objects. Most of these are defined by Isis itself, but some are from other libraries. It also identifies a number of annotations that are now deprecated, and indicates their replacement.</p> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_other_guides">1.1. Other Guides</h3> 
+        <div class="paragraph"> 
+         <p>Apache Isis documentation is broken out into a number of user, reference and "supporting procedures" guides.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The user guides available are:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><a href="ugfun.html">Fundamentals</a></p> </li> 
+          <li> <p><a href="ugvw.html">Wicket viewer</a></p> </li> 
+          <li> <p><a href="ugvro.html">Restful Objects viewer</a></p> </li> 
+          <li> <p><a href="ugdno.html">DataNucleus object store</a></p> </li> 
+          <li> <p><a href="ugsec.html">Security</a></p> </li> 
+          <li> <p><a href="ugtst.html">Testing</a></p> </li> 
+          <li> <p><a href="ugbtb.html">Beyond the Basics</a></p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The reference guides are:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><a href="#">Annotations</a> (this guide)</p> </li> 
+          <li> <p><a href="rgsvc.html">Domain Services</a></p> </li> 
+          <li> <p><a href="rgcfg.html">Configuration Properties</a></p> </li> 
+          <li> <p><a href="rgcms.html">Classes, Methods and Schema</a></p> </li> 
+          <li> <p><a href="rgmvn.html">Apache Isis Maven plugin</a></p> </li> 
+          <li> <p><a href="rgfis.html">Framework Internal Services</a></p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The remaining guides are:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><a href="dg.html">Developers' Guide</a> (how to set up a development environment for Apache Isis and contribute back to the project)</p> </li> 
+          <li> <p><a href="cgcom.html">Committers' Guide</a> (release procedures and related practices)</p> </li> 
+         </ul> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_examples">1.2. Examples</h3> 
+        <div class="paragraph"> 
+         <p>To give just a few examples of annotations supported by Apache Isis:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p>if a property is read-only, then this can be annotated with <code>@Property(editing=EditingDISABLED)</code>.</p> </li> 
+          <li> <p>if a class has a small fixed set of instances (eg a picklist), then it can be annotated using <code>@DomainObject(bounded=true)</code></p> </li> 
+          <li> <p>if a class is a domain service and should be automatically instantiated as a singleton, then it can be annotated using <code>@DomainService</code></p> </li> 
+          <li> <p>if an action is idempotent, then it can be annotated using <code>@Action(semantics=SemanticsOf.IDEMPOTENT)</code>.</p> </li> 
+          <li> <p>if an action parameter is optional, it can be annotated using <code>@Parameter(optionality=Optionality.OPTIONAL)</code></p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Some annotations act as UI hints, for example:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p>if a collection should be rendered "open" rather than collapsed, it can be annotated using <code>@CollectionLayout(render=RenderType.EAGERLY)</code></p> </li> 
+          <li> <p>if an action has a tooltip, it can be annotated using <code>@ActionLayout(describedAs=\u2026\u200b)</code></p> </li> 
+          <li> <p>if a domain object is bookmarkable, it can be annotated using <code>@DomainObjectLayout(bookmarking=BookmarkPolicy.AS_ROOT</code>).</p> </li> 
+         </ul> 
+        </div> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_rgant_aaa">2. Summary</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_rgant_aaa.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>This section summarizes the various annotations supported by Apache Isis. They break out into five categories.</p> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_rgant_aaa_main">2.1. Core annotations</h3> 
+        <div class="paragraph"> 
+         <p>In Apache Isis every domain object is either a domain entity, a view model or a domain service. And each of these are made up of properties, collections and actions (domain services only have actions).</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>For each of these domain types and members there are two annotations. One covers the semantics intrinsic to the domain (eg whether an action parameter is optional or not), then other (suffix <code>\u2026\u200bLayout</code>) captures semantics relating to the UI/presentation layer.</p> 
+        </div> 
+        <div class="admonitionblock tip"> 
+         <table> 
+          <tbody>
+           <tr> 
+            <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td> 
+            <td class="content"> 
+             <div class="paragraph"> 
+              <p>Most UI semantics can also be specified using <a href="ugfun.html#_ugfun_object-layout_dynamic">dynamic object layout</a>.</p> 
+             </div> </td> 
+           </tr> 
+          </tbody>
+         </table> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The table below summarizes these most commonly used annotations in Apache Isis.</p> 
+        </div> 
+        <table class="tableblock frame-all grid-all spread"> 
+         <caption class="title">
+          Table 1. Core annotations for domain objects, services and members (as of 1.8.0)
+         </caption> 
+         <colgroup> 
+          <col style="width: 25%;"> 
+          <col style="width: 50%;"> 
+          <col style="width: 12.5%;"> 
+          <col style="width: 12.5%;"> 
+         </colgroup> 
+         <thead> 
+          <tr> 
+           <th class="tableblock halign-left valign-top">Annotation</th> 
+           <th class="tableblock halign-left valign-top">Purpose</th> 
+           <th class="tableblock halign-left valign-top">Layer</th> 
+           <th class="tableblock halign-left valign-top"><a href="ugfun.html#_ugfun_object-layout_dynamic">Dynamic layout</a>?</th> 
+          </tr> 
+         </thead> 
+         <tbody> 
+          <tr> 
+           <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgant-Action"><code>@Action</code></a></p></td> 
+           <td class="tableblock halign-left valign-top">
+            <div>
+             <div class="paragraph"> 
+              <p>Domain semantics for actions</p> 
+             </div>
+            </div></td> 
+           <td class="tableblock halign-left valign-top"><p class="tableblock">Domain</p></td> 
+           <td class="tableblock halign-left valign-top"></td> 
+          </tr> 
+          <tr> 
+           <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgant-ActionLayout"><code>@ActionLayout</code></a></p

<TRUNCATED>

[03/44] isis-site git commit: ISIS-1594: provide an 'edit' button

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/screencasts-older.html
----------------------------------------------------------------------
diff --git a/content/screencasts-older.html b/content/screencasts-older.html
index bbf110c..0b5ca20 100644
--- a/content/screencasts-older.html
+++ b/content/screencasts-older.html
@@ -1,12 +1,10 @@
 <!doctype html>
 <html class="no-js" lang="en">
-<head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-
-    <title>(Older) Screencasts</title>
-
-    <!--
+ <head> 
+  <meta charset="utf-8"> 
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"> 
+  <title>(Older) Screencasts</title> 
+  <!--
         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
@@ -23,31 +21,21 @@
         KIND, either express or implied.  See the License for the
         specific language governing permissions and limitations
         under the License.
-    -->
-
-    <!-- No caching headers -->
-    <meta http-equiv="cache-control" content="no-cache" />
-    <meta http-equiv="pragma" content="no-cache" />
-    <meta http-equiv="expires" content="-1" />
-
-
-    <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
-    <link href="./css/foundation/5.5.1/foundation.css" rel="stylesheet" />
-    <script src="./js/foundation/5.5.1/vendor/modernizr.js"></script>
-    <link href="./css/asciidoctor/colony.css" rel="stylesheet">
-    <link href="./css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-
-
-
-    <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
-    <!--[if lt IE 9]>
+    --> 
+  <!-- No caching headers --> 
+  <meta http-equiv="cache-control" content="no-cache"> 
+  <meta http-equiv="pragma" content="no-cache"> 
+  <meta http-equiv="expires" content="-1"> 
+  <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line --> 
+  <link href="./css/foundation/5.5.1/foundation.css" rel="stylesheet"> 
+  <script src="./js/foundation/5.5.1/vendor/modernizr.js"></script> 
+  <link href="./css/asciidoctor/colony.css" rel="stylesheet"> 
+  <link href="./css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet"> 
+  <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet"> 
+  <!--[if lt IE 9]>
       <link href="./css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
-    <![endif]-->
-
-
-
-    <style type="text/css">
+    <![endif]--> 
+  <style type="text/css">
         pre code {
             background-color: inherit;
             border-style: none;
@@ -192,9 +180,8 @@ table.CodeRay td.code>pre{padding:0}
         color:#fff;
         font-size: 1.1em;
     }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         @media only screen and (min-width: 40.063em) {
           .top-bar {
             .contain-to-grid .top-bar {
@@ -205,9 +192,8 @@ table.CodeRay td.code>pre{padding:0}
         .row {
             max-width: 80rem;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .extended-quote,
         .extended-quote-first {
             margin-left: 40px;
@@ -231,9 +217,8 @@ table.CodeRay td.code>pre{padding:0}
             text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
         }
         
-    </style>
-
-    <style>
+    </style> 
+  <style>
         body {
           position: relative;
         }
@@ -255,6 +240,7 @@ table.CodeRay td.code>pre{padding:0}
 
         div#doc-content {
             margin-top: 30px;
+            padding-top: 30px;
         }
 
         div.documentation-page table.frame-all {
@@ -286,9 +272,8 @@ table.CodeRay td.code>pre{padding:0}
             min-height: 2000px;
         }
 
-    </style>
-
-    <style>
+    </style> 
+  <style>
 
         @media only screen and (min-width: 768px) {
           #toc.toc2 ul ul { margin-left: -10px; }
@@ -316,15 +301,13 @@ table.CodeRay td.code>pre{padding:0}
         body div#toc2 li.tocify-item.active a {
             color: red;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         footer {
             margin-top: 1000px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* overriding colony.css stylesheet */
         .literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
            /*padding: 1.25em 1.5625em 1.125em 1.5625em;*/
@@ -372,9 +355,8 @@ table.CodeRay td.code>pre{padding:0}
         .imageblock img {
             margin-bottom: 10px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* from http://ben.balter.com/2014/03/13/pages-anchor-links/ */
         .header-link {
           position: absolute;
@@ -395,9 +377,8 @@ table.CodeRay td.code>pre{padding:0}
         h6:hover .header-link {
           opacity: 1;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .top-bar
         {
             -webkit-transition-duration: .5s;
@@ -425,413 +406,460 @@ table.CodeRay td.code>pre{padding:0}
             -webkit-transition-property: -webkit-transform;
             transition-property: transform;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         #doc-content a.guide {
             color: white;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .tocify {
             margin-top: 80px;
         }
-    </style>
-
-
-</script>
-
-</head>
-<body>
-
-<<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
-    <div class="github-fork-ribbon">
-        <a href="https://github.com/apache/isis#fork-destination-box">Fork me on GitHub</a>
-    </div>
-</div>
-
-
-<div class="row">
-
-    <div class="fixed contain-to-grid header">
-        <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
-            <ul class="title-area">
-                <li class="name">
-                    <h1>
-                        <a href="/index.html">Apache Isis&trade;</a>
-                    </h1>
-                </li>
-                <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
-                <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
-            </ul>
-
-            <section class="top-bar-section">
-                <ul class="right">
-
-                    <li class="has-form">
-                       <FORM class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
-                        <div class="row collapse">
-                            <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
-                            <INPUT type="hidden" name="cof" value="FORID:0">
-                            <INPUT class="form-control" name="q" type="text" placeholder="Search">
-                        </div>
-                    </FORM>
-                     </li>
-
-                </ul>
-
-                <!-- Left Nav Section -->
-                <ul class="left">
-
-                    <li><a href="/documentation.html">Documentation</a></li>
-                    <li><a href="/downloads.html">Downloads</a></li>
-                    <li><a href="/help.html">Help</a></li>
-                    <li><a href="/asf.html">@ASF</a></li>
-
-                </ul>
-
-            </section>
-        </nav>
-    </div>
-</div>
-
-<div class="row">
-
-    <div id="doc-content-left" class="large-9 medium-9 columns">
-
-
-        <div id="doc-content">
-          <div id="preamble">
-<div class="sectionbody">
-<div class="paragraph">
-<p><br/><br/></p>
-</div>
-<div class="paragraph">
-<p>These screencasts refer to older versions of the framework, but you may still find them of use.  More recent screencasts can be found <a href="./screencasts.html">here</a>.</p>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_getting_started">Getting Started</h2>
-<div class="sectionbody">
-<table class="tableblock frame-all grid-all spread">
-<colgroup>
-<col style="width: 50%;">
-<col style="width: 50%;">
-</colgroup>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>How it works (v1.1.0)+</p>
-</div>
-<div class="paragraph">
-<p><em>How Apache Isis builds a webapp from the underlying domain object model</em></p>
-</div>
-<div class="paragraph">
-<p><em>This screencast is for Apache Isis v1.1.0 (ie very out of date)</em></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="videoblock">
-<div class="content">
-<iframe width="420px" height="315px" src="https://www.youtube.com/embed/ludOLyi6VyY?rel=0" frameborder="0" allowfullscreen></iframe>
-</div>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Todo app walkthrough (v.1.4.0)<br></p>
-</div>
-<div class="paragraph">
-<p><em>A run-through of the main features of the (non-ASF) <a href="http://github.com/isisaddons/isis-app-todoapp">Isis addons' todoapp</a></em><br></p>
-</div>
-<div class="paragraph">
-<p><em>nb: the todoapp was previously called the 'quickstart' app</em></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="videoblock">
-<div class="content">
-<iframe width="420px" height="210px" src="https://www.youtube.com/embed/2leQwavWxeg?rel=0" frameborder="0" allowfullscreen></iframe>
-</div>
-</div></div></td>
-</tr>
-</tbody>
-</table>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_development_environment">Development Environment</h2>
-<div class="sectionbody">
-<table class="tableblock frame-all grid-all spread">
-<colgroup>
-<col style="width: 50%;">
-<col style="width: 50%;">
-</colgroup>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Setting up Eclipse<br></p>
-</div>
-<div class="paragraph">
-<p><em>How to import an Apache Isis maven-based application into Eclipse and configure to use with the JDO Objectstore</em><br></p>
-</div>
-<div class="paragraph">
-<p>NB: when configuring DataNucleus for the <strong>dom</strong> project, make sure you are in the 'Java perspective', not the 'Java EE perspective').<br></p>
-</div>
-<div class="paragraph">
-<p>Learn more <a href="./guides/dg.html#_dg_ide_eclipse">here</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="videoblock">
-<div class="content">
-<iframe width="420px" height="315px" src="https://www.youtube.com/embed/RgcYfjQ8yJA?rel=0" frameborder="0" allowfullscreen></iframe>
-</div>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Setting up IntelliJ<br></p>
-</div>
-<div class="paragraph">
-<p><em>How to import an Apache Isis maven-based application into IntelliJ and run the app.</em><br></p>
-</div>
-<div class="paragraph">
-<p>Learn more <a href="./guides/dg.html#_dg_ide_intellij">here</a></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="videoblock">
-<div class="content">
-<iframe width="420px" height="315px" src="https://www.youtube.com/embed/lwKsyTbTSnA?rel=0" frameborder="0" allowfullscreen></iframe>
-</div>
-</div></div></td>
-</tr>
-</tbody>
-</table>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_isis_add_on_modules">Isis Add-on Modules</h2>
-<div class="sectionbody">
-<table class="tableblock frame-all grid-all spread">
-<colgroup>
-<col style="width: 50%;">
-<col style="width: 50%;">
-</colgroup>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Commands and Auditing (v1.6.0)<br></p>
-</div>
-<div class="paragraph">
-<p><em>Configuring the command and auditing add-on modules for the <a href="guides/ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp</a>.</em><br></p>
-</div>
-<div class="paragraph">
-<p>Learn more at the (non-ASF) Isis addons' <a href="http://github.com/isisaddons/isis-module-command">command</a> and <a href="http://github.com/isisaddons/isis-module-audit">audit</a> modules</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="videoblock">
-<div class="content">
-<iframe width="420px" height="236px" src="https://www.youtube.com/embed/g01tK58MxJ8?rel=0" frameborder="0" allowfullscreen></iframe>
-</div>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Security (v1.6.0)<br></p>
-</div>
-<div class="paragraph">
-<p><em>Configuring the security add-on module for for the <a href="guides/ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp</a>.</em><br></p>
-</div>
-<div class="paragraph">
-<p>Learn more at the (non-ASF) <a href="http://github.com/isisaddons/isis-module-security">Isis addons' security</a> module</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="videoblock">
-<div class="content">
-<iframe width="420px" height="236px" src="https://www.youtube.com/embed/bj8735nBRR4?rel=0" frameborder="0" allowfullscreen></iframe>
-</div>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Commands, Auditing, Publishing (v1.5.0)<br></p>
-</div>
-<div class="paragraph">
-<p><em>A run-through of the command (profiling) service, auditing service, publishing service.  Also shows how commands can be run in the background either explicitly by scheduling through the background service or implicitly by way of a framework annotation.</em><br></p>
-</div>
-<div class="paragraph">
-<p>Learn more at the (non-ASF) Isis addons' <a href="http://github.com/isisaddons/isis-module-command">command</a>, <a href="http://github.com/isisaddons/isis-module-audit">audit</a> and (non-ASF) <a href="http://github.com/isisaddons/isis-module-publishing">publishing</a> modules.</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="videoblock">
-<div class="content">
-<iframe width="420px" height="210px" src="https://www.youtube.com/embed/tqXUZkPB3EI?rel=0" frameborder="0" allowfullscreen></iframe>
-</div>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Bulk updates in Apache Isis (v1.5.0)<br></p>
-</div>
-<div class="paragraph">
-<p><em>Using the (non-ASF) <a href="http://github.com/isisaddons/isis-module-excel">Isis addons' excel</a> module and view models to perform bulk updates).</em></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="videoblock">
-<div class="content">
-<iframe width="420px" height="315px" src="https://www.youtube.com/embed/8SsRDhCUuRc?rel=0" frameborder="0" allowfullscreen></iframe>
-</div>
-</div></div></td>
-</tr>
-</tbody>
-</table>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_wicket_viewer_and_isis_add_ons">Wicket Viewer and Isis Add-ons</h2>
-<div class="sectionbody">
-<table class="tableblock frame-all grid-all spread">
-<colgroup>
-<col style="width: 50%;">
-<col style="width: 50%;">
-</colgroup>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Customizing the Wicket viewer<br></p>
-</div>
-<div class="paragraph">
-<p><em>How to customize the Wicket viewer, integrating the (non-ASF) <a href="http://github.com/isisaddons/isis-wicket-gmap3">Isis addons' gmap3 </a> wicket extension.</em></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="videoblock">
-<div class="content">
-<iframe width="420px" height="315px" src="https://www.youtube.com/embed/9o5zAME8LrM?rel=0" frameborder="0" allowfullscreen></iframe>
-</div>
-</div></div></td>
-</tr>
-</tbody>
-</table>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_restful_objects_viewer">Restful Objects Viewer</h2>
-<div class="sectionbody">
-<table class="tableblock frame-all grid-all spread">
-<colgroup>
-<col style="width: 50%;">
-<col style="width: 50%;">
-</colgroup>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Using Chrome Tools<br></p>
-</div>
-<div class="paragraph">
-<p><em>Using Chrome plugins to invoke an action through the REST API</em></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="videoblock">
-<div class="content">
-<iframe width="420px" height="236px" src="https://www.youtube.com/embed/_-TOvVYWCHc?rel=0" frameborder="0" allowfullscreen></iframe>
-</div>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Creating objects using the REST API</p>
-</div>
-<div class="paragraph">
-<p><em>Posting to the "Objects of Type" resource"</em></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="videoblock">
-<div class="content">
-<iframe width="420px" height="236px" src="https://www.youtube.com/embed/VmvhACyA2ZI?rel=0" frameborder="0" allowfullscreen></iframe>
-</div>
-</div></div></td>
-</tr>
-</tbody>
-</table>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_jrebel_integration">JRebel Integration</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p><em>Develop your app without having to redeploy using <a href="http://zeroturnaround.com/software/jrebel/">JRebel</a> and an <a href="https://github.com/danhaywood/isis-jrebel-plugin">Isis plugin</a> for JRebel.</em></p>
-</div>
-<table class="tableblock frame-all grid-all spread">
-<colgroup>
-<col style="width: 50%;">
-<col style="width: 50%;">
-</colgroup>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Maven and JRebel</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="videoblock">
-<div class="content">
-<iframe width="420px" height="236px" src="https://www.youtube.com/embed/jpYNZ343gi4?rel=0" frameborder="0" allowfullscreen></iframe>
-</div>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Eclipse and JRebel</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="videoblock">
-<div class="content">
-<iframe width="420px" height="236px" src="https://www.youtube.com/embed/uPfRXllQV1o?rel=0" frameborder="0" allowfullscreen></iframe>
-</div>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>IntelliJ and JRebel</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="videoblock">
-<div class="content">
-<iframe width="420px" height="236px" src="https://www.youtube.com/embed/fb5VbU-VY8I?rel=0" frameborder="0" allowfullscreen></iframe>
-</div>
-</div></div></td>
-</tr>
-</tbody>
-</table>
-</div>
-</div>
-        </div>
-
-        <footer>
-          <hr>
-          <p class="small">
-          Copyright &copy; 2010~2016 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0.
-          <br/>
-          Apache, the Apache feather logo, Apache&nbsp;Isis, and the Apache&nbsp;Isis project logo are all trademarks of The&nbsp;Apache&nbsp;Software&nbsp;Foundation.
-          </p>
-        </footer>
-
-    </div>
-
-    <div id="doc-content-right" class="large-3 medium-3 xcolumns">
-        <div id="toc" class="toc2">
-            <div class="fallback-toc">
-                <ul class="sectlevel1">
-<li><a href="#_getting_started">Getting Started</a></li>
-<li><a href="#_development_environment">Development Environment</a></li>
-<li><a href="#_isis_add_on_modules">Isis Add-on Modules</a></li>
-<li><a href="#_wicket_viewer_and_isis_add_ons">Wicket Viewer and Isis Add-ons</a></li>
-<li><a href="#_restful_objects_viewer">Restful Objects Viewer</a></li>
-<li><a href="#_jrebel_integration">JRebel Integration</a></li>
-</ul>
+    </style> 
+  <style>
+        .tocify {
+            margin-top: 80px;
+        }
+    </style>  
+ </head> 
+ <body> 
+  <div class="row"> 
+   <div class="fixed contain-to-grid header"> 
+    <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem"> 
+     <ul class="title-area"> 
+      <li class="name"> <h1> <a href="/index.html">Apache Isis\u2122</a> </h1> </li> 
+      <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone --> 
+      <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li> 
+     </ul> 
+     <section class="top-bar-section"> 
+      <ul class="right"> 
+       <li class="has-form"> 
+        <form class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse"> 
+         <div class="row collapse"> 
+          <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya"> 
+          <input type="hidden" name="cof" value="FORID:0"> 
+          <input class="form-control" name="q" type="text" placeholder="Search"> 
+         </div> 
+        </form> </li> 
+      </ul> 
+      <!-- Left Nav Section --> 
+      <ul class="left"> 
+       <li><a href="/documentation.html">Documentation</a></li> 
+       <li><a href="/downloads.html">Downloads</a></li> 
+       <li><a href="/help.html">Help</a></li> 
+       <li><a href="/asf.html">@ASF</a></li> 
+      </ul> 
+     </section> 
+    </nav> 
+   </div> 
+  </div> 
+  <div class="row"> 
+   <div id="doc-content-left" class="large-9 medium-9 columns"> 
+    <div id="doc-content">
+     <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/screencasts-older.adoc&quot;" style="float: right; font-size: small; padding: 6px;  "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+     <div id="preamble"> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>These screencasts refer to older versions of the framework, but you may still find them of use. More recent screencasts can be found <a href="./screencasts.html">here</a>.</p> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_getting_started">Getting Started</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_getting_started.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <table class="tableblock frame-all grid-all spread"> 
+        <colgroup> 
+         <col style="width: 50%;"> 
+         <col style="width: 50%;"> 
+        </colgroup> 
+        <tbody> 
+         <tr> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="paragraph"> 
+             <p>How it works (v1.1.0)+</p> 
+            </div> 
+            <div class="paragraph"> 
+             <p><em>How Apache Isis builds a webapp from the underlying domain object model</em></p> 
+            </div> 
+            <div class="paragraph"> 
+             <p><em>This screencast is for Apache Isis v1.1.0 (ie very out of date)</em></p> 
             </div>
-        </div>
-    </div>
-
-</div>
-
-
-<script src="./js/foundation/5.5.1/vendor/jquery.js"></script>
-<script src="./js/foundation/5.5.1/foundation.min.js"></script>
-
-
-<link href="./css/jquery.tocify/1.9.0/jquery.tocify.css" rel="stylesheet">
-<script src="./js/jqueryui/1.11.4/jquery-ui.min.js"></script>
-<script src="./js/jquery.tocify/1.9.0/jquery.tocify.js"></script>
-
-
-
-<script type="text/javascript">
+           </div></td> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="videoblock"> 
+             <div class="content"> 
+              <iframe width="420px" height="315px" src="https://www.youtube.com/embed/ludOLyi6VyY?rel=0" frameborder="0" allowfullscreen></iframe> 
+             </div> 
+            </div>
+           </div></td> 
+         </tr> 
+         <tr> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="paragraph"> 
+             <p>Todo app walkthrough (v.1.4.0)<br></p> 
+            </div> 
+            <div class="paragraph"> 
+             <p><em>A run-through of the main features of the (non-ASF) <a href="http://github.com/isisaddons/isis-app-todoapp">Isis addons' todoapp</a></em><br></p> 
+            </div> 
+            <div class="paragraph"> 
+             <p><em>nb: the todoapp was previously called the 'quickstart' app</em></p> 
+            </div>
+           </div></td> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="videoblock"> 
+             <div class="content"> 
+              <iframe width="420px" height="210px" src="https://www.youtube.com/embed/2leQwavWxeg?rel=0" frameborder="0" allowfullscreen></iframe> 
+             </div> 
+            </div>
+           </div></td> 
+         </tr> 
+        </tbody> 
+       </table> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_development_environment">Development Environment</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_development_environment.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <table class="tableblock frame-all grid-all spread"> 
+        <colgroup> 
+         <col style="width: 50%;"> 
+         <col style="width: 50%;"> 
+        </colgroup> 
+        <tbody> 
+         <tr> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="paragraph"> 
+             <p>Setting up Eclipse<br></p> 
+            </div> 
+            <div class="paragraph"> 
+             <p><em>How to import an Apache Isis maven-based application into Eclipse and configure to use with the JDO Objectstore</em><br></p> 
+            </div> 
+            <div class="paragraph"> 
+             <p>NB: when configuring DataNucleus for the <strong>dom</strong> project, make sure you are in the 'Java perspective', not the 'Java EE perspective').<br></p> 
+            </div> 
+            <div class="paragraph"> 
+             <p>Learn more <a href="./guides/dg.html#_dg_ide_eclipse">here</a></p> 
+            </div>
+           </div></td> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="videoblock"> 
+             <div class="content"> 
+              <iframe width="420px" height="315px" src="https://www.youtube.com/embed/RgcYfjQ8yJA?rel=0" frameborder="0" allowfullscreen></iframe> 
+             </div> 
+            </div>
+           </div></td> 
+         </tr> 
+         <tr> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="paragraph"> 
+             <p>Setting up IntelliJ<br></p> 
+            </div> 
+            <div class="paragraph"> 
+             <p><em>How to import an Apache Isis maven-based application into IntelliJ and run the app.</em><br></p> 
+            </div> 
+            <div class="paragraph"> 
+             <p>Learn more <a href="./guides/dg.html#_dg_ide_intellij">here</a></p> 
+            </div>
+           </div></td> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="videoblock"> 
+             <div class="content"> 
+              <iframe width="420px" height="315px" src="https://www.youtube.com/embed/lwKsyTbTSnA?rel=0" frameborder="0" allowfullscreen></iframe> 
+             </div> 
+            </div>
+           </div></td> 
+         </tr> 
+        </tbody> 
+       </table> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_isis_add_on_modules">Isis Add-on Modules</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_isis_add_on_modules.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <table class="tableblock frame-all grid-all spread"> 
+        <colgroup> 
+         <col style="width: 50%;"> 
+         <col style="width: 50%;"> 
+        </colgroup> 
+        <tbody> 
+         <tr> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="paragraph"> 
+             <p>Commands and Auditing (v1.6.0)<br></p> 
+            </div> 
+            <div class="paragraph"> 
+             <p><em>Configuring the command and auditing add-on modules for the <a href="guides/ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp</a>.</em><br></p> 
+            </div> 
+            <div class="paragraph"> 
+             <p>Learn more at the (non-ASF) Isis addons' <a href="http://github.com/isisaddons/isis-module-command">command</a> and <a href="http://github.com/isisaddons/isis-module-audit">audit</a> modules</p> 
+            </div>
+           </div></td> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="videoblock"> 
+             <div class="content"> 
+              <iframe width="420px" height="236px" src="https://www.youtube.com/embed/g01tK58MxJ8?rel=0" frameborder="0" allowfullscreen></iframe> 
+             </div> 
+            </div>
+           </div></td> 
+         </tr> 
+         <tr> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="paragraph"> 
+             <p>Security (v1.6.0)<br></p> 
+            </div> 
+            <div class="paragraph"> 
+             <p><em>Configuring the security add-on module for for the <a href="guides/ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp</a>.</em><br></p> 
+            </div> 
+            <div class="paragraph"> 
+             <p>Learn more at the (non-ASF) <a href="http://github.com/isisaddons/isis-module-security">Isis addons' security</a> module</p> 
+            </div>
+           </div></td> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="videoblock"> 
+             <div class="content"> 
+              <iframe width="420px" height="236px" src="https://www.youtube.com/embed/bj8735nBRR4?rel=0" frameborder="0" allowfullscreen></iframe> 
+             </div> 
+            </div>
+           </div></td> 
+         </tr> 
+         <tr> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="paragraph"> 
+             <p>Commands, Auditing, Publishing (v1.5.0)<br></p> 
+            </div> 
+            <div class="paragraph"> 
+             <p><em>A run-through of the command (profiling) service, auditing service, publishing service. Also shows how commands can be run in the background either explicitly by scheduling through the background service or implicitly by way of a framework annotation.</em><br></p> 
+            </div> 
+            <div class="paragraph"> 
+             <p>Learn more at the (non-ASF) Isis addons' <a href="http://github.com/isisaddons/isis-module-command">command</a>, <a href="http://github.com/isisaddons/isis-module-audit">audit</a> and (non-ASF) <a href="http://github.com/isisaddons/isis-module-publishing">publishing</a> modules.</p> 
+            </div>
+           </div></td> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="videoblock"> 
+             <div class="content"> 
+              <iframe width="420px" height="210px" src="https://www.youtube.com/embed/tqXUZkPB3EI?rel=0" frameborder="0" allowfullscreen></iframe> 
+             </div> 
+            </div>
+           </div></td> 
+         </tr> 
+         <tr> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="paragraph"> 
+             <p>Bulk updates in Apache Isis (v1.5.0)<br></p> 
+            </div> 
+            <div class="paragraph"> 
+             <p><em>Using the (non-ASF) <a href="http://github.com/isisaddons/isis-module-excel">Isis addons' excel</a> module and view models to perform bulk updates).</em></p> 
+            </div>
+           </div></td> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="videoblock"> 
+             <div class="content"> 
+              <iframe width="420px" height="315px" src="https://www.youtube.com/embed/8SsRDhCUuRc?rel=0" frameborder="0" allowfullscreen></iframe> 
+             </div> 
+            </div>
+           </div></td> 
+         </tr> 
+        </tbody> 
+       </table> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_wicket_viewer_and_isis_add_ons">Wicket Viewer and Isis Add-ons</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_wicket_viewer_and_isis_add_ons.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <table class="tableblock frame-all grid-all spread"> 
+        <colgroup> 
+         <col style="width: 50%;"> 
+         <col style="width: 50%;"> 
+        </colgroup> 
+        <tbody> 
+         <tr> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="paragraph"> 
+             <p>Customizing the Wicket viewer<br></p> 
+            </div> 
+            <div class="paragraph"> 
+             <p><em>How to customize the Wicket viewer, integrating the (non-ASF) <a href="http://github.com/isisaddons/isis-wicket-gmap3">Isis addons' gmap3 </a> wicket extension.</em></p> 
+            </div>
+           </div></td> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="videoblock"> 
+             <div class="content"> 
+              <iframe width="420px" height="315px" src="https://www.youtube.com/embed/9o5zAME8LrM?rel=0" frameborder="0" allowfullscreen></iframe> 
+             </div> 
+            </div>
+           </div></td> 
+         </tr> 
+        </tbody> 
+       </table> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_restful_objects_viewer">Restful Objects Viewer</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_restful_objects_viewer.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <table class="tableblock frame-all grid-all spread"> 
+        <colgroup> 
+         <col style="width: 50%;"> 
+         <col style="width: 50%;"> 
+        </colgroup> 
+        <tbody> 
+         <tr> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="paragraph"> 
+             <p>Using Chrome Tools<br></p> 
+            </div> 
+            <div class="paragraph"> 
+             <p><em>Using Chrome plugins to invoke an action through the REST API</em></p> 
+            </div>
+           </div></td> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="videoblock"> 
+             <div class="content"> 
+              <iframe width="420px" height="236px" src="https://www.youtube.com/embed/_-TOvVYWCHc?rel=0" frameborder="0" allowfullscreen></iframe> 
+             </div> 
+            </div>
+           </div></td> 
+         </tr> 
+         <tr> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="paragraph"> 
+             <p>Creating objects using the REST API</p> 
+            </div> 
+            <div class="paragraph"> 
+             <p><em>Posting to the "Objects of Type" resource"</em></p> 
+            </div>
+           </div></td> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="videoblock"> 
+             <div class="content"> 
+              <iframe width="420px" height="236px" src="https://www.youtube.com/embed/VmvhACyA2ZI?rel=0" frameborder="0" allowfullscreen></iframe> 
+             </div> 
+            </div>
+           </div></td> 
+         </tr> 
+        </tbody> 
+       </table> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_jrebel_integration">JRebel Integration</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_jrebel_integration.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p><em>Develop your app without having to redeploy using <a href="http://zeroturnaround.com/software/jrebel/">JRebel</a> and an <a href="https://github.com/danhaywood/isis-jrebel-plugin">Isis plugin</a> for JRebel.</em></p> 
+       </div> 
+       <table class="tableblock frame-all grid-all spread"> 
+        <colgroup> 
+         <col style="width: 50%;"> 
+         <col style="width: 50%;"> 
+        </colgroup> 
+        <tbody> 
+         <tr> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="paragraph"> 
+             <p>Maven and JRebel</p> 
+            </div>
+           </div></td> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="videoblock"> 
+             <div class="content"> 
+              <iframe width="420px" height="236px" src="https://www.youtube.com/embed/jpYNZ343gi4?rel=0" frameborder="0" allowfullscreen></iframe> 
+             </div> 
+            </div>
+           </div></td> 
+         </tr> 
+         <tr> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="paragraph"> 
+             <p>Eclipse and JRebel</p> 
+            </div>
+           </div></td> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="videoblock"> 
+             <div class="content"> 
+              <iframe width="420px" height="236px" src="https://www.youtube.com/embed/uPfRXllQV1o?rel=0" frameborder="0" allowfullscreen></iframe> 
+             </div> 
+            </div>
+           </div></td> 
+         </tr> 
+         <tr> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="paragraph"> 
+             <p>IntelliJ and JRebel</p> 
+            </div>
+           </div></td> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="videoblock"> 
+             <div class="content"> 
+              <iframe width="420px" height="236px" src="https://www.youtube.com/embed/fb5VbU-VY8I?rel=0" frameborder="0" allowfullscreen></iframe> 
+             </div> 
+            </div>
+           </div></td> 
+         </tr> 
+        </tbody> 
+       </table> 
+      </div> 
+     </div> 
+    </div> 
+    <footer> 
+     <hr> 
+     <p class="small"> Copyright � 2010~2016 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0. <br> Apache, the Apache feather logo, Apache&nbsp;Isis, and the Apache&nbsp;Isis project logo are all trademarks of The&nbsp;Apache&nbsp;Software&nbsp;Foundation. </p> 
+    </footer> 
+   </div> 
+   <div id="doc-content-right" class="large-3 medium-3 xcolumns"> 
+    <div id="toc" class="toc2"> 
+     <div class="fallback-toc"> 
+      <ul class="sectlevel1"> 
+       <li><a href="#_getting_started">Getting Started</a></li> 
+       <li><a href="#_development_environment">Development Environment</a></li> 
+       <li><a href="#_isis_add_on_modules">Isis Add-on Modules</a></li> 
+       <li><a href="#_wicket_viewer_and_isis_add_ons">Wicket Viewer and Isis Add-ons</a></li> 
+       <li><a href="#_restful_objects_viewer">Restful Objects Viewer</a></li> 
+       <li><a href="#_jrebel_integration">JRebel Integration</a></li> 
+      </ul> 
+     </div> 
+    </div> 
+   </div> 
+  </div> 
+  <script src="./js/foundation/5.5.1/vendor/jquery.js"></script> 
+  <script src="./js/foundation/5.5.1/foundation.min.js"></script> 
+  <link href="./css/jquery.tocify/1.9.0/jquery.tocify.css" rel="stylesheet"> 
+  <script src="./js/jqueryui/1.11.4/jquery-ui.min.js"></script> 
+  <script src="./js/jquery.tocify/1.9.0/jquery.tocify.js"></script> 
+  <script type="text/javascript">
     $(function () {
         $("#toc").tocify({
             scrollTo: 50,
@@ -844,9 +872,8 @@ table.CodeRay td.code>pre{padding:0}
         });
         $(".fallback-toc").hide();
     });
-</script>
-
-<script type="text/javascript">
+</script> 
+  <script type="text/javascript">
 
   /****
 
@@ -956,9 +983,8 @@ table.CodeRay td.code>pre{padding:0}
 
     ***/
 
-</script>
-
-<script type="text/javascript">
+</script> 
+  <script type="text/javascript">
 
 $(document).ready(function(){
     if("Documentation" === "(Older) Screencasts") {
@@ -970,10 +996,8 @@ $(document).ready(function(){
 
 });
 
-</script>
-
-
-<script>
+</script> 
+  <script>
 
 $( document ).ready(function() {
 
@@ -1064,7 +1088,6 @@ $( document ).ready(function() {
 
 
 });
-</script>
-
-</body>
+</script>  
+ </body>
 </html>


[07/44] isis-site git commit: ISIS-1594: provide an 'edit' button

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/migration-notes.html
----------------------------------------------------------------------
diff --git a/content/migration-notes.html b/content/migration-notes.html
index 1e4520d..833fee2 100644
--- a/content/migration-notes.html
+++ b/content/migration-notes.html
@@ -1,12 +1,10 @@
 <!doctype html>
 <html class="no-js" lang="en">
-<head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-
-    <title>Migration Notes</title>
-
-    <!--
+ <head> 
+  <meta charset="utf-8"> 
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"> 
+  <title>Migration Notes</title> 
+  <!--
         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
@@ -23,31 +21,21 @@
         KIND, either express or implied.  See the License for the
         specific language governing permissions and limitations
         under the License.
-    -->
-
-    <!-- No caching headers -->
-    <meta http-equiv="cache-control" content="no-cache" />
-    <meta http-equiv="pragma" content="no-cache" />
-    <meta http-equiv="expires" content="-1" />
-
-
-    <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
-    <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet" />
-    <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script>
-    <link href="../css/asciidoctor/colony.css" rel="stylesheet">
-    <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-
-
-
-    <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
-    <!--[if lt IE 9]>
+    --> 
+  <!-- No caching headers --> 
+  <meta http-equiv="cache-control" content="no-cache"> 
+  <meta http-equiv="pragma" content="no-cache"> 
+  <meta http-equiv="expires" content="-1"> 
+  <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line --> 
+  <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet"> 
+  <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script> 
+  <link href="../css/asciidoctor/colony.css" rel="stylesheet"> 
+  <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet"> 
+  <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet"> 
+  <!--[if lt IE 9]>
       <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
-    <![endif]-->
-
-
-
-    <style type="text/css">
+    <![endif]--> 
+  <style type="text/css">
         pre code {
             background-color: inherit;
             border-style: none;
@@ -192,9 +180,8 @@ table.CodeRay td.code>pre{padding:0}
         color:#fff;
         font-size: 1.1em;
     }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         @media only screen and (min-width: 40.063em) {
           .top-bar {
             .contain-to-grid .top-bar {
@@ -205,9 +192,8 @@ table.CodeRay td.code>pre{padding:0}
         .row {
             max-width: 80rem;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .extended-quote,
         .extended-quote-first {
             margin-left: 40px;
@@ -231,9 +217,8 @@ table.CodeRay td.code>pre{padding:0}
             text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
         }
         
-    </style>
-
-    <style>
+    </style> 
+  <style>
         body {
           position: relative;
         }
@@ -255,6 +240,7 @@ table.CodeRay td.code>pre{padding:0}
 
         div#doc-content {
             margin-top: 30px;
+            padding-top: 30px;
         }
 
         div.documentation-page table.frame-all {
@@ -286,9 +272,8 @@ table.CodeRay td.code>pre{padding:0}
             min-height: 2000px;
         }
 
-    </style>
-
-    <style>
+    </style> 
+  <style>
 
         @media only screen and (min-width: 768px) {
           #toc.toc2 ul ul { margin-left: -10px; }
@@ -316,15 +301,13 @@ table.CodeRay td.code>pre{padding:0}
         body div#toc2 li.tocify-item.active a {
             color: red;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         footer {
             margin-top: 1000px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* overriding colony.css stylesheet */
         .literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
            /*padding: 1.25em 1.5625em 1.125em 1.5625em;*/
@@ -372,9 +355,8 @@ table.CodeRay td.code>pre{padding:0}
         .imageblock img {
             margin-bottom: 10px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* from http://ben.balter.com/2014/03/13/pages-anchor-links/ */
         .header-link {
           position: absolute;
@@ -395,9 +377,8 @@ table.CodeRay td.code>pre{padding:0}
         h6:hover .header-link {
           opacity: 1;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .top-bar
         {
             -webkit-transition-duration: .5s;
@@ -425,379 +406,272 @@ table.CodeRay td.code>pre{padding:0}
             -webkit-transition-property: -webkit-transform;
             transition-property: transform;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         #doc-content a.guide {
             color: white;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
+        .tocify {
+            margin-top: 80px;
+        }
+    </style> 
+  <style>
         .tocify {
             margin-top: 80px;
         }
-    </style>
-
-
-</script>
-
-</head>
-<body>
-
-<<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
-    <div class="github-fork-ribbon">
-        <a href="https://github.com/apache/isis#fork-destination-box">Fork me on GitHub</a>
-    </div>
-</div>
-
-
-<div class="row">
-
-    <div class="fixed contain-to-grid header">
-        <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
-            <ul class="title-area">
-                <li class="name">
-                    <h1>
-                        <a href="/index.html">Apache Isis&trade;</a>
-                    </h1>
-                </li>
-                <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
-                <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
-            </ul>
-
-            <section class="top-bar-section">
-                <ul class="right">
-
-                    <li class="has-form">
-                       <FORM class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
-                        <div class="row collapse">
-                            <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
-                            <INPUT type="hidden" name="cof" value="FORID:0">
-                            <INPUT class="form-control" name="q" type="text" placeholder="Search">
-                        </div>
-                    </FORM>
-                     </li>
-
-                </ul>
-
-                <!-- Left Nav Section -->
-                <ul class="left">
-
-                    <li><a href="/documentation.html">Documentation</a></li>
-                    <li><a href="/downloads.html">Downloads</a></li>
-                    <li><a href="/help.html">Help</a></li>
-                    <li><a href="/asf.html">@ASF</a></li>
-
-                </ul>
-
-            </section>
-        </nav>
-    </div>
-</div>
-
-<div class="row">
-
-    <div id="doc-content-left" class="large-9 medium-9 columns">
-
-
-        <div id="doc-content">
-          <div class="sect1">
-<h2 id="_migration-notes_1.13.0-to-1.14.0">From v1.13.x to 1.14.0</h2>
-<div class="sectionbody">
-<div class="sect2">
-<h3 id="_new_metamodel_validations">New metamodel validations</h3>
-<div class="paragraph">
-<p>This release defines a number of metamodel validations.
-These can be enabled or disabled using configuration properties:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><code>isis.reflector.validator.explicitObjectType</code><br></p>
-<div class="paragraph">
-<p>Whether to check that the class has an object type explicitly specified somehow.
-This is strongly recommended, but is disabled by default to prevent migration issues.</p>
-</div>
-</li>
-<li>
-<p><code>isis.reflector.validator.jdoqlFromClause</code><br></p>
-<div class="paragraph">
-<p>Whether to check that the class name in JDOQL <code>FROM</code> clause matches or is a supertype of the class on which it is annotated.
-This is enabled by default.</p>
-</div>
-</li>
-<li>
-<p><code>isis.reflector.validator.jdoqlVariablesClause</code><br></p>
-<div class="paragraph">
-<p>Whether to check that the class name in JDOQL <code>VARIABLES</code> clause is a recognized class.
-This is enabled by default.</p>
-</div>
-</li>
-<li>
-<p><code>isis.reflector.validator.mixinsOnly</code><br></p>
-<div class="paragraph">
-<p>This is disabled by default; if enabled, this configuration property will treat any contributed service as invalid; instead use mixins (as a simpler/less confusing programming model).</p>
-</div>
-</li>
-<li>
-<p><code>isis.reflector.validator.noParamsOnly</code><br></p>
-<div class="paragraph">
-<p>When searching for  <a href="rgcms.html#_rgcms_methods_prefixes_disable"><code>disableXxx()</code></a> or <a href="rgcms.html#_rgcms_methods_prefixes_hide"><code>hideXxx()</code></a> supporting methods, whether to search only for the no-param version (or also for supporting methods that match the parameter types of the action).<br></p>
-</div>
-<div class="paragraph">
-<p>This is disabled by default; if enabled then this makes for a simpler programming model.</p>
-</div>
-</li>
-<li>
-<p><code>isis.reflector.validator.serviceActionsOnly</code><br></p>
-<div class="paragraph">
-<p>Domain services are stateless (at least conceptually) and so should not have any properties or collections; any that are defined will not be rendered by the viewers.<br></p>
-</div>
-<div class="paragraph">
-<p>This is disabled by default; if enabled, then this ensure that domain services only declare actions and so makes for a simpler programming model.</p>
-</div>
-</li>
-</ul>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_migration-notes_1.12.0-to-1.13.0">From v1.12.x to 1.13.0</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Most applications written against v1.12.x should run against v1.13.0 with few if any changes.  That said, this release
-has removed a small number of features that were dependent on internal APIs, and some configuration properties are
-now removed/unsupported.  We therefore do recommend that you read and keep in mind these notes when you upgrade your app.</p>
-</div>
-<div class="paragraph">
-<p>If you <strong>do</strong> encounter any difficulties then let us know via the <a href="support.html">users mailing list</a>, so we can
-support you and document issues here.</p>
-</div>
-<div class="sect2">
-<h3 id="_command_changes">Command changes</h3>
-<div class="paragraph">
-<p>The main feature in <code>1.13.0</code> is the <a href="guides/rgsvc.html#<em>rgsvc_api_InteractionContext"><code>InteractionContext</code></a> domain service
-to represent an action invocation/property edit, with the re-positioning of
-<a href="guides/rgsvc.html#_rgsvc_api_CommandContext"><code>CommandContext</code></a> to represent the _intention</em> to invoke an action/edit a
-property.  You can read more about this design in the reference guide on domain services, in the
-<a href="guides/rgsvc.html#_rgsvc_intro_commands-and-events">commands and events</a> section.</p>
-</div>
-<div class="paragraph">
-<p>This refactoring completely overhauls the structure of the XML mementos passed to
-<a href="guides/rgsvc.html#_rgsvc_spi_CommandService"><code>CommandService</code></a> (to persist) and to
-<a href="guides/rgsvc.html#_rgsvc_spi_BackgroundCommandService"><code>BackgroundCommandService</code></a> (to invoke persisted commands in the
-background).  If you are using these services then ensure that there are no pending commands at the point at which you
-cut-over.  If you have any code that makes assumptions on the format of the XML, it will also need to be rewritten.
-Note that the XML which is persisted henceforth is well-defined and any future changes to it will be backward
-compatible; see <a href="guides/rgcms.html#_rgcms_schema">schema reference guide</a>.  In fact, there are three schema: for commands
-(<code>cmd.xsd</code>), inteactions (<code>ixn.xsd</code>) and for changes (<code>chg.xsd</code>).  These replace the earlier <code>aim.xsd</code> schema (which
-was an amalgam of <code>cmd.xsd</code> and <code>ixn.xsd</code>).</p>
-</div>
-<div class="paragraph">
-<p>The reworked <code>CommandService</code> now properly supports property edits in the exact same way as action invocations.</p>
-</div>
-<div class="paragraph">
-<p>As a side-effect of this work, note also that:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>the <code>CommandService#startTransaction(&#8230;&#8203;)</code> SPI is <strong>NO LONGER CALLED</strong> by the framework.</p>
-</li>
-<li>
-<p>the <code>BackgroundService#asActionInvocationMemento(&#8230;&#8203;)</code> (not formally part of the API) is also no longer called by the
-framework; moreover the default implementation now throws an exception to this effect.</p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_auditing">Auditing</h3>
-<div class="paragraph">
-<p>The <a href="guides/rgsvc.html#_rgsvc_spi_AuditingService"><code>AuditingService</code></a> SPI service has been deprecated, instead replaced
-by the <a href="guides/rgsvc.html#_rgsvc_spi_AuditerService"><code>AuditerService</code></a>.</p>
-</div>
-<div class="paragraph">
-<p>There can be more than one implementation of this new SPI, and a framework-provided implementation
-(<code>AuditerServiceLogging</code>) will log to a file.  The (non-ASF)
-<a href="http://github.com/isisaddons/isis-module-audit">Isis addons' audit</a> module also implements the new SPI.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_publishing">Publishing</h3>
-<div class="paragraph">
-<p>The <a href="guides/rgsvc.html#_rgsvc_spi_PublishingService"><code>PublishingService</code></a> SPI service and its supporting
-<a href="guides/rgsvc.html#_rgsvc_spi_EventSerializer"><code>EventSerializer</code></a> domain service, have both deprecated, instead
-replaced by the <a href="guides/rgsvc.html#_rgsvc_spi_PublisherService"><code>PublisherService</code></a>.</p>
-</div>
-<div class="paragraph">
-<p>There can be more than one implementation of this new SPI, and a framework-provided implementation
-(<code>PublisherServiceLogging</code>) will log to a file.  The (non-ASF)
-<a href="http://github.com/isisaddons/isis-module-publishmq">Isis addons' publishmq</a> module also implements the new SPI.</p>
-</div>
-<div class="paragraph">
-<p>The new service also supports the notion of published property edits; the new
-<a href="guides/rgant.html#_rgant_Property_publishing"><code>@Property#publishing()</code></a> annotation attribute can be used to specify.  The `
-isis.services.publish.properties` configuration property can be used to specify a fallback default for properties where
-the attribute is not set explicitly.</p>
-</div>
-<div class="paragraph">
-<p>Conversely, neither the <a href="guides/rgant.html#_rgant_Action_publishingPayloadFactory"><code>@Action#publishingPayloadFactory()</code></a>
-nor the <a href="guides/rgant.html#_rgant_DomainObject_publishingPayloadFactory"><code>@DomainObject#publishingPayloadFactory()</code></a> are
-supported by <code>PublisherService</code>; instead the consumers of the events are expected to callback for any additional
-information, eg using <a href="#guides/ugvro.adoc">Resful Objects</a> viewer.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_auto_logout">Auto-logout</h3>
-<div class="paragraph">
-<p>The new configuration property <code>isis.authentication.shiro.autoLogoutIfAlreadyAuthenticated</code> (documented more fully in
-the  <a href="guides/ugsec.html#_ugsec_configuring-isis-to-use-shiro">security guide</a>) is by default set to false, thereby
-disabling auto-logout behaviour that is believed to be the root cause of some exceptions thrown by the
-<a href="guides/ugvro.html">Restful Objects viewer</a> during a race condition.  The <strong>previous behaviour can be re-enabled</strong> by setting
-to <code>true</code>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_safe_rememberme_cookies">Safe 'rememberMe' cookies</h3>
-<div class="paragraph">
-<p>Apache Isis leverages <a href="http://wicket.apache.org">Apache Wicket</a>'s rememberMe support which holds remembered
-user/passwords in an encrypted cookie.</p>
-</div>
-<div class="paragraph">
-<p>If a hard-coded and publicly known value were to be used (as was the case prior to <code>1.13.0</code>), then it would be
-possible for rememberMe user/password to be intercepted and decrypted, possibly compromising access.  The
-<code>isis.viewer.wicket.rememberMe.encryptionKey</code> configuration property therefore allows a private key to be specified,
-baked into the application.</p>
-</div>
-<div class="paragraph">
-<p>If no value is set then (for safety) a random UUID will be used as the encryption key.  (The net effect of this
-fallback behaviour is that 'rememberMe' will work, but only until the webapp is restarted (after which the end-user
-will have to log in again).</p>
-</div>
-<div class="paragraph">
-<p>Related, the <code>isis.viewer.wicket.suppressRememberMe</code> configuration property has been replaced by
-<code>isis.viewer.wicket.rememberMe.suppress</code> (though the old configuration property is still supported).</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_custom_programming_models">Custom programming models</h3>
-<div class="paragraph">
-<p>In previous releases the <code>isis.reflector.facets</code> configuration property could be used to specify a new implementation
-of the (internal) <code>ProgrammingModel</code> API.  This configuration property is no longer supported.  See the
-<a href="guides/ugbtb.html#_ugbtb_programming-model_finetuning">beyond the basics</a> guide for an alternative broadly equivalent
-approach.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_injectxxx_no_longer_supported">injectXxx() no longer supported</h3>
-<div class="paragraph">
-<p>Apache Isis automatically injects domain services into other domain objects, supporting the
-<a href="guides/rgant.html#_rgant-Inject"><code>@Inject</code></a> annotation, also injection to <code>set&#8230;&#8203;()</code> setter methods and finally injection
-into <code>inject&#8230;&#8203;()</code> methods.  This last method is now no longer supported by default.  It can be re-enabled if necessary
-using the <code>isis.services.injector.injectPrefix</code> configuration property.</p>
-</div>
-<div class="paragraph">
-<p>It is also possible to disable injection to <code>set&#8230;&#8203;()</code> methods (using the <code>isis.services.injector.setPrefix</code>
-configuration property), though this is enabled by default.</p>
-</div>
-<div class="paragraph">
-<p>Disabling auto-wiring has a positive impact on bootstrap times, as well as standarding Apache Isis' conventions to be
-more in line with JEE.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_optionally_ignore_deprecated_facets">Optionally ignore deprecated facets</h3>
-<div class="paragraph">
-<p>The <code>isis.reflector.facets.ignoreDeprecated</code> configuration property indicates whether to continue to honour or to simply
-ignore any deprecated annotations and other semantics that make up the programming model.</p>
-</div>
-<div class="paragraph">
-<p>This is disabled by default, in other words deprecated facets continue to be recognized.  Be aware that enabling this
-setting could substantially alter the semantics of your application.  To be safe, we recommend that you first run the
-application using <code>isis.reflector.validator.allowDeprecated</code> set to <code>false</code>; if any deprecated annotations etc. are
-in use, then the app will fail-fast and refuse to start.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_applicationfeaturerepository">ApplicationFeatureRepository</h3>
-<div class="paragraph">
-<p>The <code>isis.services.applicationFeatures.init</code> configuration property is used to control whether the
-<a href="guides/rgsvc.html#_rgsvc_api_ApplicationFeatureRepository"><code>ApplicationFeatureRepository</code></a> domain service lazily or
-eagerly initializes itself based on the framework&#8217;s internal metamodel.</p>
-</div>
-<div class="paragraph">
-<p>Previously this service eagerly initialized itself, causing the framework to have to traverse the domain object
-model graph for all types, noticeably increasing the bootstrap time.  For <code>1.13.0</code> this service now initializes itself
-lazily.  The previous behaviour (of eager initialization) can be re-enabled by setting this property to <code>eager</code>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_integration_testing">Integration testing</h3>
-<div class="paragraph">
-<p>There are two sets of changes relating to integration tests.</p>
-</div>
-<div class="sect3">
-<h4 id="_builder">Builder</h4>
-<div class="paragraph">
-<p>The <code>IsisSystemForTest.Builder</code> class is used to <a href="guides/ugtst.html#_ugtst_integ-test-support_bootstrapping">bootstrap integration tests</a>.</p>
-</div>
-<div class="paragraph">
-<p>A number of the clauses within this class have been removed:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><code>with(PersistenceMechanismInstaller persistenceMechanismInstaller)</code><br></p>
-<div class="paragraph">
-<p>Apache Isis has for many releases only supported a single implementation of persistence mechanism (JDO/DataNucleus),
-so this builder method is redundant.</p>
-</div>
-</li>
-<li>
-<p><code>with(ProgrammingModel programmingModel)</code><br></p>
-<div class="paragraph">
-<p>Instead, use <code>AppManifest#getConfiguration()</code> to <a href="guides/ugbtb.html#_ugbtb_programming-model_finetuning">include/exclude facets</a></p>
-</div>
-</li>
-<li>
-<p><code>with(MetaModelValidator metaModelValidator)</code><br></p>
-<div class="paragraph">
-<p>Instead, use <code>AppManifest#getConfiguration()</code> to specify a <a href="guides/ugbtb.html#_ugbtb_programming-model_custom-validator">custom validator</a>.</p>
-</div>
-</li>
-<li>
-<p><code>withServicesIn(String&#8230;&#8203; packagePrefixes)</code> and <code>withServices(Object&#8230;&#8203; services)</code><br></p>
-<div class="paragraph">
-<p>Instead, use <code>AppManifest#getAdditionalServices()</code></p>
-</div>
-</li>
-<li>
-<p><code>withFixtures(InstallableFixture&#8230;&#8203; fixtures)</code><br></p>
-<div class="paragraph">
-<p>Instead, use <code>AppManifest#getFixtures()</code></p>
-</div>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_centralizing_configuration">Centralizing configuration</h4>
-<div class="paragraph">
-<p>Previously when bootstrapping the integration tests, the <code>IsisConfigurationForJdoIntegTests</code> was provided as a custom
-implementation of <code>IsisConfiguration</code>, providing a number of configuration settings specifically for running
-integration tests (eg run using an in-memory database).  This design split the responsiblity of providing the
-configuration properties between that class and <code>AppManifest</code>.</p>
-</div>
-<div class="paragraph">
-<p>A new <code>AppManifest.Util</code> helper class now allows these responsibilities to belong exlusively to the <code>AppManifest</code>.
-For example:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">DomainAppSystemInitializer</span> {
+    </style>  
+ </head> 
+ <body> 
+  <div class="row"> 
+   <div class="fixed contain-to-grid header"> 
+    <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem"> 
+     <ul class="title-area"> 
+      <li class="name"> <h1> <a href="/index.html">Apache Isis\u2122</a> </h1> </li> 
+      <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone --> 
+      <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li> 
+     </ul> 
+     <section class="top-bar-section"> 
+      <ul class="right"> 
+       <li class="has-form"> 
+        <form class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse"> 
+         <div class="row collapse"> 
+          <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya"> 
+          <input type="hidden" name="cof" value="FORID:0"> 
+          <input class="form-control" name="q" type="text" placeholder="Search"> 
+         </div> 
+        </form> </li> 
+      </ul> 
+      <!-- Left Nav Section --> 
+      <ul class="left"> 
+       <li><a href="/documentation.html">Documentation</a></li> 
+       <li><a href="/downloads.html">Downloads</a></li> 
+       <li><a href="/help.html">Help</a></li> 
+       <li><a href="/asf.html">@ASF</a></li> 
+      </ul> 
+     </section> 
+    </nav> 
+   </div> 
+  </div> 
+  <div class="row"> 
+   <div id="doc-content-left" class="large-9 medium-9 columns"> 
+    <div id="doc-content">
+     <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/migration-notes.adoc&quot;" style="float: right; font-size: small; padding: 6px;  "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+     <div id="preamble"> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>Consult these notes when migrating to new versions of the framework.</p> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_migration-notes_1.13.0-to-1.14.0">From v1.13.x to 1.14.0</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_migration-notes_1.13.0-to-1.14.0.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="sect2"> 
+        <h3 id="_new_metamodel_validations">New metamodel validations</h3> 
+        <div class="paragraph"> 
+         <p>This release defines a number of metamodel validations. These can be enabled or disabled using configuration properties:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><code>isis.reflector.validator.explicitObjectType</code><br></p> 
+           <div class="paragraph"> 
+            <p>Whether to check that the class has an object type explicitly specified somehow. This is strongly recommended, but is disabled by default to prevent migration issues.</p> 
+           </div> </li> 
+          <li> <p><code>isis.reflector.validator.jdoqlFromClause</code><br></p> 
+           <div class="paragraph"> 
+            <p>Whether to check that the class name in JDOQL <code>FROM</code> clause matches or is a supertype of the class on which it is annotated. This is enabled by default.</p> 
+           </div> </li> 
+          <li> <p><code>isis.reflector.validator.jdoqlVariablesClause</code><br></p> 
+           <div class="paragraph"> 
+            <p>Whether to check that the class name in JDOQL <code>VARIABLES</code> clause is a recognized class. This is enabled by default.</p> 
+           </div> </li> 
+          <li> <p><code>isis.reflector.validator.mixinsOnly</code><br></p> 
+           <div class="paragraph"> 
+            <p>This is disabled by default; if enabled, this configuration property will treat any contributed service as invalid; instead use mixins (as a simpler/less confusing programming model).</p> 
+           </div> </li> 
+          <li> <p><code>isis.reflector.validator.noParamsOnly</code><br></p> 
+           <div class="paragraph"> 
+            <p>When searching for <a href="rgcms.html#_rgcms_methods_prefixes_disable"><code>disableXxx()</code></a> or <a href="rgcms.html#_rgcms_methods_prefixes_hide"><code>hideXxx()</code></a> supporting methods, whether to search only for the no-param version (or also for supporting methods that match the parameter types of the action).<br></p> 
+           </div> 
+           <div class="paragraph"> 
+            <p>This is disabled by default; if enabled then this makes for a simpler programming model.</p> 
+           </div> </li> 
+          <li> <p><code>isis.reflector.validator.serviceActionsOnly</code><br></p> 
+           <div class="paragraph"> 
+            <p>Domain services are stateless (at least conceptually) and so should not have any properties or collections; any that are defined will not be rendered by the viewers.<br></p> 
+           </div> 
+           <div class="paragraph"> 
+            <p>This is disabled by default; if enabled, then this ensure that domain services only declare actions and so makes for a simpler programming model.</p> 
+           </div> </li> 
+         </ul> 
+        </div> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_migration-notes_1.12.0-to-1.13.0">From v1.12.x to 1.13.0</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_migration-notes_1.12.0-to-1.13.0.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>Most applications written against v1.12.x should run against v1.13.0 with few if any changes. That said, this release has removed a small number of features that were dependent on internal APIs, and some configuration properties are now removed/unsupported. We therefore do recommend that you read and keep in mind these notes when you upgrade your app.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>If you <strong>do</strong> encounter any difficulties then let us know via the <a href="support.html">users mailing list</a>, so we can support you and document issues here.</p> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_command_changes">Command changes</h3> 
+        <div class="paragraph"> 
+         <p>The main feature in <code>1.13.0</code> is the <a href="guides/rgsvc.html#<em>rgsvc_api_InteractionContext"><code>InteractionContext</code></a> domain service to represent an action invocation/property edit, with the re-positioning of <a href="guides/rgsvc.html#_rgsvc_api_CommandContext"><code>CommandContext</code></a> to represent the _intention to invoke an action/edit a property. You can read more about this design in the reference guide on domain services, in the <a href="guides/rgsvc.html#_rgsvc_intro_commands-and-events">commands and events</a> section.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>This refactoring completely overhauls the structure of the XML mementos passed to <a href="guides/rgsvc.html#_rgsvc_spi_CommandService"><code>CommandService</code></a> (to persist) and to <a href="guides/rgsvc.html#_rgsvc_spi_BackgroundCommandService"><code>BackgroundCommandService</code></a> (to invoke persisted commands in the background). If you are using these services then ensure that there are no pending commands at the point at which you cut-over. If you have any code that makes assumptions on the format of the XML, it will also need to be rewritten. Note that the XML which is persisted henceforth is well-defined and any future changes to it will be backward compatible; see <a href="guides/rgcms.html#_rgcms_schema">schema reference guide</a>. In fact, there are three schema: for commands (<code>cmd.xsd</code>), inteactions (<code>ixn.xsd</code>) and for changes (<code>chg.xsd</code>). These replace the earlier <code>aim.xsd</code> schema (which was an amalgam of <
 code>cmd.xsd</code> and <code>ixn.xsd</code>).</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The reworked <code>CommandService</code> now properly supports property edits in the exact same way as action invocations.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>As a side-effect of this work, note also that:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p>the <code>CommandService#startTransaction(\u2026\u200b)</code> SPI is <strong>NO LONGER CALLED</strong> by the framework.</p> </li> 
+          <li> <p>the <code>BackgroundService#asActionInvocationMemento(\u2026\u200b)</code> (not formally part of the API) is also no longer called by the framework; moreover the default implementation now throws an exception to this effect.</p> </li> 
+         </ul> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_auditing">Auditing</h3> 
+        <div class="paragraph"> 
+         <p>The <a href="guides/rgsvc.html#_rgsvc_spi_AuditingService"><code>AuditingService</code></a> SPI service has been deprecated, instead replaced by the <a href="guides/rgsvc.html#_rgsvc_spi_AuditerService"><code>AuditerService</code></a>.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>There can be more than one implementation of this new SPI, and a framework-provided implementation (<code>AuditerServiceLogging</code>) will log to a file. The (non-ASF) <a href="http://github.com/isisaddons/isis-module-audit">Isis addons' audit</a> module also implements the new SPI.</p> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_publishing">Publishing</h3> 
+        <div class="paragraph"> 
+         <p>The <a href="guides/rgsvc.html#_rgsvc_spi_PublishingService"><code>PublishingService</code></a> SPI service and its supporting <a href="guides/rgsvc.html#_rgsvc_spi_EventSerializer"><code>EventSerializer</code></a> domain service, have both deprecated, instead replaced by the <a href="guides/rgsvc.html#_rgsvc_spi_PublisherService"><code>PublisherService</code></a>.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>There can be more than one implementation of this new SPI, and a framework-provided implementation (<code>PublisherServiceLogging</code>) will log to a file. The (non-ASF) <a href="http://github.com/isisaddons/isis-module-publishmq">Isis addons' publishmq</a> module also implements the new SPI.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The new service also supports the notion of published property edits; the new <a href="guides/rgant.html#_rgant_Property_publishing"><code>@Property#publishing()</code></a> annotation attribute can be used to specify. The ` isis.services.publish.properties` configuration property can be used to specify a fallback default for properties where the attribute is not set explicitly.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Conversely, neither the <a href="guides/rgant.html#_rgant_Action_publishingPayloadFactory"><code>@Action#publishingPayloadFactory()</code></a> nor the <a href="guides/rgant.html#_rgant_DomainObject_publishingPayloadFactory"><code>@DomainObject#publishingPayloadFactory()</code></a> are supported by <code>PublisherService</code>; instead the consumers of the events are expected to callback for any additional information, eg using <a href="#guides/ugvro.adoc">Resful Objects</a> viewer.</p> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_auto_logout">Auto-logout</h3> 
+        <div class="paragraph"> 
+         <p>The new configuration property <code>isis.authentication.shiro.autoLogoutIfAlreadyAuthenticated</code> (documented more fully in the <a href="guides/ugsec.html#_ugsec_configuring-isis-to-use-shiro">security guide</a>) is by default set to false, thereby disabling auto-logout behaviour that is believed to be the root cause of some exceptions thrown by the <a href="guides/ugvro.html">Restful Objects viewer</a> during a race condition. The <strong>previous behaviour can be re-enabled</strong> by setting to <code>true</code>.</p> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_safe_rememberme_cookies">Safe 'rememberMe' cookies</h3> 
+        <div class="paragraph"> 
+         <p>Apache Isis leverages <a href="http://wicket.apache.org">Apache Wicket</a>'s rememberMe support which holds remembered user/passwords in an encrypted cookie.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>If a hard-coded and publicly known value were to be used (as was the case prior to <code>1.13.0</code>), then it would be possible for rememberMe user/password to be intercepted and decrypted, possibly compromising access. The <code>isis.viewer.wicket.rememberMe.encryptionKey</code> configuration property therefore allows a private key to be specified, baked into the application.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>If no value is set then (for safety) a random UUID will be used as the encryption key. (The net effect of this fallback behaviour is that 'rememberMe' will work, but only until the webapp is restarted (after which the end-user will have to log in again).</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Related, the <code>isis.viewer.wicket.suppressRememberMe</code> configuration property has been replaced by <code>isis.viewer.wicket.rememberMe.suppress</code> (though the old configuration property is still supported).</p> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_custom_programming_models">Custom programming models</h3> 
+        <div class="paragraph"> 
+         <p>In previous releases the <code>isis.reflector.facets</code> configuration property could be used to specify a new implementation of the (internal) <code>ProgrammingModel</code> API. This configuration property is no longer supported. See the <a href="guides/ugbtb.html#_ugbtb_programming-model_finetuning">beyond the basics</a> guide for an alternative broadly equivalent approach.</p> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_injectxxx_no_longer_supported">injectXxx() no longer supported</h3> 
+        <div class="paragraph"> 
+         <p>Apache Isis automatically injects domain services into other domain objects, supporting the <a href="guides/rgant.html#_rgant-Inject"><code>@Inject</code></a> annotation, also injection to <code>set\u2026\u200b()</code> setter methods and finally injection into <code>inject\u2026\u200b()</code> methods. This last method is now no longer supported by default. It can be re-enabled if necessary using the <code>isis.services.injector.injectPrefix</code> configuration property.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>It is also possible to disable injection to <code>set\u2026\u200b()</code> methods (using the <code>isis.services.injector.setPrefix</code> configuration property), though this is enabled by default.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Disabling auto-wiring has a positive impact on bootstrap times, as well as standarding Apache Isis' conventions to be more in line with JEE.</p> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_optionally_ignore_deprecated_facets">Optionally ignore deprecated facets</h3> 
+        <div class="paragraph"> 
+         <p>The <code>isis.reflector.facets.ignoreDeprecated</code> configuration property indicates whether to continue to honour or to simply ignore any deprecated annotations and other semantics that make up the programming model.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>This is disabled by default, in other words deprecated facets continue to be recognized. Be aware that enabling this setting could substantially alter the semantics of your application. To be safe, we recommend that you first run the application using <code>isis.reflector.validator.allowDeprecated</code> set to <code>false</code>; if any deprecated annotations etc. are in use, then the app will fail-fast and refuse to start.</p> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_applicationfeaturerepository">ApplicationFeatureRepository</h3> 
+        <div class="paragraph"> 
+         <p>The <code>isis.services.applicationFeatures.init</code> configuration property is used to control whether the <a href="guides/rgsvc.html#_rgsvc_api_ApplicationFeatureRepository"><code>ApplicationFeatureRepository</code></a> domain service lazily or eagerly initializes itself based on the framework\u2019s internal metamodel.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Previously this service eagerly initialized itself, causing the framework to have to traverse the domain object model graph for all types, noticeably increasing the bootstrap time. For <code>1.13.0</code> this service now initializes itself lazily. The previous behaviour (of eager initialization) can be re-enabled by setting this property to <code>eager</code>.</p> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_integration_testing">Integration testing</h3> 
+        <div class="paragraph"> 
+         <p>There are two sets of changes relating to integration tests.</p> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_builder">Builder</h4> 
+         <div class="paragraph"> 
+          <p>The <code>IsisSystemForTest.Builder</code> class is used to <a href="guides/ugtst.html#_ugtst_integ-test-support_bootstrapping">bootstrap integration tests</a>.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>A number of the clauses within this class have been removed:</p> 
+         </div> 
+         <div class="ulist"> 
+          <ul> 
+           <li> <p><code>with(PersistenceMechanismInstaller persistenceMechanismInstaller)</code><br></p> 
+            <div class="paragraph"> 
+             <p>Apache Isis has for many releases only supported a single implementation of persistence mechanism (JDO/DataNucleus), so this builder method is redundant.</p> 
+            </div> </li> 
+           <li> <p><code>with(ProgrammingModel programmingModel)</code><br></p> 
+            <div class="paragraph"> 
+             <p>Instead, use <code>AppManifest#getConfiguration()</code> to <a href="guides/ugbtb.html#_ugbtb_programming-model_finetuning">include/exclude facets</a></p> 
+            </div> </li> 
+           <li> <p><code>with(MetaModelValidator metaModelValidator)</code><br></p> 
+            <div class="paragraph"> 
+             <p>Instead, use <code>AppManifest#getConfiguration()</code> to specify a <a href="guides/ugbtb.html#_ugbtb_programming-model_custom-validator">custom validator</a>.</p> 
+            </div> </li> 
+           <li> <p><code>withServicesIn(String\u2026\u200b packagePrefixes)</code> and <code>withServices(Object\u2026\u200b services)</code><br></p> 
+            <div class="paragraph"> 
+             <p>Instead, use <code>AppManifest#getAdditionalServices()</code></p> 
+            </div> </li> 
+           <li> <p><code>withFixtures(InstallableFixture\u2026\u200b fixtures)</code><br></p> 
+            <div class="paragraph"> 
+             <p>Instead, use <code>AppManifest#getFixtures()</code></p> 
+            </div> </li> 
+          </ul> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_centralizing_configuration">Centralizing configuration</h4> 
+         <div class="paragraph"> 
+          <p>Previously when bootstrapping the integration tests, the <code>IsisConfigurationForJdoIntegTests</code> was provided as a custom implementation of <code>IsisConfiguration</code>, providing a number of configuration settings specifically for running integration tests (eg run using an in-memory database). This design split the responsiblity of providing the configuration properties between that class and <code>AppManifest</code>.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>A new <code>AppManifest.Util</code> helper class now allows these responsibilities to belong exlusively to the <code>AppManifest</code>. For example:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">DomainAppSystemInitializer</span> {
     <span class="directive">public</span> <span class="directive">static</span> <span class="type">void</span> initIsft() {
         IsisSystemForTest isft = IsisSystemForTest.getElseNull();
         <span class="keyword">if</span>(isft == <span class="predefined-constant">null</span>) {
@@ -818,219 +692,156 @@ For example:</p>
             IsisSystemForTest.set(isft);
         }
     }
-}</code></pre>
-</div>
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_web_xml">web.xml</h3>
-<div class="paragraph">
-<p>In the <a href="guides/ugbtb.html#_ugbtb_web-xml"><code>web.xml</code></a>, the "isis.viewers" context-param is now ignored.  Instead the
-<code>viewer_wicket.properties</code> and <code>viewer_restfulobjects.properties</code> will both be loaded if present (but neither need be present).</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="__code_hastransactionid_code_mixin"><code>HasTransactionId</code> mixin</h3>
-<div class="paragraph">
-<p>The <a href="guides/rgcms.html#_rgcms_classes_mixins_HasTransactionId"><code>HasTransactionId</code></a> mixin interface has subtly changed its
-meaning (and is now somewhat mis-named).  Prior to <code>1.13.0</code>, this identifier was the GUID of the Isis transaction in
-which the object was created.  As of <code>1.13.0</code>, this identifier actually is for the request/interaction (as per the new
-<a href="guides/rgsvc.html#_rgsvc_api_InteractionContext"><code>InteractionContext</code></a> service) in which the object was created.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_notable_new_features">Notable new features</h3>
-<div class="paragraph">
-<p>The following are new features so do not impact in themselves impact any migration effort, but you may wish to start
-taking advantage of once you have upgraded.</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><code>@Nullable</code> annotation<br></p>
-<div class="paragraph">
-<p>The <a href="guides/rgant.html#_rgant_Nullable"><code>@Nullable</code></a> annotation can now be used to specify the optionality of properties
-and parameters.</p>
-</div>
-</li>
-<li>
-<p><code>ActionDomainEvent</code> for mixins<br></p>
-<div class="paragraph">
-<p>Previously it was not possible to discover the mixed-in domain object when an <code>ActionDomainEvent</code> was raised by a
-mixin action.  This is now possible, through the <a href="guides/rgcms.html#_rgcms_classes_domainevent_ActionDomainEvent"><code>mixedIn()</code></a> method.</p>
-</div>
-</li>
-<li>
-<p><code>Blob</code> and <code>Clob</code> file types<br></p>
-<div class="paragraph">
-<p>The <a href="guides/rgant.html#_rgant_Property_fileAccept"><code>@Property#fileAccept()</code></a> and
-<a href="guides/rgant.html#_rgant_Parameter_fileAccept"><code>@Parameter#fileAccept()</code></a> annotation attributes can be used to hint at
-the file type to upload for a blob or clob.</p>
-</div>
-</li>
-<li>
-<p>Live reloading<br></p>
-<div class="paragraph">
-<p>The <code>isis.viewer.wicket.liveReloadUrl</code> configuration property allows live reloading of objects if the layout is updated,
-reducing feedback times.  Further guidance on setting this up can be found
-<a href="guides/dg.html#_dg_ide_intellij_advanced_gradle-liveReload">here</a>.</p>
-</div>
-</li>
-<li>
-<p>Docker support<br></p>
-<div class="paragraph">
-<p>The <code>overrides.properties</code> configuration file, if present, is loaded last as the configuration property file, with
-its contents overriding any previously defined configuration properties.  This simple idea makes it easy to create Docker
-container images; see <a href="guides/ugbtb.html#_ugbtb_deployment_docker">here</a> for further discussion.</p>
-</div>
-</li>
-</ul>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_migration-notes_1.11.0-to-1.12.0">From v1.11.0 to 1.12.0</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Existing projects written against v1.11.x should run against v1.12.0 with few if any changes.  If you <strong>do</strong> encounter
-any difficulties then let us know via the <a href="support.html">users mailing list</a>, so we can support you and document
-issues here.</p>
-</div>
-<div class="sect2">
-<h3 id="_dynamic_xml_layouts">Dynamic XML Layouts</h3>
-<div class="paragraph">
-<p>The major new feature in 1.12.0 is <a href="guides/ugfun.html#_ugfun_object-layout_dynamic_xml">dynamic XML layouts</a>, providing
-much enhanced support for custom layouts.</p>
-</div>
-<div class="paragraph">
-<p>The new <code>Xxx.layout.xml</code> file is optional; without it domain objects will
-continue to be rendered as before, using metadata from annotations (<a href="guides/rgant.html#_rgant-DomainObjectLayout"><code>@DomainObjectLayout</code></a>,
-<a href="guides/rgant.html#_rgant-PropertyLayout"><code>@PropertyLayout</code></a>, <a href="guides/rgant.html#_rgant-CollectionLayout"><code>@CollectionLayout</code></a>,
-<a href="guides/rgant.html#_rgant-ActionLayout"><code>@ActionLayout</code></a>, <a href="guides/rgant.html#_rgant-MemberOrder"><code>@MemberOrder</code></a> and
-<a href="guides/rgant.html#_rgant-MemberGroupLayout"><code>@MemberGroupLayout</code></a>), and also from any <a href="guides/ugfun.html#_ugfun_object-layout_dynamic"><code>Xxx.layout.json</code></a>
-file that might already exist.  There is therefore no requirement to move to the new more flexible XML-based layout.</p>
-</div>
-<div class="paragraph">
-<p>If you do want to start using the new format, then you will find that 1.12.0 provides a mixin action (available in
-prototype mode only) called "download XML layout".  This will allow you to download the current layout file for the
-object being rendered.  This can then be saved alongside the class' Java source file.  Once a <code>Xxx.layout.xml</code> file
-is present, any existing <code>Xxx.layout.json</code> file will be ignored; any annotations though will continue to be honoured.</p>
-</div>
-<div class="paragraph">
-<p>If you wish to migrate all your domain objects to use XML layouts, this can be done using the "download layouts (XML)"
-(on the "Prototyping" menu), as a single zip file.  This can then be unzipped into the <code>src/main/java</code> directory.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_mixins">Mixins</h3>
-<div class="paragraph">
-<p>(As mentioned above), 1.12.0 provides a number of new mixin actions and properties:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="guides/rgcms.html#_rgcms_classes_mixins_Object_clearHints">clear hints</a> action</p>
-</li>
-<li>
-<p><a href="guides/rgcms.html#_rgcms_classes_mixins_Object_downloadLayoutXml">download Layout XML</a> action (prototype mode)</p>
-</li>
-<li>
-<p><a href="guides/rgcms.html#_rgcms_classes_mixins_Object_rebuildMetamodel">rebuild metamodel</a> action (prototype mode)</p>
-</li>
-<li>
-<p><a href="guides/rgcms.html#_rgcms_classes_mixins_Persistable_datanucleusXxx">id and version</a> properties (for domain entities only)</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>These are in addition to the <a href="guides/rgcms.html#_rgcms_classes_mixins_Persistable_downloadJdoMetadata">download JDO metadata</a> mixin action (prototype mode) provided in earlier versions of the framework.</p>
-</div>
-<div class="paragraph">
-<p>The properties are grouped in a "metadata" fieldset, and the mixin actions associated with that fieldset.  If the
-domain object is a view model rather than an entity (that is, has no id or version) then the actions will instead be rendered
-as top-level actions.</p>
-</div>
-<div class="paragraph">
-<p>Most of these mixin object members are visible only in prototype mode, though some are visible in production mode and
-so potentially visible to end-users.  If you wish to suppress these members from the view, you can either use <a href="#guides/ugsec.adoc">security</a>,
-or alternatively you can write <a href="guides/rgcms.html#_rgcms_classes_super_AbstractSubscriber">subscriber</a>s to veto the visibility
-of these members by subscribing to their respective domain events.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_jaxb_view_models_are_editable">JAXB view models are editable</h3>
-<div class="paragraph">
-<p>All <a href="guides/rgant.html#_rgant-XmlRootElement"><code>@XmlRootElement</code></a> view models are now implicitly editable.  Therefore any
-view models that should be read-only should have editing attribute disabled using <a href="guides/rgant.html#_rgant-DomainObject_editing"><code>@DomainObject#editing()</code></a> (or use a <a href="guides/rgcms.html#_rgcms_classes_super_AbstractSubscriber">subscriber</a> to veto editability).</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="__code_domainobjectcontainer_code_domain_service"><code>DomainObjectContainer</code> domain service</h3>
-<div class="paragraph">
-<p>The <a href="guides/rgsvc.html#_rgsvc_api_DomainObjectContainer"><code>DomainObjectContainer</code></a>domain service has been deprecated, with
-its methods moved to a new set of more fine-grained domain services, such as
-<a href="guides/rgsvc.html#_rgsvc_api_RepositoryService"><code>RepositoryService</code></a> and
-<a href="guides/rgsvc.html#_rgsvc_api_MessageService"><code>MessageService</code></a>.</p>
-</div>
-<div class="paragraph">
-<p>The <code>DomainObjectContainer</code> service will continue to be supported until Apache Isis v2.0.0, but in the meantime, consider
-changing existing application code to use these new domain services.</p>
-</div>
-<div class="paragraph">
-<p>Please note that when migrating from _rgsvc_api_DomainObjectContainer_object-persistence-api.adoc#_rgsvc_api_DomainObjectContainer_object-persistence-api[<code>DomainObjectContainer#persist()</code>] to <a href="guides/_rgsvc_api_RepositoryService.adoc.html#_rgsvc_api_RepositoryService"><code>RepositoryService#persist()</code></a>, no exception will be thrown if the Domain Object is already persisted, so the behavior of <a href="guides/_rgsvc_api_RepositoryService.html#_rgsvc_api_RepositoryService"><code>RepositoryService#persist()</code></a> will be the same as that of _rgsvc_api_DomainObjectContainer_object-persistence-api.adoc#_rgsvc_api_DomainObjectContainer_object-persistence-api[<code>DomainObjectContainer#persistIfNotAlready()</code>].</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_removal_of_the_code_self_host_code_profile">Removal of the <code>self-host</code> profile</h3>
-<div class="paragraph">
-<p>The <code>self-host</code> profile has been removed from the <a href="guides/ug.html#_ug_getting-started_simpleapp-archetype">SimpleApp archetype</a>.
-Instead, run the application using either the <code>org.apache.isis.WebServer</code> main class, or <code>mvn jetty:run</code>, or build the
-WAR and deploy to a servlet container such as Tomcat.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="__code_isis_viewer_wicket_disablemodaldialogs_code_removed"><code>isis.viewer.wicket.disableModalDialogs</code> removed</h3>
-<div class="paragraph">
-<p>The Apache Isis Wicket viewer uses a modal dialog for action parameters.  Before this feature was implemented (prior
-to 1.4.0), action parameters were rendered on their own page.  This property was provided to re-enable the old
-behaviour.</p>
-</div>
-<div class="paragraph">
-<p>The property has now been removed and this feature removed; actions parameters are always now always shown in a
- modal dialog.</p>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_migration-notes_1.10.0-to-1.11.0">From v1.10.0 to 1.11.0</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Existing projects written against v1.10.0 should run against v1.11.0 with few if any changes.  If you <strong>do</strong> encounter
-any difficulties then let us know via the <a href="support.html">users mailing list</a>, so we can support you and document
-issues here.</p>
-</div>
-<div class="sect2">
-<h3 id="_swagger_ui">Swagger UI</h3>
-<div class="paragraph">
-<p>The new <a href="guides/rgsvc.html#_rgsvc_api_SwaggerService"><code>SwaggerService</code></a> allows <a href="http://swagger.io">Swagger</a> spec files
-to be generated from the Apache Isis metamodel.  These can be downloaded directly through the <code>SwaggerResource</code>
-(mapped to <code>/restful/swagger/public</code> and <code>/restful/swagger/private</code>) as well as from the Wicket UI through the
-<code>SwaggerServiceMenu</code>.</p>
-</div>
-<div class="paragraph">
-<p>In addition, the <a href="guides/ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp archetype</a> now bundles
- <a href="https://github.com/swagger-api/swagger-ui">Swagger UI</a>, which documents the main features of the REST API and
- allows it to be explored.</p>
-</div>
-<div class="paragraph">
-<p>To enable this in your application, first update the <code>web.xml</code>:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="xml"><span class="tag">&lt;servlet&gt;</span>
+}</code></pre> 
+          </div> 
+         </div> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_web_xml">web.xml</h3> 
+        <div class="paragraph"> 
+         <p>In the <a href="guides/ugbtb.html#_ugbtb_web-xml"><code>web.xml</code></a>, the "isis.viewers" context-param is now ignored. Instead the <code>viewer_wicket.properties</code> and <code>viewer_restfulobjects.properties</code> will both be loaded if present (but neither need be present).</p> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="__code_hastransactionid_code_mixin"><code>HasTransactionId</code> mixin</h3> 
+        <div class="paragraph"> 
+         <p>The <a href="guides/rgcms.html#_rgcms_classes_mixins_HasTransactionId"><code>HasTransactionId</code></a> mixin interface has subtly changed its meaning (and is now somewhat mis-named). Prior to <code>1.13.0</code>, this identifier was the GUID of the Isis transaction in which the object was created. As of <code>1.13.0</code>, this identifier actually is for the request/interaction (as per the new <a href="guides/rgsvc.html#_rgsvc_api_InteractionContext"><code>InteractionContext</code></a> service) in which the object was created.</p> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_notable_new_features">Notable new features</h3> 
+        <div class="paragraph"> 
+         <p>The following are new features so do not impact in themselves impact any migration effort, but you may wish to start taking advantage of once you have upgraded.</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><code>@Nullable</code> annotation<br></p> 
+           <div class="paragraph"> 
+            <p>The <a href="guides/rgant.html#_rgant_Nullable"><code>@Nullable</code></a> annotation can now be used to specify the optionality of properties and parameters.</p> 
+           </div> </li> 
+          <li> <p><code>ActionDomainEvent</code> for mixins<br></p> 
+           <div class="paragraph"> 
+            <p>Previously it was not possible to discover the mixed-in domain object when an <code>ActionDomainEvent</code> was raised by a mixin action. This is now possible, through the <a href="guides/rgcms.html#_rgcms_classes_domainevent_ActionDomainEvent"><code>mixedIn()</code></a> method.</p> 
+           </div> </li> 
+          <li> <p><code>Blob</code> and <code>Clob</code> file types<br></p> 
+           <div class="paragraph"> 
+            <p>The <a href="guides/rgant.html#_rgant_Property_fileAccept"><code>@Property#fileAccept()</code></a> and <a href="guides/rgant.html#_rgant_Parameter_fileAccept"><code>@Parameter#fileAccept()</code></a> annotation attributes can be used to hint at the file type to upload for a blob or clob.</p> 
+           </div> </li> 
+          <li> <p>Live reloading<br></p> 
+           <div class="paragraph"> 
+            <p>The <code>isis.viewer.wicket.liveReloadUrl</code> configuration property allows live reloading of objects if the layout is updated, reducing feedback times. Further guidance on setting this up can be found <a href="guides/dg.html#_dg_ide_intellij_advanced_gradle-liveReload">here</a>.</p> 
+           </div> </li> 
+          <li> <p>Docker support<br></p> 
+           <div class="paragraph"> 
+            <p>The <code>overrides.properties</code> configuration file, if present, is loaded last as the configuration property file, with its contents overriding any previously defined configuration properties. This simple idea makes it easy to create Docker container images; see <a href="guides/ugbtb.html#_ugbtb_deployment_docker">here</a> for further discussion.</p> 
+           </div> </li> 
+         </ul> 
+        </div> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_migration-notes_1.11.0-to-1.12.0">From v1.11.0 to 1.12.0</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_migration-notes_1.11.0-to-1.12.0.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>Existing projects written against v1.11.x should run against v1.12.0 with few if any changes. If you <strong>do</strong> encounter any difficulties then let us know via the <a href="support.html">users mailing list</a>, so we can support you and document issues here.</p> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_dynamic_xml_layouts">Dynamic XML Layouts</h3> 
+        <div class="paragraph"> 
+         <p>The major new feature in 1.12.0 is <a href="guides/ugfun.html#_ugfun_object-layout_dynamic_xml">dynamic XML layouts</a>, providing much enhanced support for custom layouts.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The new <code>Xxx.layout.xml</code> file is optional; without it domain objects will continue to be rendered as before, using metadata from annotations (<a href="guides/rgant.html#_rgant-DomainObjectLayout"><code>@DomainObjectLayout</code></a>, <a href="guides/rgant.html#_rgant-PropertyLayout"><code>@PropertyLayout</code></a>, <a href="guides/rgant.html#_rgant-CollectionLayout"><code>@CollectionLayout</code></a>, <a href="guides/rgant.html#_rgant-ActionLayout"><code>@ActionLayout</code></a>, <a href="guides/rgant.html#_rgant-MemberOrder"><code>@MemberOrder</code></a> and <a href="guides/rgant.html#_rgant-MemberGroupLayout"><code>@MemberGroupLayout</code></a>), and also from any <a href="guides/ugfun.html#_ugfun_object-layout_dynamic"><code>Xxx.layout.json</code></a> file that might already exist. There is therefore no requirement to move to the new more flexible XML-based layout.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>If you do want to start using the new format, then you will find that 1.12.0 provides a mixin action (available in prototype mode only) called "download XML layout". This will allow you to download the current layout file for the object being rendered. This can then be saved alongside the class' Java source file. Once a <code>Xxx.layout.xml</code> file is present, any existing <code>Xxx.layout.json</code> file will be ignored; any annotations though will continue to be honoured.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>If you wish to migrate all your domain objects to use XML layouts, this can be done using the "download layouts (XML)" (on the "Prototyping" menu), as a single zip file. This can then be unzipped into the <code>src/main/java</code> directory.</p> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_mixins">Mixins</h3> 
+        <div class="paragraph"> 
+         <p>(As mentioned above), 1.12.0 provides a number of new mixin actions and properties:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><a href="guides/rgcms.html#_rgcms_classes_mixins_Object_clearHints">clear hints</a> action</p> </li> 
+          <li> <p><a href="guides/rgcms.html#_rgcms_classes_mixins_Object_downloadLayoutXml">download Layout XML</a> action (prototype mode)</p> </li> 
+          <li> <p><a href="guides/rgcms.html#_rgcms_classes_mixins_Object_rebuildMetamodel">rebuild metamodel</a> action (prototype mode)</p> </li> 
+          <li> <p><a href="guides/rgcms.html#_rgcms_classes_mixins_Persistable_datanucleusXxx">id and version</a> properties (for domain entities only)</p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>These are in addition to the <a href="guides/rgcms.html#_rgcms_classes_mixins_Persistable_downloadJdoMetadata">download JDO metadata</a> mixin action (prototype mode) provided in earlier versions of the framework.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The properties are grouped in a "metadata" fieldset, and the mixin actions associated with that fieldset. If the domain object is a view model rather than an entity (that is, has no id or version) then the actions will instead be rendered as top-level actions.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Most of these mixin object members are visible only in prototype mode, though some are visible in production mode and so potentially visible to end-users. If you wish to suppress these members from the view, you can either use <a href="#guides/ugsec.adoc">security</a>, or alternatively you can write <a href="guides/rgcms.html#_rgcms_classes_super_AbstractSubscriber">subscriber</a>s to veto the visibility of these members by subscribing to their respective domain events.</p> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_jaxb_view_models_are_editable">JAXB view models are editable</h3> 
+        <div class="paragraph"> 
+         <p>All <a href="guides/rgant.html#_rgant-XmlRootElement"><code>@XmlRootElement</code></a> view models are now implicitly editable. Therefore any view models that should be read-only should have editing attribute disabled using <a href="guides/rgant.html#_rgant-DomainObject_editing"><code>@DomainObject#editing()</code></a> (or use a <a href="guides/rgcms.html#_rgcms_classes_super_AbstractSubscriber">subscriber</a> to veto editability).</p> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="__code_domainobjectcontainer_code_domain_service"><code>DomainObjectContainer</code> domain service</h3> 
+        <div class="paragraph"> 
+         <p>The <a href="guides/rgsvc.html#_rgsvc_api_DomainObjectContainer"><code>DomainObjectContainer</code></a>domain service has been deprecated, with its methods moved to a new set of more fine-grained domain services, such as <a href="guides/rgsvc.html#_rgsvc_api_RepositoryService"><code>RepositoryService</code></a> and <a href="guides/rgsvc.html#_rgsvc_api_MessageService"><code>MessageService</code></a>.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The <code>DomainObjectContainer</code> service will continue to be supported until Apache Isis v2.0.0, but in the meantime, consider changing existing application code to use these new domain services.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Please note that when migrating from _rgsvc_api_DomainObjectContainer_object-persistence-api.adoc#_rgsvc_api_DomainObjectContainer_object-persistence-api[<code>DomainObjectContainer#persist()</code>] to <a href="guides/_rgsvc_api_RepositoryService.adoc.html#_rgsvc_api_RepositoryService"><code>RepositoryService#persist()</code></a>, no exception will be thrown if the Domain Object is already persisted, so the behavior of <a href="guides/_rgsvc_api_RepositoryService.html#_rgsvc_api_RepositoryService"><code>RepositoryService#persist()</code></a> will be the same as that of _rgsvc_api_DomainObjectContainer_object-persistence-api.adoc#_rgsvc_api_DomainObjectContainer_object-persistence-api[<code>DomainObjectContainer#persistIfNotAlready()</code>].</p> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_removal_of_the_code_self_host_code_profile">Removal of the <code>self-host</code> profile</h3> 
+        <div class="paragraph"> 
+         <p>The <code>self-host</code> profile has been removed from the <a href="guides/ug.html#_ug_getting-started_simpleapp-archetype">SimpleApp archetype</a>. Instead, run the application using either the <code>org.apache.isis.WebServer</code> main class, or <code>mvn jetty:run</code>, or build the WAR and deploy to a servlet container such as Tomcat.</p> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="__code_isis_viewer_wicket_disablemodaldialogs_code_removed"><code>isis.viewer.wicket.disableModalDialogs</code> removed</h3> 
+        <div class="paragraph"> 
+         <p>The Apache Isis Wicket viewer uses a modal dialog for action parameters. Before this feature was implemented (prior to 1.4.0), action parameters were rendered on their own page. This property was provided to re-enable the old behaviour.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The property has now been removed and this feature removed; actions parameters are always now always shown in a modal dialog.</p> 
+        </div> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_migration-notes_1.10.0-to-1.11.0">From v1.10.0 to 1.11.0</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_migration-notes_1.10.0-to-1.11.0.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>Existing projects written against v1.10.0 should run against v1.11.0 with few if any changes. If you <strong>do</strong> encounter any difficulties then let us know via the <a href="support.html">users mailing list</a>, so we can support you and document issues here.</p> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_swagger_ui">Swagger UI</h3> 
+        <div class="paragraph"> 
+         <p>The new <a href="guides/rgsvc.html#_rgsvc_api_SwaggerService"><code>SwaggerService</code></a> allows <a href="http://swagger.io">Swagger</a> spec files to be generated from the Apache Isis metamodel. These can be downloaded directly through the <code>SwaggerResource</code> (mapped to <code>/restful/swagger/public</code> and <code>/restful/swagger/private</code>) as well as from the Wicket UI through the <code>SwaggerServiceMenu</code>.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>In addition, the <a href="guides/ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp archetype</a> now bundles <a href="https://github.com/swagger-api/swagger-ui">Swagger UI</a>, which documents the main features of the REST API and allows it to be explored.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>To enable this in your application, first update the <code>web.xml</code>:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="xml"><span class="tag">&lt;servlet&gt;</span>
     <span class="tag">&lt;servlet-name&gt;</span>WebjarsServlet<span class="tag">&lt;/servlet-name&gt;</span>                         <i class="conum" data-value="1"></i><b>(1)</b>
     <span class="tag">&lt;servlet-class&gt;</span>org.webjars.servlet.WebjarsServlet<span class="tag">&lt;/servlet-class&gt;</span>
     <span class="tag">&lt;init-param&gt;</span>
@@ -1055,100 +866,88 @@ to be generated from the Apache Isis metamodel.  These can be downloaded directl
         <span class="tag">&lt;param-name&gt;</span>passThru<span class="tag">&lt;/param-name&gt;</span>                               <i class="conum" data-value="3"></i><b>(3)</b>
         <span class="tag">&lt;param-value&gt;</span>/restful/swagger<span class="tag">&lt;/param-value&gt;</span>
     <span class="tag">&lt;/init-param&gt;</span>
-<span class="tag">&lt;/filter&gt;</span></code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td>provides access to the Swagger UI (packaged as a webjar)</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="2"></i><b>2</b></td>
-<td>issues a 401 status, but with the <code>WWW-Authenticate</code> challenge suppressed if requested from the Swagger UI</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="3"></i><b>3</b></td>
-<td>provides access to the RESTful resource that generates the Swagger spec.</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>There is also an HTML page to load the Swagger UI itself; this resides in <code>src/main/webapp/swagger-ui/index.html</code>.  Copy the <a href="https://github.com/apache/isis/blob/master/example/application/simpleapp/webapp/src/main/webapp/swagger-ui/index.html">file from Apache Isis' repo</a>, or from the app generated by the <a href="guides/ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp archetype</a>.</p>
-</div>
-<div class="paragraph">
-<p>The text of the simple app&#8217;s <code>about/index.html</code> has also changed (the <code>&lt;li</code>&gt; for the <code>/restful</code> URL has been replaced with a <code>/swagger-ui</code> URL).  If you use <a href="https://github.com/apache/isis/blob/master/example/application/simpleapp/webapp/src/main/webapp/about/index.html">this file</a>, then update it.</p>
-</div>
-<div class="paragraph">
-<p>If your application is bootstrapped using an <code>AppManifest</code> (recommended;
-<a href="guides/rgcms.html#_rgcms_classes_AppManifest-bootstrapping">here</a>) then the default implementation of the
-<code>SwaggerService</code> will automatically be discovered and registered.  However, if you are still using the older
-<code>isis.properties</code> configuration file to explicitly register services then you will need to add in this service.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="__code_routingservice_code"><code>RoutingService</code></h3>
-<div class="paragraph">
-<p>The new <a href="guides/rgsvc.html#_rgsvc_spi_RoutingService"><code>RoutingService</code></a> SPI service provides a plugin point to the
-<a href="guides/ugvw.html">Wicket viewer</a> so that a different object than that returned from an action invocation can be
-rendered.</p>
-</div>
-<div class="paragraph">
-<p>The framework provides a default implementation of this service that will - instead of a void or a <code>null</code> result -
-render the home page (as per the <a href="guides/rgant.html#_rgant_HomePage"><code>@HomePage</code></a> annotation) if there is one.  This
-is therefore a subtle change in the UI.  If you wish to retain the original behaviour (to return the "no results" page
-instead), then you should implement your own no-op implementation of this service:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@DomainService</span>
-<span class="annotation">@DomainServiceLayout</span>(menuOrder=<span class="string"><span class="delimiter">&quot;</span><span class="content">1</span><span class="delimiter">&quot;</span></span>)
+<span class="tag">&lt;/filter&gt;</span></code></pre> 
+         </div> 
+        </div> 
+        <div class="colist arabic"> 
+         <table> 
+          <tbody>
+           <tr> 
+            <td><i class="conum" data-value="1"></i><b>1</b></td> 
+            <td>provides access to the Swagger UI (packaged as a webjar)</td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="2"></i><b>2</b></td> 
+            <td>issues a 401 status, but with the <code>WWW-Authenticate</code> challenge suppressed if requested from the Swagger UI</td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="3"></i><b>3</b></td> 
+            <td>provides access to the RESTful resource that generates the Swagger spec.</td> 
+           </tr> 
+          </tbody>
+         </table> 
+        </div> 
+        <div class="paragraph"> 
+         <p>There is also an HTML page to load the Swagger UI itself; this resides in <code>src/main/webapp/swagger-ui/index.html</code>. Copy the <a href="https://github.com/apache/isis/blob/master/example/application/simpleapp/webapp/src/main/webapp/swagger-ui/index.html">file from Apache Isis' repo</a>, or from the app generated by the <a href="guides/ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp archetype</a>.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The text of the simple app\u2019s <code>about/index.html</code> has also changed (the <code>&lt;li</code>&gt; for the <code>/restful</code> URL has been replaced with a <code>/swagger-ui</code> URL). If you use <a href="https://github.com/apache/isis/blob/master/example/application/simpleapp/webapp/src/main/webapp/about/index.html">this file</a>, then update it.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>If your application is bootstrapped using an <code>AppManifest</code> (recommended; <a href="guides/rgcms.html#_rgcms_classes_AppManifest-bootstrapping">here</a>) then the default implementation of the <code>SwaggerService</code> will automatically be discovered and registered. However, if you are still using the older <code>isis.properties</code> configuration file to explicitly register services then you will need to add in this service.</p> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="__code_routingservice_code"><code>RoutingService</code></h3> 
+        <div class="paragraph"> 
+         <p>The new <a href="guides/rgsvc.html#_rgsvc_spi_RoutingService"><code>RoutingService</code></a> SPI service provides a plugin point to the <a href="guides/ugvw.html">Wicket viewer</a> so that a different object than that returned from an action invocation can be rendered.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The framework provides a default implementation of this service that will - instead of a void or a <code>null</code> result - render the home page (as per the <a href="guides/rgant.html#_rgant_HomePage"><code>@HomePage</code></a> annotation) if there is one. This is therefore a subtle change in the UI. If you wish to retain the original behaviour (to return the "no results" page instead), then you should implement your own no-op implementation of this service:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@DomainService</span>
+<span class="annotation">@DomainServiceLayout</span>(menuOrder=<span class="string"><span class="delimiter">"</span><span class="content">1</span><span class="delimiter">"</span></span>)
 <span class="directive">public</span> <span class="type">class</span> <span class="class">IdentityRoutingService</span> <span class="directive">implements</span> RoutingService {
     <span class="directive">public</span> <span class="type">boolean</span> canRoute(<span class="predefined-type">Object</span> original) { <span class="keyword">return</span> <span class="predefined-constant">true</span>; }
     <span class="directive">public</span> <span class="predefined-type">Object</span> route(<span class="predefined-type">Object</span> original) { <span class="keyword">return</span> original; }
-}</code></pre>
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_wicket_viewer_i18n">Wicket Viewer i18n</h3>
-<div class="paragraph">
-<p>The <a href="guides/ugvw.html">Wicket viewer</a> (its labels, buttons, messages etc) can now be internationalized using the
-<a href="guides/rgsvc.html#_rgsvc_spi_TranslationService"><code>TranslationService</code></a>.</p>
-</div>
-<div class="paragraph">
-<p>To enable this, new <code>msgId</code>s and corresponding translations must be added to the <code>translations.po</code> file.  Full
-details of these <code>msgId</code>s can be found in <a href="guides/ugbtb.html#_ugbtb_i18n_wicket-viewer">i18n</a> section of the "beyond the basics" guide.</p>
-</div>
-<div class="paragraph">
-<p>If no translations are available, then the fallback is to use the previous mechanism, ie Wicket&#8217;s original resource bundles.
-This feature can therefore be considered as optional.</p>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_migration-notes_1.9.0-to-1.10.0">From v1.9.0 to 1.10.0</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Existing projects written against v1.9.0 should run against v1.10.0 with only a few minor changes.  If you <strong>do</strong> encounter
-any difficulties then let us know via the <a href="support.html">users mailing list</a>, so we can support you and document
-issues here.</p>
-</div>
-<div class="sect2">
-<h3 id="_remove_references_to_code_isis_viewer_wicket_code_parent_pom">Remove references to <code>isis-viewer-wicket</code> parent pom.</h3>
-<div class="paragraph">
-<p>In earlier releases the Wicket viewer defined its own parent <code>pom.xml</code> for dependency management and its dependencies
-and to declare the various submodules that make up the viewer.  This <code>pom.xml</code> has now been incorporated into the
-parent <code>pom.xml</code> for the Core framework.</p>
-</div>
-<div class="paragraph">
-<p>Therefore, in the parent <code>pom.xml</code> of your own domain applications, remove:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="xml"><span class="tag">&lt;dependencyManagement&gt;</span>
+}</code></pre> 
+         </div> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_wicket_viewer_i18n">Wicket Viewer i18n</h3> 
+        <div class="paragraph"> 
+         <p>The <a href="guides/ugvw.html">Wicket viewer</a> (its labels, buttons, messages etc) can now be internationalized using the <a href="guides/rgsvc.html#_rgsvc_spi_TranslationService"><code>TranslationService</code></a>.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>To enable this, new <code>msgId</code>s and corresponding translations must be added to the <code>translations.po</code> file. Full details of these <code>msgId</code>s can be found in <a href="guides/ugbtb.html#_ugbtb_i18n_wicket-viewer">i18n</a> section of the "beyond the basics" guide.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>If no translations are available, then the fallback is to use the previous mechanism, ie Wicket\u2019s original resource bundles. This feature can therefore be considered as optional.</p> 
+        </div> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_migration-notes_1.9.0-to-1.10.0">From v1.9.0 to 1.10.0</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_migration-notes_1.9.0-to-1.10.0.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>Existing projects written against v1.9.0 should run against v1.10.0 with only a few minor changes. If you <strong>do</strong> encounter any difficulties then let us know via the <a href="support.html">users mailing list</a>, so we can support you and document issues here.</p> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_remove_references_to_code_isis_viewer_wicket_code_parent_pom">Remove references to <code>isis-viewer-wicket</code> parent pom.</h3> 
+        <div class="paragraph"> 
+         <p>In earlier releases the Wicket viewer defined its own parent <code>pom.xml</code> for dependency management and its dependencies and to declare the various submodules that make up the viewer. This <code>pom.xml</code> has now been incorporated into the parent <code>pom.xml</code> for the Core framework.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Therefore, in the parent <code>pom.xml</code> of your own domain applications, remove:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="xml"><span class="tag">&lt;dependencyManagement&gt;</span>
     <span class="tag">&lt;dependencies&gt;</span>
         ...
         <span class="tag">&lt;dependency&gt;</span>
@@ -1160,32 +959,24 @@ parent <code>pom.xml</code> for the Core framework.</p>
         <span class="tag">&lt;/dependency&gt;</span>
         ...
     <span class="tag">&lt;/dependencies&gt;</span>
-<span class="tag">&lt;/dependencyManagement&gt;</span></code></pre>
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="__code_allowlateregistration_code"><code>allowLateRegistration</code></h3>
-<div class="paragraph">
-<p>One possible issue is that (as per <a href="https://issues.apache.org/jira/browse/ISIS-830">ISIS-830</a>) the <a href="guides/rgsvc.html#_rgsvc_api_EventBusService"><code>EventBusService</code></a> is now initialized as one of the first domain
-services; this is to ensure that any object lifecycle events caused by domain services initializing themselves can be
-posted on the event bus for subscribers.  The typical case for such lifecycle events to occur is from domain services
-that seed reference data; one such example can be found in the (non-ASF)
- <a href="http://github.com/isisaddons/isis-module-security">Isis addons' security</a> module.</p>
-</div>
-<div class="paragraph">
-<p>In previous releases, the ordering of initialization for the <code>EventBusService</code> was undefined (but would typically be towards the
-"end" of the list of services.  What this meant in practice is that it generally didn&#8217;t matter whether (domain service)
-subscribers were initialized before or after seed services.</p>
-</div>
-<div class="paragraph">
-<p>Now, though, because the <code>EventBusService</code> is initialized early on, it proactively checks that all subscribers have
-been registered before any event posts occur (so that no events get missed).  If any subscriber attempts to register
-after at least one event has been posted, then the service will fail fast and the framework will not start.  The error looks something like:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="log">: EXEC
+<span class="tag">&lt;/dependencyManagement&gt;</span></code></pre> 
+         </div> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="__code_allowlateregistration_code"><code>allowLateRegistration</code></h3> 
+        <div class="paragraph"> 
+         <p>One possible issue is that (as per <a href="https://issues.apache.org/jira/browse/ISIS-830">ISIS-830</a>) the <a href="guides/rgsvc.html#_rgsvc_api_EventBusService"><code>EventBusService</code></a> is now initialized as one of the first domain services; this is to ensure that any object lifecycle events caused by domain services initializing themselves can be posted on the event bus for subscribers. The typical case for such lifecycle events to occur is from domain services that seed reference data; one such example can be found in the (non-ASF) <a href="http://github.com/isisaddons/isis-module-security">Isis addons' security</a> module.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>In previous releases, the ordering of initialization for the <code>EventBusService</code> was undefined (but would typicall

<TRUNCATED>

[18/44] isis-site git commit: ISIS-1594: provide an 'edit' button

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/guides/ugodn.pdf
----------------------------------------------------------------------
diff --git a/content/guides/ugodn.pdf b/content/guides/ugodn.pdf
index ec12488..4ef4558 100644
--- a/content/guides/ugodn.pdf
+++ b/content/guides/ugodn.pdf
@@ -4,16 +4,16 @@
 << /Title (DataNucleus Object Store)
 /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:20170219155338+00'00')
-/ModDate (D:20170219155338+00'00')
+/CreationDate (D:20170307234520+00'00')
+/ModDate (D:20170307234520+00'00')
 >>
 endobj
 2 0 obj
 << /Type /Catalog
 /Pages 3 0 R
 /Names 14 0 R
-/Outlines 112 0 R
-/PageLabels 125 0 R
+/Outlines 111 0 R
+/PageLabels 124 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 12
-/Kids [7 0 R 10 0 R 12 0 R 36 0 R 49 0 R 59 0 R 68 0 R 72 0 R 76 0 R 78 0 R 84 0 R 87 0 R]
+/Kids [7 0 R 10 0 R 12 0 R 36 0 R 49 0 R 59 0 R 67 0 R 71 0 R 75 0 R 77 0 R 83 0 R 86 0 R]
 >>
 endobj
 4 0 obj
@@ -78,13 +78,13 @@ endobj
 endobj
 8 0 obj
 << /Type /Font
-/BaseFont /AAAADS+NotoSerif
+/BaseFont /AAAADH+NotoSerif
 /Subtype /TrueType
-/FontDescriptor 127 0 R
+/FontDescriptor 126 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 129 0 R
-/ToUnicode 128 0 R
+/Widths 128 0 R
+/ToUnicode 127 0 R
 >>
 endobj
 9 0 obj
@@ -531,7 +531,7 @@ endobj
 /F4.0 38 0 R
 >>
 >>
-/Annots [90 0 R 91 0 R 92 0 R 93 0 R 94 0 R 95 0 R 96 0 R 97 0 R 98 0 R 99 0 R 100 0 R 101 0 R 102 0 R 103 0 R 104 0 R 105 0 R 106 0 R 107 0 R 108 0 R 109 0 R 110 0 R]
+/Annots [89 0 R 90 0 R 91 0 R 92 0 R 93 0 R 94 0 R 95 0 R 96 0 R 97 0 R 98 0 R 99 0 R 100 0 R 101 0 R 102 0 R 103 0 R 104 0 R 105 0 R 106 0 R 107 0 R 108 0 R 109 0 R]
 >>
 endobj
 11 0 obj
@@ -1246,7 +1246,7 @@ endobj
 /F1.0 8 0 R
 /F3.1 18 0 R
 >>
-/XObject << /Stamp1 111 0 R
+/XObject << /Stamp1 110 0 R
 >>
 >>
 /Annots [17 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 31 0 R 32 0 R 33 0 R 34 0 R]
@@ -1261,18 +1261,18 @@ endobj
 >>
 endobj
 15 0 obj
-<< /Names [(_ugdnos) 13 0 R (_ugodn_configuring) 37 0 R (_ugodn_configuring_disabling-persistence-by-reachability) 56 0 R (_ugodn_configuring_eagerly-registering-entities) 52 0 R (_ugodn_configuring_persistence-xml) 51 0 R (_ugodn_configuring_properties) 41 0 R (_ugodn_configuring_using-jndi-data-source) 69 0 R (_ugodn_java8) 88 0 R (_ugodn_overriding-jdo-annotations) 79 0 R (application-managed) 70 0 R (configuration-properties-for-apache-isis-itself) 42 0 R (configuration-properties-passed-through-directly-to-datanucleus) 47 0 R (container-managed-jndi) 74 0 R (other-guides) 19 0 R (the-issue-in-more-detail) 63 0 R]
+<< /Names [(_ugdnos) 13 0 R (_ugodn_configuring) 37 0 R (_ugodn_configuring_disabling-persistence-by-reachability) 56 0 R (_ugodn_configuring_eagerly-registering-entities) 52 0 R (_ugodn_configuring_persistence-xml) 51 0 R (_ugodn_configuring_properties) 41 0 R (_ugodn_configuring_using-jndi-data-source) 68 0 R (_ugodn_java8) 87 0 R (_ugodn_overriding-jdo-annotations) 78 0 R (application-managed) 69 0 R (configuration-properties-for-apache-isis-itself) 42 0 R (configuration-properties-passed-through-directly-to-datanucleus) 47 0 R (container-managed-jndi) 73 0 R (other-guides) 19 0 R (the-issue-in-more-detail) 62 0 R]
 >>
 endobj
 16 0 obj
 << /Type /Font
-/BaseFont /AAAADT+NotoSerif-Bold
+/BaseFont /AAAADI+NotoSerif-Bold
 /Subtype /TrueType
-/FontDescriptor 131 0 R
+/FontDescriptor 130 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 133 0 R
-/ToUnicode 132 0 R
+/Widths 132 0 R
+/ToUnicode 131 0 R
 >>
 endobj
 17 0 obj
@@ -1288,13 +1288,13 @@ endobj
 endobj
 18 0 obj
 << /Type /Font
-/BaseFont /AAAADU+FontAwesome
+/BaseFont /AAAADJ+FontAwesome
 /Subtype /TrueType
-/FontDescriptor 135 0 R
+/FontDescriptor 134 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 137 0 R
-/ToUnicode 136 0 R
+/Widths 136 0 R
+/ToUnicode 135 0 R
 >>
 endobj
 19 0 obj
@@ -2910,7 +2910,7 @@ endobj
 /F4.0 38 0 R
 /F5.0 43 0 R
 >>
-/XObject << /Stamp1 111 0 R
+/XObject << /Stamp1 110 0 R
 >>
 >>
 /Annots [39 0 R 40 0 R 44 0 R 45 0 R 46 0 R]
@@ -2921,13 +2921,13 @@ endobj
 endobj
 38 0 obj
 << /Type /Font
-/BaseFont /AAAADV+mplus1mn-regular
+/BaseFont /AAAADK+mplus1mn-regular
 /Subtype /TrueType
-/FontDescriptor 139 0 R
+/FontDescriptor 138 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 141 0 R
-/ToUnicode 140 0 R
+/Widths 140 0 R
+/ToUnicode 139 0 R
 >>
 endobj
 39 0 obj
@@ -2960,13 +2960,13 @@ endobj
 endobj
 43 0 obj
 << /Type /Font
-/BaseFont /AAAADW+NotoSerif-Italic
+/BaseFont /AAAADL+NotoSerif-Italic
 /Subtype /TrueType
-/FontDescriptor 143 0 R
+/FontDescriptor 142 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 145 0 R
-/ToUnicode 144 0 R
+/Widths 144 0 R
+/ToUnicode 143 0 R
 >>
 endobj
 44 0 obj
@@ -4094,7 +4094,7 @@ endobj
 /F1.0 8 0 R
 /F3.1 18 0 R
 >>
-/XObject << /Stamp1 111 0 R
+/XObject << /Stamp1 110 0 R
 >>
 >>
 /Annots [50 0 R 53 0 R 54 0 R 55 0 R 57 0 R]
@@ -4162,7 +4162,7 @@ endobj
 >>
 endobj
 58 0 obj
-<< /Length 19340
+<< /Length 20356
 >>
 stream
 q
@@ -4446,35 +4446,13 @@ f
 h
 S
 Q
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-59.24000000000001 558.0150000000001 Td
-/F6.0 11 Tf
-<697369732e706572736973746f722e646174616e75636c6575732e696d706c2e646174616e75636c6575732e70657273697374656e6365427952656163686162696c6974794174436f6d6d6974> 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
-482.74 558.0150000000001 Td
-/F4.0 11 Tf
-<3d> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-488.24 558.0150000000001 Td
+59.24000000000001 558.0150000000001 Td
 /F4.0 11 Tf
-<66616c7365> Tj
+<697369732e706572736973746f722e646174616e75636c6575732e696d706c2e646174616e75636c6575732e70657273697374656e6365427952656163686162696c6974794174436f6d6d69743d66616c7365> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4834,12 +4812,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24000000000001 215.7119308600338 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -4856,12 +4834,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 215.7119308600338 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -4878,12 +4856,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 215.7119308600338 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <41677265656d656e74526f6c65> Tj
 ET
 
@@ -4928,7 +4906,29 @@ ET
 BT
 81.24000000000001 200.9719308600338 Td
 /F4.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+86.74000000000001 200.9719308600338 Td
+/F4.0 11 Tf
+<2e> 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
+92.24000000000001 200.9719308600338 Td
+/F4.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4944,12 +4944,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 81.24000000000001 186.2319308600338 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -4966,12 +4966,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 186.2319308600338 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <696e74> Tj
 ET
 
@@ -5087,12 +5087,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 103.24000000000001 171.4919308600338 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <72657475726e> Tj
 ET
 
@@ -5131,8 +5131,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 229.74 171.4919308600338 Td
@@ -5153,12 +5153,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 284.74 171.4919308600338 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <74686973> Tj
 ET
 
@@ -5219,13 +5219,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 356.24 171.4919308600338 Td
 /F4.0 11 Tf
-<2261677265656d656e7422> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+361.74 171.4919308600338 Td
+/F4.0 11 Tf
+<61677265656d656e74> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+411.24 171.4919308600338 Td
+/F4.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5241,13 +5263,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 422.24 171.4919308600338 Td
 /F4.0 11 Tf
-<2273746172744461746522> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+427.74 171.4919308600338 Td
+/F4.0 11 Tf
+<737461727444617465> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+477.24 171.4919308600338 Td
+/F4.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5263,13 +5307,46 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+488.24 171.4919308600338 Td
+/F4.0 11 Tf
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+493.74 171.4919308600338 Td
+/F4.0 11 Tf
+<7061727479> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+521.24 171.4919308600338 Td
+/F4.0 11 Tf
+<22> 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
 59.24000000000001 156.75193086003378 Td
 /F4.0 11 Tf
-<22706172747922> Tj
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5278,9 +5355,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-97.74000000000001 156.75193086003378 Td
+64.74000000000001 156.75193086003378 Td
 /F4.0 11 Tf
-<293b> Tj
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5384,14 +5461,13 @@ endobj
 /Font << /F1.0 8 0 R
 /F3.1 18 0 R
 /F4.0 38 0 R
-/F6.0 61 0 R
 /F2.0 16 0 R
 >>
-/XObject << /I1 65 0 R
-/Stamp1 111 0 R
+/XObject << /I1 64 0 R
+/Stamp1 110 0 R
 >>
 >>
-/Annots [60 0 R 62 0 R 64 0 R]
+/Annots [60 0 R 61 0 R 63 0 R]
 >>
 endobj
 60 0 obj
@@ -5406,17 +5482,6 @@ endobj
 >>
 endobj
 61 0 obj
-<< /Type /Font
-/BaseFont /AAAADX+mplus1mn-bold
-/Subtype /TrueType
-/FontDescriptor 147 0 R
-/FirstChar 32
-/LastChar 255
-/Widths 149 0 R
-/ToUnicode 148 0 R
->>
-endobj
-62 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -5427,10 +5492,10 @@ endobj
 /Type /Annot
 >>
 endobj
-63 0 obj
+62 0 obj
 [59 0 R /XYZ 0 444.98000000000013 null]
 endobj
-64 0 obj
+63 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -5441,14 +5506,14 @@ endobj
 /Type /Annot
 >>
 endobj
-65 0 obj
+64 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 55
 /Width 593
 /BitsPerComponent 8
 /ColorSpace /DeviceRGB
-/SMask 66 0 R
+/SMask 65 0 R
 /Length 7072
 /Filter [/FlateDecode]
 /DecodeParms [<< /Predictor 15
@@ -5484,7 +5549,7 @@ d\u0252
 \ufffda*2\ufffd\u2ff2\ufffd\ufffd0	/e\ufffdq\ufffd\ufffdL\u039b6m{2\ufffd.\ufffd\:\ufffdIM{\ufffd\ufffdu{\ufffdsh\ufffd\ufffd\u04e7\ufffdGs\ufffdV{C\ufffd\ufffdkcC\ufffd\ufffd\ufffd\u0673g\ufffd\ufffd\ufffd!x\ufffd\u0295\ufffd?>\ufffd
\u034e\ufffd\ufffd\ufffd#\ufffd\ufffdj+KQ\ufffdg\ufffd988888^J\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd888888^\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd_\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdxU\ufffd\ufffd\ufffd\ufffd\ufffd
 endstream
 endobj
-66 0 obj
+65 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 55
@@ -5510,8 +5575,8 @@ w
 zV\ufffd8\ufffd\ufffd\ufffdkY\ufffde+\ufffdD\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd9\ufffdYu\ufffdH\ufffd/\ufffd8\ufffds
 endstream
 endobj
-67 0 obj
-<< /Length 26903
+66 0 obj
+<< /Length 28307
 >>
 stream
 q
@@ -5545,13 +5610,13 @@ h
 S
 Q
 /DeviceRGB cs
-0.000 0.533 0.000 scn
+0.000 0.400 0.600 scn
 /DeviceRGB CS
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 SCN
 
 BT
 59.24 783.0649999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -5568,12 +5633,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 783.0649999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -5590,12 +5655,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 783.0649999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <41677265656d656e74> Tj
 ET
 
@@ -5640,7 +5705,29 @@ ET
 BT
 81.24000000000001 768.3249999999999 Td
 /F4.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+86.74000000000001 768.3249999999999 Td
+/F4.0 11 Tf
+<2e> 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
+92.24000000000001 768.3249999999999 Td
+/F4.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5656,12 +5743,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 81.24000000000001 753.585 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -5678,12 +5765,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 753.585 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <696e74> Tj
 ET
 
@@ -5799,12 +5886,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 103.24000000000001 738.845 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <72657475726e> Tj
 ET
 
@@ -5843,8 +5930,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 229.74 738.845 Td
@@ -5865,12 +5952,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 284.74 738.845 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <74686973> Tj
 ET
 
@@ -5931,13 +6018,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 356.24 738.845 Td
 /F4.0 11 Tf
-<227265666572656e636522> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+361.74 738.845 Td
+/F4.0 11 Tf
+<7265666572656e6365> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+411.24 738.845 Td
+/F4.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5948,7 +6057,18 @@ ET
 BT
 416.74 738.845 Td
 /F4.0 11 Tf
-<293b> Tj
+<29> 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
+422.24 738.845 Td
+/F4.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6046,12 +6166,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24 632.8449999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -6068,12 +6188,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 632.8449999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -6090,12 +6210,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 632.8449999999999 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <5061727479> Tj
 ET
 
@@ -6140,7 +6260,29 @@ ET
 BT
 81.24000000000001 618.1049999999999 Td
 /F4.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+86.74000000000001 618.1049999999999 Td
+/F4.0 11 Tf
+<2e> 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
+92.24000000000001 618.1049999999999 Td
+/F4.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6156,12 +6298,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 81.24000000000001 603.365 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -6178,12 +6320,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 603.365 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <696e74> Tj
 ET
 
@@ -6299,12 +6441,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 103.24000000000001 588.625 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <72657475726e> Tj
 ET
 
@@ -6343,8 +6485,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 229.74 588.625 Td
@@ -6365,12 +6507,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 284.74 588.625 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <74686973> Tj
 ET
 
@@ -6431,13 +6573,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 356.24 588.625 Td
 /F4.0 11 Tf
-<227265666572656e636522> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+361.74 588.625 Td
+/F4.0 11 Tf
+<7265666572656e6365> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+411.24 588.625 Td
+/F4.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6448,7 +6612,18 @@ ET
 BT
 416.74 588.625 Td
 /F4.0 11 Tf
-<293b> Tj
+<29> 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
+422.24 588.625 Td
+/F4.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7324,30 +7499,29 @@ Q
 
 endstream
 endobj
-68 0 obj
+67 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 67 0 R
+/Contents 66 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F6.0 61 0 R
-/F4.0 38 0 R
+/Font << /F4.0 38 0 R
 /F1.0 8 0 R
 /F2.0 16 0 R
 >>
-/XObject << /Stamp1 111 0 R
+/XObject << /Stamp1 110 0 R
 >>
 >>
 >>
 endobj
+68 0 obj
+[67 0 R /XYZ 0 295.86999999999995 null]
+endobj
 69 0 obj
-[68 0 R /XYZ 0 295.86999999999995 null]
+[67 0 R /XYZ 0 212.2299999999999 null]
 endobj
 70 0 obj
-[68 0 R /XYZ 0 212.2299999999999 null]
-endobj
-71 0 obj
-<< /Length 19130
+<< /Length 22646
 >>
 stream
 q
@@ -7381,14 +7555,14 @@ h
 S
 Q
 /DeviceRGB cs
-0.200 0.400 0.600 scn
+0.200 0.200 0.200 scn
 /DeviceRGB CS
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 SCN
 
 BT
 59.24 783.0649999999999 Td
-/F6.0 11 Tf
-<697369732e706572736973746f722e646174616e75636c6575732e696d706c2e6a617661782e6a646f2e6f7074696f6e2e436f6e6e656374696f6e4472697665724e616d65> Tj
+/F4.0 11 Tf
+<697369732e706572736973746f722e646174616e75636c6575732e696d706c2e6a617661782e6a646f2e6f7074696f6e2e436f6e6e656374696f6e4472697665724e616d653d6e65742e73662e6c6f67346a6462632e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7397,28 +7571,6 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-438.74 783.0649999999999 Td
-/F4.0 11 Tf
-<3d> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-444.24 783.0649999999999 Td
-/F4.0 11 Tf
-<6e65742e73662e6c6f67346a6462632e> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
 59.24 768.3249999999999 Td
 /F4.0 11 Tf
 <447269766572537079> Tj
@@ -7426,41 +7578,19 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-59.24 753.585 Td
-/F6.0 11 Tf
-<697369732e706572736973746f722e646174616e75636c6575732e696d706c2e6a617661782e6a646f2e6f7074696f6e2e436f6e6e656374696f6e55524c> 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
-400.24 753.585 Td
-/F4.0 11 Tf
-<3d> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-405.74 753.585 Td
+59.24 753.585 Td
 /F4.0 11 Tf
-<6a6462633a6c6f67346a6462633a6873716c64623a6d65> Tj
+<697369732e706572736973746f722e646174616e75636c6575732e696d706c2e6a617661782e6a646f2e6f7074696f6e2e436f6e6e656374696f6e55524c3d6a6462633a6c6f67346a6462633a6873716c64623a6d65> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 59.24 738.845 Td
@@ -7470,46 +7600,13 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-59.24 724.105 Td
-/F6.0 11 Tf
-<697369732e706572736973746f722e646174616e75636c6575732e696d706c2e6a617661782e6a646f2e6f7074696f6e2e436f6e6e656374696f6e557365724e616d65> 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
-427.74 724.105 Td
-/F4.0 11 Tf
-<3d> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-433.24 724.105 Td
+59.24 724.105 Td
 /F4.0 11 Tf
-<7361> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-59.24 709.365 Td
-/F6.0 11 Tf
-<697369732e706572736973746f722e646174616e75636c6575732e696d706c2e6a617661782e6a646f2e6f7074696f6e2e436f6e6e656374696f6e50617373776f7264> Tj
+<697369732e706572736973746f722e646174616e75636c6575732e696d706c2e6a617661782e6a646f2e6f7074696f6e2e436f6e6e656374696f6e557365724e616d653d7361> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7518,9 +7615,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-427.74 709.365 Td
+59.24 709.365 Td
 /F4.0 11 Tf
-<3d> Tj
+<697369732e706572736973746f722e646174616e75636c6575732e696d706c2e6a617661782e6a646f2e6f7074696f6e2e436f6e6e656374696f6e50617373776f72643d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7827,12 +7924,12 @@ f
 h
 S
 Q
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 59.24 381.76500000000027 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c7265736f757263652d7265663e> Tj
 ET
 
@@ -7849,12 +7946,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 81.24000000000001 367.02500000000026 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c6465736372697074696f6e3e> Tj
 ET
 
@@ -7871,12 +7968,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 163.74 367.02500000000026 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f6465736372697074696f6e3e> Tj
 ET
 
@@ -7893,12 +7990,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 81.24000000000001 352.28500000000025 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c7265732d7265662d6e616d653e> Tj
 ET
 
@@ -7915,12 +8012,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 235.24 352.28500000000025 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f7265732d7265662d6e616d653e> Tj
 ET
 
@@ -7937,12 +8034,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 81.24000000000001 337.54500000000024 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c7265732d747970653e> Tj
 ET
 
@@ -7959,12 +8056,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 246.24 337.54500000000024 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f7265732d747970653e> Tj
 ET
 
@@ -7981,12 +8078,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 81.24000000000001 322.80500000000023 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c7265732d617574683e> Tj
 ET
 
@@ -8003,23 +8100,23 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 185.74 322.80500000000023 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f7265732d617574683e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 59.24 308.0650000000003 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f7265736f757263652d7265663e> Tj
 ET
 
@@ -8100,12 +8197,12 @@ f
 h
 S
 Q
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 59.24 215.76500000000024 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c5265736f75726365> Tj
 ET
 
@@ -8122,57 +8219,57 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.310 0.624 0.812 scn
+0.310 0.624 0.812 SCN
 
 BT
 114.24000000000001 215.76500000000024 Td
 /F4.0 11 Tf
-<6e616d653d> Tj
+<6e616d65> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-141.74 215.76500000000024 Td
+136.24 215.76500000000024 Td
 /F4.0 11 Tf
-<226a6462632f73696d706c6561707022> Tj
+<3d> 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
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-59.24 201.02500000000026 Td
+141.74 215.76500000000024 Td
 /F4.0 11 Tf
-<ca20> Tj
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-70.24000000000001 201.02500000000026 Td
+147.24 215.76500000000024 Td
 /F4.0 11 Tf
-<617574683d> Tj
+<6a6462632f73696d706c65617070> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-97.74000000000001 201.02500000000026 Td
+224.24 215.76500000000024 Td
 /F4.0 11 Tf
-<22436f6e7461696e657222> Tj
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -8181,64 +8278,64 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24 186.28500000000025 Td
+59.24 201.02500000000026 Td
 /F4.0 11 Tf
 <ca20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.310 0.624 0.812 scn
+0.310 0.624 0.812 SCN
 
 BT
-70.24000000000001 186.28500000000025 Td
+70.24000000000001 201.02500000000026 Td
 /F4.0 11 Tf
-<747970653d> Tj
+<61757468> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-97.74000000000001 186.28500000000025 Td
+92.24000000000001 201.02500000000026 Td
 /F4.0 11 Tf
-<226a617661782e73716c2e44617461536f7572636522> Tj
+<3d> 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
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-59.24 171.54500000000024 Td
+97.74000000000001 201.02500000000026 Td
 /F4.0 11 Tf
-<ca20> Tj
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-70.24000000000001 171.54500000000024 Td
+103.24000000000001 201.02500000000026 Td
 /F4.0 11 Tf
-<6d61784163746976653d> Tj
+<436f6e7461696e6572> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-125.24000000000001 171.54500000000024 Td
+152.74 201.02500000000026 Td
 /F4.0 11 Tf
-<2231303022> Tj
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -8247,64 +8344,64 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24 156.80500000000023 Td
+59.24 186.28500000000025 Td
 /F4.0 11 Tf
 <ca20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.310 0.624 0.812 scn
+0.310 0.624 0.812 SCN
 
 BT
-70.24000000000001 156.80500000000023 Td
+70.24000000000001 186.28500000000025 Td
 /F4.0 11 Tf
-<6d617849646c653d> Tj
+<74797065> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-114.24000000000001 156.80500000000023 Td
+92.24000000000001 186.28500000000025 Td
 /F4.0 11 Tf
-<22333022> Tj
+<3d> 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
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-59.24 142.06500000000025 Td
+97.74000000000001 186.28500000000025 Td
 /F4.0 11 Tf
-<ca20> Tj
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-70.24000000000001 142.06500000000025 Td
+103.24000000000001 186.28500000000025 Td
 /F4.0 11 Tf
-<6d6178576169743d> Tj
+<6a617661782e73716c2e44617461536f75726365> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-114.24000000000001 142.06500000000025 Td
+213.24 186.28500000000025 Td
 /F4.0 11 Tf
-<22313030303022> Tj
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -8313,64 +8410,64 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24 127.32500000000026 Td
+59.24 171.54500000000024 Td
 /F4.0 11 Tf
 <ca20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.310 0.624 0.812 scn
+0.310 0.624 0.812 SCN
 
 BT
-70.24000000000001 127.32500000000026 Td
+70.24000000000001 171.54500000000024 Td
 /F4.0 11 Tf
-<757365726e616d653d> Tj
+<6d6178416374697665> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-119.74000000000001 127.32500000000026 Td
+119.74000000000001 171.54500000000024 Td
 /F4.0 11 Tf
-<22736122> Tj
+<3d> 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
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-59.24 112.58500000000026 Td
+125.24000000000001 171.54500000000024 Td
 /F4.0 11 Tf
-<ca20> Tj
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-70.24000000000001 112.58500000000026 Td
+130.74 171.54500000000024 Td
 /F4.0 11 Tf
-<70617373776f72643d> Tj
+<313030> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-119.74000000000001 112.58500000000026 Td
+147.24 171.54500000000024 Td
 /F4.0 11 Tf
-<2270347373776f726422> Tj
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -8379,174 +8476,152 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24 97.84500000000027 Td
+59.24 156.80500000000023 Td
 /F4.0 11 Tf
 <ca20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.310 0.624 0.812 scn
+0.310 0.624 0.812 SCN
 
 BT
-70.24000000000001 97.84500000000027 Td
+70.24000000000001 156.80500000000023 Td
 /F4.0 11 Tf
-<647269766572436c6173734e616d653d> Tj
+<6d617849646c65> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-158.24 97.84500000000027 Td
+108.74000000000001 156.80500000000023 Td
 /F4.0 11 Tf
-<22636f6d2e6d6963726f736f66742e73716c7365727665722e6a6462632e53514c53657276657244726976657222> Tj
+<3d> 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
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-59.24 83.10500000000027 Td
+114.24000000000001 156.80500000000023 Td
 /F4.0 11 Tf
-<ca20> Tj
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-70.24000000000001 83.10500000000027 Td
+119.74000000000001 156.80500000000023 Td
 /F4.0 11 Tf
-<75726c3d> Tj
+<3330> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-92.24000000000001 83.10500000000027 Td
+130.74 156.80500000000023 Td
 /F4.0 11 Tf
-<226a6462633a73716c7365727665723a2f2f3132372e302e302e313a313433333b696e7374616e63653d2e3b64617461626173654e616d653d73696d706c6561707022> Tj
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-460.74 83.10500000000027 Td
-/F6.0 11 Tf
-<2f3e> Tj
+59.24 142.06500000000025 Td
+/F4.0 11 Tf
+<ca20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-q
-0.000 0.000 0.000 scn
+0.310 0.624 0.812 scn
+0.310 0.624 0.812 SCN
+
+BT
+70.24000000000001 142.06500000000025 Td
+/F4.0 11 Tf
+<6d617857616974> Tj
+ET
+
 0.000 0.000 0.000 SCN
-1 w
-0 J
-0 j
-[ ] 0 d
-/Stamp1 Do
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-49.24 14.388 Td
-/F1.0 9 Tf
-<36> Tj
+108.74000000000001 142.06500000000025 Td
+/F4.0 11 Tf
+<3d> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-Q
-Q
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
-endstream
-endobj
-72 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 595.28 841.89]
-/Contents 71 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F6.0 61 0 R
-/F4.0 38 0 R
-/F1.0 8 0 R
-/F2.0 16 0 R
->>
-/XObject << /Stamp1 111 0 R
->>
->>
-/Annots [73 0 R]
->>
-endobj
-73 0 obj
-<< /Border [0 0 0]
-/A << /Type /Action
-/S /URI
-/URI (http://www.datanucleus.org/products/accessplatform_4_1/persistence_properties.html#ConnectionPasswordDecrypter)
->>
-/Subtype /Link
-/Rect [48.24 609.0799999999999 190.28400000000002 623.36]
-/Type /Annot
->>
-endobj
-74 0 obj
-[72 0 R /XYZ 0 596.33 null]
-endobj
-75 0 obj
-<< /Length 3039
->>
-stream
-q
-/DeviceRGB cs
-0.200 0.200 0.200 scn
-/DeviceRGB CS
-0.200 0.200 0.200 SCN
+BT
+114.24000000000001 142.06500000000025 Td
+/F4.0 11 Tf
+<22> Tj
+ET
 
-1.591 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-48.24 794.6759999999999 Td
-/F1.0 10.5 Tf
-[<59> 69.82421875 <6f752077696c6c20616c736f206e65656420746f206d616b> 20.01953125 <652073757265207468617420746865204a44424320647269766572206973206f6e2074686520736572766c657420636f6e7461696e6572> -29.78515625 <d57320636c617373706174682e2046> 40.0390625 <6f72>] TJ
+119.74000000000001 142.06500000000025 Td
+/F4.0 11 Tf
+<3130303030> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+147.24 142.06500000000025 Td
+/F4.0 11 Tf
+<22> 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
-48.24 778.896 Td
-/F1.0 10.5 Tf
-[<54> 29.78515625 <6f6d6361742c2074686973206d65616e7320636f70> 20.01953125 <79696e67207468652064726976657220746f20>] TJ
+59.24 127.32500000000026 Td
+/F4.0 11 Tf
+<ca20> Tj
 ET
 
 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
+0.310 0.624 0.812 scn
+0.310 0.624 0.812 SCN
 
 BT
-254.36755078125003 778.896 Td
-/F4.0 10.5 Tf
-<24544f4d4341545f484f4d452f6c6962> Tj
+70.24000000000001 127.32500000000026 Td
+/F4.0 11 Tf
+<757365726e616d65> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -8555,8 +8630,359 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-338.36755078125003 778.896 Td
-/F1.0 10.5 Tf
+114.24000000000001 127.32500000000026 Td
+/F4.0 11 Tf
+<3d> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+119.74000000000001 127.32500000000026 Td
+/F4.0 11 Tf
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+125.24000000000001 127.32500000000026 Td
+/F4.0 11 Tf
+<7361> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+136.24 127.32500000000026 Td
+/F4.0 11 Tf
+<22> 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
+59.24 112.58500000000026 Td
+/F4.0 11 Tf
+<ca20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.310 0.624 0.812 scn
+0.310 0.624 0.812 SCN
+
+BT
+70.24000000000001 112.58500000000026 Td
+/F4.0 11 Tf
+<70617373776f7264> 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
+114.24000000000001 112.58500000000026 Td
+/F4.0 11 Tf
+<3d> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+119.74000000000001 112.58500000000026 Td
+/F4.0 11 Tf
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+125.24000000000001 112.58500000000026 Td
+/F4.0 11 Tf
+<70347373776f7264> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+169.24 112.58500000000026 Td
+/F4.0 11 Tf
+<22> 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
+59.24 97.84500000000027 Td
+/F4.0 11 Tf
+<ca20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.310 0.624 0.812 scn
+0.310 0.624 0.812 SCN
+
+BT
+70.24000000000001 97.84500000000027 Td
+/F4.0 11 Tf
+<647269766572436c6173734e616d65> 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
+152.74 97.84500000000027 Td
+/F4.0 11 Tf
+<3d> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+158.24 97.84500000000027 Td
+/F4.0 11 Tf
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+163.74 97.84500000000027 Td
+/F4.0 11 Tf
+<636f6d2e6d6963726f736f66742e73716c7365727665722e6a6462632e53514c536572766572447269766572> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+405.74 97.84500000000027 Td
+/F4.0 11 Tf
+<22> 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
+59.24 83.10500000000027 Td
+/F4.0 11 Tf
+<ca20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.310 0.624 0.812 scn
+0.310 0.624 0.812 SCN
+
+BT
+70.24000000000001 83.10500000000027 Td
+/F4.0 11 Tf
+<75726c> 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
+86.74000000000001 83.10500000000027 Td
+/F4.0 11 Tf
+<3d> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+92.24000000000001 83.10500000000027 Td
+/F4.0 11 Tf
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+97.74000000000001 83.10500000000027 Td
+/F4.0 11 Tf
+<6a6462633a73716c7365727665723a2f2f3132372e302e302e313a313433333b696e7374616e63653d2e3b64617461626173654e616d653d73696d706c65617070> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+455.24 83.10500000000027 Td
+/F4.0 11 Tf
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
+
+BT
+460.74 83.10500000000027 Td
+/F4.0 11 Tf
+<2f3e> Tj
+ET
+
+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
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+49.24 14.388 Td
+/F1.0 9 Tf
+<36> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+71 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 595.28 841.89]
+/Contents 70 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F4.0 38 0 R
+/F1.0 8 0 R
+/F2.0 16 0 R
+>>
+/XObject << /Stamp1 110 0 R
+>>
+>>
+/Annots [72 0 R]
+>>
+endobj
+72 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (http://www.datanucleus.org/products/accessplatform_4_1/persistence_properties.html#ConnectionPasswordDecrypter)
+>>
+/Subtype /Link
+/Rect [48.24 609.0799999999999 190.28400000000002 623.36]
+/Type /Annot
+>>
+endobj
+73 0 obj
+[71 0 R /XYZ 0 596.33 null]
+endobj
+74 0 obj
+<< /Length 3039
+>>
+stream
+q
+/DeviceRGB cs
+0.200 0.200 0.200 scn
+/DeviceRGB CS
+0.200 0.200 0.200 SCN
+
+1.591 Tw
+
+BT
+48.24 794.6759999999999 Td
+/F1.0 10.5 Tf
+[<59> 69.82421875 <6f752077696c6c20616c736f206e65656420746f206d616b> 20.01953125 <652073757265207468617420746865204a44424320647269766572206973206f6e2074686520736572766c657420636f6e7461696e6572> -29.78515625 <d57320636c617373706174682e2046> 40.0390625 <6f72>] 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
+48.24 778.896 Td
+/F1.0 10.5 Tf
+[<54> 29.78515625 <6f6d6361742c2074686973206d65616e7320636f70> 20.01953125 <79696e67207468652064726976657220746f20>] TJ
+ET
+
+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
+
+BT
+254.36755078125003 778.896 Td
+/F4.0 10.5 Tf
+<24544f4d4341545f484f4d452f6c6962> 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
+338.36755078125003 778.896 Td
+/F1.0 10.5 Tf
 <2e> Tj
 ET
 
@@ -8694,23 +9120,23 @@ Q
 
 endstream
 endobj
-76 0 obj
+75 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 75 0 R
+/Contents 74 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F4.0 38 0 R
 /F3.1 18 0 R
 >>
-/XObject << /Stamp1 111 0 R
+/XObject << /Stamp1 110 0 R
 >>
 >>
 >>
 endobj
-77 0 obj
-<< /Length 21689
+76 0 obj
+<< /Length 26007
 >>
 stream
 q
@@ -8910,8 +9336,8 @@ f
 h
 S
 Q
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 59.24 623.6650000000001 Td
@@ -8932,8 +9358,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 97.74000000000001 623.6650000000001 Td
@@ -8954,8 +9380,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 119.74000000000001 623.6650000000001 Td
@@ -8976,8 +9402,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 185.74 623.6650000000001 Td
@@ -9053,8 +9479,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 246.24 608.9250000000001 Td
@@ -9125,18 +9551,40 @@ ET
 BT
 147.24 594.1850000000002 Td
 /F4.0 11 Tf
-<20> Tj
+<20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+152.74 594.1850000000002 Td
+/F4.0 11 Tf
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+158.24 594.1850000000002 Td
+/F4.0 11 Tf
+<497369734164646f6e734175646974> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-152.74 594.1850000000002 Td
+240.74 594.1850000000002 Td
 /F4.0 11 Tf
-<22497369734164646f6e73417564697422> Tj
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9185,13 +9633,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 136.24 579.4450000000002 Td
 /F4.0 11 Tf
-<224175646974456e74727922> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+141.74 579.4450000000002 Td
+/F4.0 11 Tf
+<4175646974456e747279> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+196.74 579.4450000000002 Td
+/F4.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9207,12 +9677,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24 564.7050000000002 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -9229,12 +9699,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 564.7050000000002 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -9251,12 +9721,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 564.7050000000002 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <4175646974456e747279> Tj
 ET
 
@@ -9301,7 +9771,29 @@ ET
 BT
 81.24000000000001 549.9650000000001 Td
 /F4.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+86.74000000000001 549.9650000000001 Td
+/F4.0 11 Tf
+<2e> 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
+92.24000000000001 549.9650000000001 Td
+/F4.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9478,23 +9970,23 @@ f
 h
 S
 Q
-0.800 0.000 0.000 scn
-0.800 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 59.24 399.3650000000002 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d3822203f3e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 59.24 384.62500000000017 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c6a646f> Tj
 ET
 
@@ -9511,24 +10003,57 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.310 0.624 0.812 scn
+0.310 0.624 0.812 SCN
 
 BT
 86.74000000000001 384.62500000000017 Td
 /F4.0 11 Tf
-<786d6c6e733d> Tj
+<786d6c6e73> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+114.24000000000001 384.62500000000017 Td
+/F4.0 11 Tf
+<3d> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 119.74000000000001 384.62500000000017 Td
 /F4.0 11 Tf
-<22687474703a2f2f786d6c6e732e6a63702e6f72672f786d6c2f6e732f6a646f2f6a646f22> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+125.24000000000001 384.62500000000017 Td
+/F4.0 11 Tf
+<687474703a2f2f786d6c6e732e6a63702e6f72672f786d6c2f6e732f6a646f2f6a646f> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+317.74 384.62500000000017 Td
+/F4.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9544,24 +10069,57 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.310 0.624 0.812 scn
+0.310 0.624 0.812 SCN
 
 BT
 81.24000000000001 369.88500000000016 Td
 /F4.0 11 Tf
-<786d6c6e733a7873693d> Tj
+<786d6c6e733a787369> 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
+130.74 369.88500000000016 Td
+/F4.0 11 Tf
+<3d> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 136.24 369.88500000000016 Td
 /F4.0 11 Tf
-<22687474703a2f2f7777772e77332e6f72672f323030312f584d4c536368656d612d696e7374616e636522> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+141.74 369.88500000000016 Td
+/F4.0 11 Tf
+<687474703a2f2f7777772e77332e6f72672f323030312f584d4c536368656d612d696e7374616e6365> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+367.24 369.88500000000016 Td
+/F4.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9577,30 +10135,52 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.310 0.624 0.812 scn
+0.310 0.624 0.812 SCN
 
 BT
 81.24000000000001 355.14500000000015 Td
 /F4.0 11 Tf
-<7873693a736368656d614c6f636174696f6e3d> Tj
+<7873693a736368656d614c6f636174696f6e> 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
+180.24 355.14500000000015 Td
+/F4.0 11 Tf
+<3d> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 185.74 355.14500000000015 Td
 /F4.0 11 Tf
-<22687474703a2f2f786d6c6e732e6a63702e6f72672f786d6c2f6e732f6a646f2f6a646f> Tj
+<22> 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
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+191.24 355.14500000000015 Td
+/F4.0 11 Tf
+<687474703a2f2f786d6c6e732e6a63702e6f72672f786d6c2f6e732f6a646f2f6a646f> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 59.24 340.40500000000014 Td
@@ -9610,13 +10190,24 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 103.24000000000001 340.40500000000014 Td
 /F4.0 11 Tf
-<687474703a2f2f786d6c6e732e6a63702e6f72672f786d6c2f6e732f6a646f2f6a646f5f335f302e78736422> Tj
+<687474703a2f2f786d6c6e732e6a63702e6f72672f786d6c2f6e732f6a646f2f6a646f5f335f302e787364> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+339.74 340.40500000000014 Td
+/F4.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9632,34 +10223,67 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.310 0.624 0.812 scn
+0.310 0.624 0.812 SCN
 
 BT
 350.74 340.40500000000014 Td
 /F4.0 11 Tf
-<76657273696f6e3d> Tj
+<76657273696f6e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+389.24 340.40500000000014 Td
+/F4.0 11 Tf
+<3d> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 394.74 340.40500000000014 Td
 /F4.0 11 Tf
-<22332e3022> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+400.24 340.40500000000014 Td
+/F4.0 11 Tf
+<332e30> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+416.74 340.40500000000014 Td
+/F4.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 422.24 340.40500000000014 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3e> Tj
 ET
 
@@ -9676,13 +10300,134 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
+
+BT
+81.24000000000001 325.6650000000002 Td
+/F4.0 11 Tf
+<3c7061636b616765> 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
+125.24000000000001 325.6650000000002 Td
+/F4.0 11 Tf
+<20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.310 0.624 0.812 scn
+0.310 0.624 0.812 SCN
+
+BT
+130.74 325.6650000000002 Td
+/F4.0 11 Tf
+<6e616d65> 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
+152.74 325.6650000000002 Td
+/F4.0 11 Tf
+<3d> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+158.24 325.6650000000002 Td
+/F4.0 11 Tf
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+163.74 325.6650000000002 Td
+/F4.0 11 Tf
+<6f72672e697369736164646f6e732e6d6f64756c652e61756469742e646f6d> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+334.24 325.6650000000002 Td
+/F4.0 11 Tf
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
+
+BT
+339.74 325.6650000000002 Td
+/F4.0 11 Tf
+<3e> 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
+59.24 310.9250000000002 Td
+/F4.0 11 Tf
+<ca20202020202020> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
+
+BT
+103.24000000000001 310.9250000000002 Td
+/F4.0 11 Tf
+<3c636c617373> 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
+136.24 310.9250000000002 Td
+/F4.0 11 Tf
+<20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.310 0.624 0.812 scn
+0.310 0.624 0.812 SCN
 
 BT
-81.24000000000001 325.6650000000002 Td
-/F6.0 11 Tf
-<3c7061636b616765> Tj
+141.74 310.9250000000002 Td
+/F4.0 11 Tf
+<6e616d65> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9691,42 +10436,42 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-125.24000000000001 325.6650000000002 Td
+163.74 310.9250000000002 Td
 /F4.0 11 Tf
-<20> Tj
+<3d> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-130.74 325.6650000000002 Td
+169.24 310.9250000000002 Td
 /F4.0 11 Tf
-<6e616d653d> Tj
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-158.24 325.6650000000002 Td
+174.74 310.9250000000002 Td
 /F4.0 11 Tf
-<226f72672e697369736164646f6e732e6d6f64756c652e61756469742e646f6d22> Tj
+<4175646974456e747279> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-339.74 325.6650000000002 Td
-/F6.0 11 Tf
-<3e> Tj
+229.74 310.9250000000002 Td
+/F4.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9735,20 +10480,20 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24 310.9250000000002 Td
+235.24 310.9250000000002 Td
 /F4.0 11 Tf
-<ca20202020202020> Tj
+<20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.310 0.624 0.812 scn
+0.310 0.624 0.812 SCN
 
 BT
-103.24000000000001 310.9250000000002 Td
-/F6.0 11 Tf
-<3c636c617373> Tj
+240.74 310.9250000000002 Td
+/F4.0 11 Tf
+<736368656d61> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9757,31 +10502,42 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-136.24 310.9250000000002 Td
+273.74 310.9250000000002 Td
 /F4.0 11 Tf
-<20> Tj
+<3d> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-141.74 310.9250000000002 Td
+279.24 310.9250000000002 Td
+/F4.0 11 Tf
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+284.74 310.9250000000002 Td
 /F4.0 11 Tf
-<6e616d653d> Tj
+<5055424c4943> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-169.24 310.9250000000002 Td
+317.74 310.9250000000002 Td
 /F4.0 11 Tf
-<224175646974456e74727922> Tj
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9790,74 +10546,74 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-235.24 310.9250000000002 Td
+323.24 310.9250000000002 Td
 /F4.0 11 Tf
 <20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.310 0.624 0.812 scn
+0.310 0.624 0.812 SCN
 
 BT
-240.74 310.9250000000002 Td
+328.74 310.9250000000002 Td
 /F4.0 11 Tf
-<736368656d613d> Tj
+<7461626c65> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-279.24 310.9250000000002 Td
+356.24 310.9250000000002 Td
 /F4.0 11 Tf
-<225055424c494322> Tj
+<3d> 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
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-323.24 310.9250000000002 Td
+361.74 310.9250000000002 Td
 /F4.0 11 Tf
-<20> Tj
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-328.74 310.9250000000002 Td
+367.24 310.9250000000002 Td
 /F4.0 11 Tf
-<7461626c653d> Tj
+<497369734164646f6e734175646974456e747279> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
-361.74 310.9250000000002 Td
+477.24 310.9250000000002 Td
 /F4.0 11 Tf
-<22497369734164646f6e734175646974456e74727922> Tj
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 482.74 310.9250000000002 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3e> Tj
 ET
 
@@ -9874,12 +10630,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 103.24000000000001 296.1850000000002 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f636c6173733e> Tj
 ET
 
@@ -9896,23 +10652,23 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 81.24000000000001 281.44500000000016 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f7061636b6167653e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 59.24 266.70500000000015 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f6a646f3e> Tj
 ET
 
@@ -10104,28 +10860,27 @@ Q
 
 endstream
 endobj
-78 0 obj
+77 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 77 0 R
+/Contents 76 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 16 0 R
 /F1.0 8 0 R
 /F4.0 38 0 R
-/F6.0 61 0 R
 /F3.1 18 0 R
 >>
-/XObject << /Stamp1 111 0 R
+/XObject << /Stamp1 110 0 R
 >>
 >>
-/Annots [80 0 R 81 0 R 82 0 R]
+/Annots [79 0 R 80 0 R 81 0 R]
 >>
 endobj
-79 0 obj
-[78 0 R /XYZ 0 841.89 null]
+78 0 obj
+[77 0 R /XYZ 0 841.89 null]
 endobj
-80 0 obj
+79 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -10136,7 +10891,7 @@ endobj
 /Type /Annot
 >>
 endobj
-81 0 obj
+80 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -10147,7 +10902,7 @@ endobj
 /Type /Annot
 >>
 endobj
-82 0 obj
+81 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -10158,7 +10913,7 @@ endobj
 /Type /Annot
 >>
 endobj
-83 0 obj
+82 0 obj
 << /Length 5616
 >>
 stream
@@ -10484,23 +11239,23 @@ Q
 
 endstream
 endobj
-84 0 obj
+83 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 83 0 R
+/Contents 82 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F3.1 18 0 R
 /F1.0 8 0 R
 /F4.0 38 0 R
 >>
-/XObject << /Stamp1 111 0 R
+/XObject << /Stamp1 110 0 R
 >>
 >>
-/Annots [85 0 R]
+/Annots [84 0 R]
 >>
 endobj
-85 0 obj
+84 0 obj
 << /Border [0 0 0]
 /Dest (_ugbtb_decoupling_db-schemas)
 /Subtype /Link
@@ -10508,7 +11263,7 @@ endobj
 /Type /Annot
 >>
 endobj
-86 0 obj
+85 0 obj
 << /Length 6439
 >>
 stream
@@ -10656,12 +11411,12 @@ f
 h
 S
 Q
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 59.24 671.0050000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c646570656e64656e63793e> Tj
 ET
 
@@ -10678,12 +11433,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 81.24000000000001 656.2650000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c67726f757049643e> Tj
 ET
 
@@ -10700,12 +11455,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 213.24 656.2650000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f67726f757049643e> Tj
 ET
 
@@ -10722,12 +11477,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 81.24000000000001 641.5250000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c617274696661637449643e> Tj
 ET
 
@@ -10744,12 +11499,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 240.74 641.5250000000001 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f617274696661637449643e> Tj
 ET
 
@@ -10766,12 +11521,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 81.24000000000001 626.7850000000002 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c76657273696f6e3e> Tj
 ET
 
@@ -10788,12 +11543,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 202.24 626.7850000000002 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f76657273696f6e3e> Tj
 ET
 
@@ -10810,12 +11565,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 59.24 612.0450000000002 Td
-/F6.0 11 Tf
+/F4.0 11 Tf
 <3c2f646570656e64656e63793e> Tj
 ET
 
@@ -10923,28 +11678,27 @@ Q
 
 endstream
 endobj
-87 0 obj
+86 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 86 0 R
+/Contents 85 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 16 0 R
 /F1.0 8 0 R
 /F4.0 38 0 R
-/F6.0 61 0 R
 /F3.1 18 0 R
 >>
-/XObject << /Stamp1 111 0 R
+/XObject << /Stamp1 110 0 R
 >>
 >>
-/Annots [89 0 R]
+/Annots [88 0 R]
 >>
 endobj
-88 0 obj
-[87 0 R /XYZ 0 841.89 null]
+87 0 obj
+[86 0 R /XYZ 0 841.89 null]
 endobj
-89 0 obj
+88 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -10955,7 +11709,7 @@ endobj
 /Type /Annot
 >>
 endobj
-90 0 obj
+89 0 obj
 << /Border [0 0 0]
 /Dest (_ugdnos)
 /Subtype /Link
@@ -10963,7 +11717,7 @@ endobj
 /Type /Annot
 >>
 endobj
-91 0 obj
+90 0 obj
 << /Border [0 0 0]
 /Dest (_ugdnos)
 /Subtype /Link
@@ -10971,7 +11725,7 @@ endobj
 /Type /Annot
 >>
 endobj
-92 0 obj
+91 0 obj
 << /Border [0 0 0]
 /Dest (other-guides)
 /Subtype /Link
@@ -10979,7 +11733,7 @@ endobj
 /Type /Annot
 >>
 endobj
-93 0 obj
+92 0 obj
 << /Border [0 0 0]
 /Dest (other-guides)
 /Subtype /Link
@@ -10987,7 +11741,7 @@ endobj
 /Type /Annot
 >>
 endobj
-94 0 obj
+93 0 obj
 << /Border [0 0 0]
 /Dest (_ugodn_configuring)
 /Subtype /Link
@@ -10995,7 +11749,7 @@ endobj
 /Type /Annot
 >>
 endobj
-95 0 obj
+94 0 obj
 << /Border [0 0 0]
 /Dest (_ugodn_configuring)
 /Subtype /Link
@@ -11003,7 +11757,7 @@ endobj
 /Type /Annot
 >>
 endobj
-96 0 obj
+95 0 obj
 << /Border [0 0 0]
 /Dest (_ugodn_configuring_properties)
 /Subtype /Link
@@ -11011,7 +11765,7 @@ endobj
 /Type /Annot
 >>
 endobj
-97 0 obj
+96 0 obj
 << /Border [0 0 0]
 /Dest (_ugodn_configuring_properties)
 /Subtype /Link
@@ -11019,7 +11773,7 @@ endobj
 /Type /Annot
 >>
 endobj
-98 0 obj
+97 0 obj
 << /Border [0 0 0]
 /Dest (_ugodn_configuring_persistence-xml)
 /Subtype /Link
@@ -11027,7 +11781,7 @@ endobj
 /Type /Annot
 >>
 endobj
-99 0 obj
+98 0 obj
 << /Border [0 0 0]
 /Dest (_ugodn_configuring_persistence-xml)
 /Subtype /Link
@@ -11035,7 +11789,7 @@ endobj
 /Type /Annot
 >>
 endobj
-100 0 obj
+99 0 obj
 << /Border [0 0 0]
 /Dest (_ugodn_configuring_persistence-xml)
 /Subtype /Link
@@ -11043,7 +11797,7 @@ endobj
 /Type /Annot
 >>
 endobj
-101 0 obj
+100 0 obj
 << /Border [0 0 0]
 /Dest (_ugodn_configuring_eagerly-registering-entities)
 /Subtype /Link
@@ -11051,7 +11805,7 @@ endobj
 /Type /Annot
 >>
 endobj
-102 0 obj
+101 0 obj
 << /Border [0 0 0]
 /Dest (_ugodn_configuring_eagerly-registering-entities)
 /Subtype /Link
@@ -11059,7 +11813,7 @@ endobj
 /Type /Annot
 >>
 endobj
-103 0 obj
+102 0 obj
 << /Border [0 0 0]
 /Dest (_ugodn_configuring_disabling-persistence-by-reachability)
 /Subtype /Link
@@ -11067,7 +11821,7 @@ endobj
 /Type /Annot
 >>
 endobj
-104 0 obj
+103 0 obj
 << /Border [0 0 0]
 /Dest (_ugodn_configuring_disabling-persistence-by-reachability)
 /Subtype /Link
@@ -11075,7 +11829,7 @@ endobj
 /Type /Annot
 >>
 endobj
-105 0 obj
+104 0 obj
 << /Border [0 0 0]
 /Dest (_ugodn_configuring_using-jndi-data-source)
 /Subtype /Link
@@ -11083,7 +11837,7 @@ endobj
 /Type /Annot
 >>
 endobj
-106 0 obj
+105 0 obj
 << /Border [0 0 0]
 /Dest (_ugodn_configuring_using-jndi-data-source)
 /Subtype /Link
@@ -11091,7 +11845,7 @@ endobj
 /Type /Annot
 >>
 endobj
-107 0 obj
+106 0 obj
 << /Border [0 0 0]
 /Dest (_ugodn_overriding-jdo-annotations)
 /Subtype /Link
@@ -11099,7 +11853,7 @@ endobj
 /Type /Annot
 >>
 endobj
-108 0 obj
+107 0 obj
 << /Border [0 0 0]
 /Dest (_ugodn_overriding-jdo-annotations)
 /Subtype /Link
@@ -11107,7 +11861,7 @@ endobj
 /Type /Annot
 >>
 endobj
-109 0 obj
+108 0 obj
 << /Border [0 0 0]
 /Dest (_ugodn_java8)
 /Subtype /Link
@@ -11115,7 +11869,7 @@ endobj
 /Type /Annot
 >>
 endobj
-110 0 obj
+109 0 obj
 << /Border [0 0 0]
 /Dest (_ugodn_java8)
 /Subtype /Link
@@ -11123,7 +11877,7 @@ endobj
 /Type /Annot
 >>
 endobj
-111 0 obj
+110 0 obj
 << /Type /XObject
 /Subtype /Form
 /BBox [0 0 595.28 841.89]
@@ -11151,120 +11905,120 @@ Q
 
 endstream
 endobj
-112 0 obj
+111 0 obj
 << /Type /Outlines
 /Count 12
-/First 113 0 R
-/Last 124 0 R
+/First 112 0 R
+/Last 123 0 R
 >>
 endobj
-113 0 obj
+112 0 obj
 << /Title <feff0044006100740061004e00750063006c0065007500730020004f0062006a006500630074002000530074006f00720065>
-/Parent 112 0 R
+/Parent 111 0 R
 /Count 0
-/Next 114 0 R
+/Next 113 0 R
 /Dest [7 0 R /XYZ 0 841.89 null]
 >>
 endobj
-114 0 obj
+113 0 obj
 << /Title <feff005400610062006c00650020006f006600200043006f006e00740065006e00740073>
-/Parent 112 0 R
+/Parent 111 0 R
 /Count 0
-/Next 115 0 R
-/Prev 113 0 R
+/Next 114 0 R
+/Prev 112 0 R
 /Dest [10 0 R /XYZ 0 841.89 null]
 >>
 endobj
-115 0 obj
+114 0 obj
 << /Title <feff004300680061007000740065007200200031002e00200044006100740061004e00750063006c0065007500730020004f0062006a006500630074002000530074006f00720065>
-/Parent 112 0 R
+/Parent 111 0 R
 /Count 1
-/First 116 0 R
-/Last 116 0 R
-/Next 117 0 R
-/Prev 114 0 R
+/First 115 0 R
+/Last 115 0 R
+/Next 116 0 R
+/Prev 113 0 R
 /Dest [12 0 R /XYZ 0 841.89 null]
 >>
 endobj
-116 0 obj
+115 0 obj
 << /Title <feff0031002e0031002e0020004f00740068006500720020004700750069006400650073>
-/Parent 115 0 R
+/Parent 114 0 R
 /Count 0
 /Dest [12 0 R /XYZ 0 567.1500000000002 null]
 >>
 endobj
-117 0 obj
+116 0 obj
 << /Title <feff004300680061007000740065007200200032002e00200043006f006e006600690067007500720069006e006700200044006100740061004e00750063006c006500750073>
-/Parent 112 0 R
+/Parent 111 0 R
 /Count 5
-/First 118 0 R
-/Last 122 0 R
-/Next 123 0 R
-/Prev 115 0 R
+/First 117 0 R
+/Last 121 0 R
+/Next 122 0 R
+/Prev 114 0 R
 /Dest [36 0 R /XYZ 0 841.89 null]
 >>
 endobj
-118 0 obj
+117 0 obj
 << /Title <feff0032002e0031002e00200043006f006e00660069006700750072006100740069006f006e002000500072006f0070006500720074006900650073>
-/Parent 117 0 R
+/Parent 116 0 R
 /Count 0
-/Next 119 0 R
+/Next 118 0 R
 /Dest [36 0 R /XYZ 0 587.15 null]
 >>
 endobj
-119 0 obj
+118 0 obj
 << /Title <feff0032002e0032002e002000700065007200730069007300740065006e00630065002e0078006d006c>
-/Parent 117 0 R
+/Parent 116 0 R
 /Count 0
-/Next 120 0 R
-/Prev 118 0 R
+/Next 119 0 R
+/Prev 117 0 R
 /Dest [49 0 R /XYZ 0 695.88 null]
 >>
 endobj
-120 0 obj
+119 0 obj
 << /Title <feff0032002e0033002e002000450061006700650072006c00790020005200650067006900730074006500720069006e006700200045006e007400690074006900650073>
-/Parent 117 0 R
+/Parent 116 0 R
 /Count 0
-/Next 121 0 R
-/Prev 119 0 R
+/Next 120 0 R
+/Prev 118 0 R
 /Dest [49 0 R /XYZ 0 620.0200000000001 null]
 >>
 endobj
-121 0 obj
+120 0 obj
 << /Title <feff0032002e0034002e002000500065007200730069007300740065006e00630065002000620079002000520065006100630068006100620069006c006900740079>
-/Parent 117 0 R
+/Parent 116 0 R
 /Count 0
-/Next 122 0 R
-/Prev 120 0 R
+/Next 121 0 R
+/Prev 119 0 R
 /Dest [49 0 R /XYZ 0 154.78000000000014 null]
 >>
 endobj
-122 0 obj
+121 0 obj
 << /Title <feff0032002e0035002e0020005500730069006e00670020004a004e00440049002000440061007400610053006f0075007200630065>
-/Parent 117 0 R
+/Parent 116 0 R
 /Count 0
-/Prev 121 0 R
-/Dest [68 0 R /XYZ 0 295.86999999999995 null]
+/Prev 120 0 R
+/Dest [67 0 R /XYZ 0 295.86999999999995 null]
 >>
 endobj
-123 0 obj
+122 0 obj
 << /Title <feff004300680061007000740065007200200033002e0020004f0076006500720072006900640069006e00670020004a0044004f00200041006e006e006f0074006100740069006f006e0073>
-/Parent 112 0 R
+/Parent 111 0 R
 /Count 0
-/Next 124 0 R
-/Prev 117 0 R
-/Dest [78 0 R /XYZ 0 841.89 null]
+/Next 123 0 R
+/Prev 116 0 R
+/Dest [77 0 R /XYZ 0 841.89 null]
 >>
 endobj
-124 0 obj
+123 0 obj
 << /Title <feff004300680061007000740065007200200034002e0020004a0061007600610038>
-/Parent 112 0 R
+/Parent 111 0 R
 /Count 0
-/Prev 123 0 R
-/Dest [87 0 R /XYZ 0 841.89 null]
+/Prev 122 0 R
+/Dest [86 0 R /XYZ 0 841.89 null]
 >>
 endobj
-125 0 obj
+124 0 obj
 << /Nums [0 << /P (i)
 >> 1 << /P (ii)
 >> 2 << /P (1)
@@ -11276,50 +12030,46 @@ endobj
 >>]
 >>
 endobj
-126 0 obj
+125 0 obj
 << /Length1 13056
-/Length 8230
+/Length 8231
 /Filter [/FlateDecode]
 >>
 stream
-x\ufffd\ufffdz	x[\u0575\ufffd\ufffd\ufffd\u0272l\ufffd\ufffdlK\ufffdF\u02f2lk\ufffde\u0243,y\ufffd)\ufffd1\ufffd\ufffd\ufffd\ufffd$\ufffd	i!
!L\ufffd!
\ufffd\ufffd\ufffd\ufffd\ufffd0\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdk\ufffdJJ\ufffdr!\ufffdRJ\ufffd^\ufffd\ufffd\ufffdK\uc4f7\u0391d\u02ce\ufffd\ufffd\ufffd\u38fd\ufffd9k\ufffd\ufffd_k\ufffd\ufffd\ufffd\ufffdA!\ufffdG6\ufffdA\ufffd\ufffdc\ufffdI�\ufffd]\ufffd\ufffdSa\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd'\ufffd_G\ufffdxft\ufffd\ufffd7\ufffd\u5d872M\ufffd=\u01c7\ufffdf\ufffdn<.oE(E\ufffd\ufffd
\ufffd\ufffdb\ufffd\ufffdF(\ufffdP\ufffdo\ufffd$\u01a3\u043e\u069a\ufffd\ufffd\u058c\ufffd\u07fa\ufffd6h\ufffd=\ufffd{rbz\ufffd\ufffdz\ufffd?\ufffd\ufffd\ufffd\ufffd5\ufffd\ufffd\ufffd\u0537\u06ceP\ufffd;qh\ufffd\ufffd\ufffdm\ufffd2\ufffd\ufffd\ufffdp`\ufffd\ufffdE(\ufffdr\ufffd?\ufffd`D0'\ufffd\ufffd n/\ufffd%\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdJl\ufffdB\ufffd\ufffdRk\ufffdH\ufffdO4$\ufffdM)\ufffdif\ufffdIG\ufffdL\ufffd3+;'\u05d5\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdW\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u0283\ufffd\ufffd\ufffd\ufffd\ufffd_\ufffd\ufffdu\ufffd\ufffd!\ufffd,y\ufffd\ufffd-\ufffd"Q\ufffd\ufffdN\ufffd\ufffd\ufffd<]t\ufffd\u3723\ufffd\ufffd
-\ufffdFp/\ufffde\ufffdEb\ufffdk6p\ufffd\ufffd\ufffdN\ufffd\ufffdJ\ufffd!\ufffdZ�)\ufffd\ufffd,\ufffd\ufffd\u0115\ufffd\ufffd\ufffd\ufffd\ufffd\u0651\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdmW/\ufffd-\ufffd\ufffd>\ufffd1\u05be\ufffdV\ufffd\ufffd\ufffd\ufffd\u0382_\ufffdw\ufffd\ufffdU\ufffd\ufffd\ufffd2-\ufffd\u0461"DR	!\ufffda\ufffd\ufffd\u0145\ufffd\ufffd\ufffd;\\ufffd;@\ufffd\ud16c\ufffd\ufffd~Y\u0419\ufffd\ufffd\ufffd+/\ufffdD\ufffd\ufffd\ufffd\ucb82\ufffd\ufffdYY\ufffd\ufffd\ufffd\ufffdF@\ufffd\ufffdZ\ufffdVhj\ufffd\ufffd\ufffd<\ufffd\ufffd\ufffd\ufffdy\ufffd(\ufffd\ufffd\ufffd\ufffdm\ufffd\ufffdsp\ufffd\ufffd\ufffd\ufffd\ufffdcc_\ufffdD@\ufffdF\ufffd\u0234P\ufffdL\ufffd=CE\ufffd\ufffd\ufffd\ufffd;:\ufffd\ufffdd\ufffd$\ufffd\ufffd&G\ufffd\ufffd\ufffd-\ufffd6\u0528\ufffdj:\ufffd$J\ufffd$\u07a4vy\ufffd\ufffdb\ufffd;\ufffdBT\ufffd,_\ufffd\ufffdNH\ufffdC\ufffd{m\ufffd\u037f\u3760G\ufffdPV\ufffd\ufffd`\ufffdKA\ufffd^g!vH\ufffdV\ufffd�\ufffdJ\ufffdV\ufffd\u04aa\ufffdlOvh\ufffd#\ufffd\ufffdd\ufffdN\ufffdyt\ufffdG\ufffdG [6\ufffd\ufffd\ufffd\ufffdo\ufffd>,\ufffd\ufffdi\ufffd\u036f\ufffd\u03bb \ufffd\ufffdX\ufffd\ufffd\ufffdoP\ufffdE\ufffd\ufffd=\ufffd=\ufffd( \ufffd\ufffd\u05b3sw\ufffd\ufffd\ufffd\u039e}q\ufffd\ufffd_nu-J\ufffd\ufffd+\ufffd\ufffd\ufffd\ufffd\ufffd\u02aa\ufffd\ufffdx\ufffd\ufffd\ufffd{{t\ufffdm,\ufffdY,yk\u04e6\ufffd\u8bde{\ufffdgZZ\ufffd\ufffd\ufffd\u01eeon>~\ufffd?\ufffd=0i.q^C\ufffdv\ufffdG( \ufffd\ufffd$\ufffd^>\ufffdA\ufffdK/\ufffd\u057b\ufffdJcY\ufffd[e\ufffdU\ufffd7\ufffd\u0625\ufffd\ufffd\ufffd}^\ufffd:\ufffdFe\ufffdj\ufffd\ufffd\ufffdt\ufffd\ufffd\ufffd0l\ufffd\ufffdj\ufffdU\ufffd\ufffd!\ufffd\ufffd\ufffd\ufffd\u028c\uc0f5 \ufffd\ufffdZ\ufffd\ufffd\ufffdI\ufffd
 FG\ufffdV\ufffduG=}`\ufffdK\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffda\ufffdDg_\ufffd,k\ufffd
-lJ{\ufffd\ufffd^\u07e1\ufffdj\ufffd\ufffd\ufffdj\ufffdw*R\ufffdT\ufffd\ufffdA\ufffdo\ufffd\ufffd\ufffd;\ufffd\K
M\ufffd\ufffdH\ufffd\ufffd\ufffd\ufffd4\ufffd\ufffd\ufffd\ufffd\ufffdupM\ufffdJ\ufffd\ufffd\ufffd\ufffdJn(\ufffd\ufffda*\ufffd(=\ufffd\ufffdx\ufffd=\u0794a\ufffd\ufffd[XX2\u06d2\ufffdht\ufffd\ufffdp
\ufffd#\ufffd=\ufffd[\u02d3\ufffdM5.}Z\ufffd\ufffd\ufffd6W\ufffdC\ufffde.}\ufffd\ufffd]W{Gg\ufffdp\ufffdi\ufffd\ufffd0\ufffd.\ufffd\ufffdH
-3\ufffdq\ufffd\ufffdt[o\ufffd\ufffd':kK\ufffd\ufffd\ufffd
\ufffdF\ufffd\ufffd\ufffd\ufffdQd`\ufffdE\ufffd\ufffd	\ufffd:\ufffd\ufffd\ufffd\ufffd>Zvn\ufffd\u0685v)\ufffdd	8\ufffd7\u06654{t\ufffd\ufffdGs.\ufffd%\ufffd\u07a0iAr\ufffd0\ufffd\ufffd`\ufffdD\ufffdo\ufffd?\ufffdO\ufffd&c\ufffdy\ufffd\ufffd\ufffd\ufffdP;\ufffd\ufffd\ufffdG''lkn\ufffd\ufffd!\ufffdcY\ufffd6\ufffd\ufffd\ufffdy9\ufffd\ufffdcH3\ufffd\ufffdb\ufffd\ufffdB\ufffd$\ufffdK\ufffd#\ufffd\u0657\ufffd#\ufffd\ufffd\ufffd\ufffd\ufffd5\ufffd4qzq\ufffd\ufffd\ufffd\ufffd&
=mT\ufffdv\ufffd>wGy\ufffd\ufffdS\ufffd\ufffd&\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd}\ufffd[\ub33c\ufffd\ufffd\ufffd\ufffdL\ufffd\ub5a9\ufffd|\ufffd!s\ufffd:5_l\ufffd[\ufffd\ufffd)H\ufffd\ufffd\u04b0\ufffdl\ufffd\u0180mSP.@\ufffd\ufffd\ufffdA\ufffdL(\ufffd\ufffd\ufffd\ufffd7\ufffd\ufffdV\ufffd-NGfq\ufffd\u0411\ufffd8wEsF\ufffdc#\ufffd\ufffd\ufffd\u01c6N\ufffdH\ufffdm\ufffdr\ufffd\u077b\ufffd\ufffdTW#N+\ufffdK\ufffd,tJ	cY\ufffd{|z;g\ufffd\ufffdD_\ufffdD\ufffd\ufffd\ufffd{F\ufffd\ufffdh~\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdg'\ufffd\u055a\-\ufffd\ufffd\u0153Rm\ufffd\ufffd\u0407\ufffd<\ufffd\ufffd/\ufffd2\u0381\ufffd\ufffd\ufffd!!-\ufffd\ua8b1^\ufffd\ufffdb\ufffd\ufffd\ufffd\ufffd\ufffdppx\ufffda\ufffd\u01c9\ufffdS\ufffd\ufffd{\ufffd9J\ufffd.\ufffd\ufffdfD9\u0491\ufffd1\ufffd\ufffd\\ufffdd\ufffdsN\ufffd2F\ufffd8\ufffd\ufffdL\ufffd\ufffd\ufffd]\u05a6\ufffd\ufffd\u071e2c\u01a6\ufffd\ufffd\ufffd}p\u0419\1\ufffd\ufffd\u079e^\ufffd\ufffds\ufffd\u04e7g]\ufffd\ufffd\u2c5a\ufffd$\ufffd\ufffd^\u07d4\ufffdt\ufffd\ufffd\ufffd
-s\ufffd\ufffd\ufffd\ufffd(\u026dJ\ufffd\u0289\ufffd2\ufffd\ufffd\ufffds\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdkgM\ufffd@}\ufffd:\ufffd\ufffd{\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd*\ufffd\\ufffdm\ufffd\ufffdS3O\ufffdU\ufffd(\ufffd\ufffd\ufffd<\ufffdP\ufffd\ufffd\ufffdj\ufffd\ufffd\ufffd$\ufffd\u05f5\ufffds\ufffd\ufffd\ufffd/\ufffd\ufffdnn\u01abDb&\ufffd,MB,
-\ufffd~Y*R\ufffd!\ufffd\ufffdh:.;\ufffd\ufffd?\ufffd4_\ufffd\ufffdp\ufffd=2\ufffd\ufffd\ufffd|lp\ufffd\ufffdO\u02959m\ufffdG{[\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdH.\ufffd\u01b6\ufffd\ufffd\ufffd\u06b1
g*3\ufffd\ufffd\u0321\ufffdC/;I/\ufffd\ufffdx\ufffd	\ufffd:\ufffd@\ufffd\ufffd\ufffd\u04f8\ufffd
-\ufffd+\ufffdyZj\u03dbw\ufffd\ufffd\ufffdM[\ufffd\ufffd,\ufffd\ufffdNRM\ufffdx\ufffd:W\ufffdO\ufffd\ufffd\ufffd,[\ufffd\ufffd\ufffdZ\ufffd@\ufffddu\ufffd@\ufffd{t\ufffdQ\ufffd\u0699n\ufffdZ\ufffd\ufffd-\ufffd\ufffd\ufffd\ufffdZ\ufffd\u06b9\ufffd\ufffd\ufffdy\ufffd2y\ufffd\ufffd\ufffd; \ufffd0ym\ufffdArb\ufffdA\ufffd\ufffd\u0641\ufffd9\ufffd9\ufffd)\ufffd\ufffd\ufffda\ufffd\u0296\ufffdS\ufffdch�\ufffdb\u0482\ufffd2\ufffd\ufffd\ufffd#\ufffd\ufffd\ufffd\ufffdR+iT\ufffd\ufffd\ufffdb\ufffd\ufffdQ\ufffd\ufffd\ufffd8]\ufffdJ\ufffdx\ufffd:\ufffdk8\ufffdq\ufffd\u0132x\ufffd>\ufffd\ufffd\ufffd\ufffd\ufffdZ\ufffd\ufffd6\ufffd7*\u0453N\ufffd~#J\ufffd\u046bG\ufffd(\ufffd_\ufffdx\ufffd\ufffdPZ\ufffd\ufffdF\ufffda\ufffd\ufffdd\ufffdk\ufffdI\ufffd,\ufffd\ufffdCRf\ufffdP\ufffd@\ufffd\ufffd\u04c0VCa\ufffd\ufffdY!S;\ufffd%\ufffde3\ufffdz\ufffd\ufffdn\ufffdB\ufffd(\ufffd\ufffdNA0S\ufffd]\ufffdn\ufffdZ\ufffdS\ufffd\ufffd\ufffd\ufffd\ufffd}\ufffd[+\u053a\uae56\ufffdTE\ufffdP\ufffdC\u010b\ufffd\u0770\ufffd\ufffd\ufffdll%\ufffd6g\ufffd�\ufffd\ufffd\ufffdi\u02a7\ufffdn\ufffdM\ufffdo\ufffd\ufffd\ufffd\ufffd(\ufffdu\ufffd\ufffd\ufffd|4g\ufffd\ufffdeYT\u14105\ufffd~b\u042e\ufffd&\ufffd\ufffdt\ufffd<=`\ufffd
=\ufffd\ufffdj\ufffd\ufffdX!\ufffd9FOL=\ufffd\u05df\ufffd5=\ufffd\ufffd]\ufffd\ufffd)]\ufffd0Hl]U\ufffd\ufffdc\ufffd\ufffd\ufffd\ufffdc\ufffd	\ufffd|]D\ufffd\ufffdX_\ufffd
-\u0142\ufffd\ufffd'\ufffd\ufffd\ufffdq\ufffd\ufffd7\ufffdg\ufffd\ufffdK\ufffd+\ufffdbf'f:b\ufffd)\ufffdt6\ufffd\ufffd\ufffdo\ufffd\ufffdC\u0619>\ufffd\ufffds\ud2cem/ns\ufffd\ufffdg\ufffd\ufffdO\ufffd\ufffd\ufffd\ufffd\ufffd{\ufffd\ufffdv\ufffd\ufffd\u01a3{\ufffd\ufffd\ufffd\ufffd\ufffdN\ufffd^\ufffd]\ufffd\ufffdra\ufffd\ufffd@\ufffd\ufffd\ufffdP\ufffd?\ufffd\ufffd\ufffdK-
-\ufffd`Dp\ufffdB\ufffd(\ufffd\ufffdDA\ufffd\ufffd\ufffd\ufffd\ufffd<\ufffd\ufffdB\ufffd\ufffdWi\ufffd\ufffd\ufffd\ufffd>\ufffd
\ufffd\ufffd2\ufffdW\ufffdtGje\ufffd_\ufffd\ufffd/\ufffd\ufffd\ufffd2\ufffde$C3\ufffd*\u0560d2\ufffd\ufffddq\ufffd\ufffd\ufffd_i\ufffd\ufffd\ufffd\u01a9[<\ufffdG\ufffd\ufffd\ufffd*\ufffd\ufffd;v\ufffd\ufffd\ufffd\ufffd\ufffd[s\ufffd[\ufffd\u03fa\ufffd$\u0198\ufffdD\ufffd\ufffdVwf\ufffdK\ufffdN\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdo\u01ff\ufffd\ufffd\ufffd~\ufffd9[e/M\ufffd\ufffd8{\ufffd3\ufffd\ufffdmo\ufffd\ufffdHe \ufffd	/!3I6\ufffd\ufffdd\u067c\ufffd\ufffd\ufffd\ufffdO7EF\ufffdJsV[\ufffdl\ufffd6K\ufffd.8\ufffd
-9\ufffd\ufffd\ufffd\ufffd]\ufffd\ufffd\ufffdK\ufffdS\ufffd\ufffd\u01c0\ufffd9\ufffd"MJ\ufffd\u01ec$)\ufffdn\ufffd\ufffdhZ\ufffd�	\ufffd\ufffd\ufffd,W&\ufffda\ufffd\ufffd=\ufffd\ufffd\ufffd\ufffd9+>\u070b\ufffd\ufffd\ufffdsH=\ufffd\ufffdZV\ufffd+,8\ufffd\ufffd?\ufffd\ufffd\ufffdT\ufffd \ufffd\u65f4\ufffd\ufffd\ufffd\ufffdeM\ufffdh\ufffd\ufffdE\ufffde\ufffd\ufffd\ufffdU\ufffd\ufffd\\ufffd\ufffd\ufffd5\ufffd<8J}\ufffd<\ufffd\ufffd{^\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd0'\ufffd*\ufffd\ufffdx\ufffdaKa\ufffd\ufffd\ufffd\ufffdV@We\ufffdo<\ufffdui\ufffd+\ufffd\ufffd\ufffd\ufffdA\ufffd3h\ufffd,!\ufffd\u3d6d\ufffdW\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd:u\ufffd6H\ufffdY:.m\v{\ufffd{|\ufffdo/c\ufffd+\ufffd)T\ufffd\ufffd\ufffd8q7~w\ufffd$\ufffd1F\ufffd\ufffd[6\ufffd\|iL]\ufffd6,\ufffd\ufffdj\ufffd"\ufffd\ufffd\ufffd8x\ufffd1\ufffdEIl'ux\ufffd\ufffd\ufffd\ufffd0\ufffd/\ufffdv\ufffdw\ufffd0\ufffd9\ufffd\ufffdug\ufffd\ufffd\ufffd\ufffdO\ufffd\ufffd\u047a\ufffd\ufffd\u05ce=q\ufffdx\u04cd\ufffd\ufffd}ONM=\u065b\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd0\ufffd[##B\ufffda\ufffd\ufffdz\ufffd\ufffd\ufffd\ufffd\ufffd
\ufffd\ufffd#\ufffd-^\ufffd
-\ufffdA^\ufffd\ufffd\ufffdT2\ufffd\ufffdw\ufffdv\ufffd;\ufffd\ufffd\ufffd\ufffd\ufffdN\ufffd]\ufffd\ufffd\u0606\ufffd\ufffd\ufffdL2\ufffd:v\ufffd\u0111\ufffd\ufffd\ufffd;k\ufffd\ufffd![\ufffd\ufffd\ufffd*\u05cfc\ufffd6\ufffd<hPf [\ufffdI\ufffd)+\ufffd\ufffdm\ufffd\ufffdh\u7bf6\ufffdg\ufffdy\ufffd\ufffd\ufffdO\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffde\ufffd\ufffd\ufffd\ufffdS\ufffdqW\ufffd7q\u0613?�?'UGl&7\ufffdp\u05af\ufffd0\ufffd\ufffd\ufffd
!\ufffd|"\ufffd\ufffd\ufffd\ufffd\ufffd=\ufffdu\ufffd\u9bdee\u0492/\ufffd,\ufffd\ufffd\ufa13\ufffd\ufffd@0\ufffd\ufffd\ufffd\ufffd\ufffd$W\ufffd\ufffdt;KZ\ufffd;_x\ufffda\ufffd=OdM\ufffd\ufffdZ\ufffd0\ufffdN\ufffd\ufffd\ub93fCl\ufffdgb\ufffdXj0$\ufffd\ufffd\ufffd\ufffd@/\ufffd\ufffd\ufffd\ufffdz\ufffd\u30d95\u5936h\ufffd\ufffd'4\ufffds\ufffd\ufffd\ufffdo=\ufffd\ubf2f\ufffd\ufffdR)w\ufffd\ufffd6\ufffd4U\ufffd\ufffd\ufffd\ufffd\ufffdd\ufffd\ufffd\ufffd\ufffd$\ufffdj\ufffd\ufffdS]p[\ufffds\ufffd\ufffdl\ufffdb\ufffd\ufffdm\ufffd\ufffd\ufffd{6f$4\ufffd\ufffd\ufffdm\ufffdY\ufffdn\ufffd�\ufffd\ufffd8\ufffd\ufffd\u043f}=S\ufffd3\ufffd\ufffd\ufffd\ufffd\ufffdLe\ufffd\ufffdD\ufffd<a\ufffd^*&>`&\ufffduq\ufffd\ufffd\ufffd\ufffd-\ufffd\ufffd(\ufffd" \ufffd\ufffdd\ufffd\ufffd$\ufffdc\ufffd\ufffd\ufffd\ufffds\ufffd\ufffd\ufffdf\<\u0232\ufffdW\ufffd;\ufffd^n\ufffd\ufffd?U\ufffd\ufffd\ufffd^\ufffd]S\ufffd\u06eb\ufffdv6\ufffd\ufffd}\ufffdW\ufffd\ufffdU\ufffd}\ufffd\ufffdI\ufffd\ufffd\ufffd^\ufffd\u04b6\ufffd6\ufffd\ufffd<[FZCz/\u06dc\ufffdbbj\ufffd\ufffd\ufffd\ufffd\ufffdf\ufffd\ufffd^X^\ufffd\ufffdb\ufffd{p\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdab\ufffd.\ufffdP0\ufffd)a\ufffdz\ufffd\ufffd+\ufffd4aL\ufffd\ufffd?y\ufffd
 +\ufffd\ufffdQ\ufffd\ufffdW	\ufffdV\ufffd&%\ufffd\ufffd\u06a12]\ufffdx\ufffd\ufffd\ufffdD7\ufffd/\ufffd"tX\ufffd\ufffdH\ufffd'\ufffdF>\ufffdA\ufffd\ufffd\u066b\ufffdF(\ufffd\ufffd+\ufffd\ufffd\ufffd!\\ufffd\ufffd\ufffd:\ufffdQ\ufffdYm\ufffd?K\ufffd\ufffd5\ufffd\u029c\ufffd\ufffd\ufffdO\ufffd\ufffd_\ufffd\ufffd+z/?Ng\ufffd\ufffd\ufffd\ufffd\ufffd}UaF\ufffd\ufffd\ufffd8'\ufffd\ufffdR^y\ufffd\ufffd\ufffd\ufffdR)\ufffdY\:\ufffd\ufffdF>5c\ufffdJ\ufffd\ufffd7\ufffd\ufffd\ufffd\ufffdW\ufffd\ufffd?^\ufffdoY\ufffd\ufffd\u06bf\ufdcc\ufffd\ufffdR\ufffd\ufffd\ufffd\ufffdu@8\ufffd\ufffde\ufffd2\ufffd\ufffd\ufffdP\u01fe,LH\ufffd\ufffd\ufffd\ufffdE\ufffdtKz\ufffd>\ufffd3\ufffd\ufffd\ufffdGl\ufffd\ufffd\ufffdw?\ufffd\ufffdK\ufffdtl\ufffd!\ufffdj\ufffd\ufffd^\ufffd\ufffda\ufffdEI\ufffdr\ufffd\ufffd\u42c5/\ufffd!\ufffd\ufffdD\ufffd(\ufffd\ufffd+\ufffdg\ufffd\ufffdM\ufffdO\ufffd{\ufffd%2U\ufffd\ufffd\ufffdg\ufffd\ufffd\ufffd\ufffd}\ufffd\ufffd\ufffds&\ufffd\\ufffd\ufffdEFH\ufffd\ufffdJ\ufffd26\ufffd=\ufffd\u7fc3\ufffdqal\ufffd\ufffdg\ufffdzs\ufffd{2\ufffd\ufffd\ufffd@ \ufffde\ufffd$\ufffdwU\ufffdd\ufffd\ufffd\ufffdW\ufffd\ufffd%aq\ufffd\ufffd&f�\ufffdD\ufffd.\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u028c\u0269
-\ufffd$\ufffdM\ufffd\ufffd\ufffd9x\ufffdP\ufffdI	\ufffd*\ufffd\ufffdJ\u0215\ufffdW\ufffd\ufffdm2\ufffd\ufffdP\ufffd>?\ufffdl\ufffd\ufffde\ufffd)z\ufffd?}bt\ufffd\ufffdN\ufffdJ\ufffd!\ufffdpe\uaf88\u04e6\ufffd\ufffde]}=\ufffd_X]?\ufffd\ufffdGW
\ufffdJ\u03ee\ufffd\ufffd\ufffdj\ufffdXeJ\ufffdV\ufffd}\ufffd}\ufffdS\ufffd>\ufffd\ufffd_\ufffdz\ufffd;\ufffdc\ufffd\ufffdM/\ufffd\ufffd\ufffd\ufffd-yn\ufffd\ufffd|\ufffd\ufffdx\ufffdx/\ufffd)\ufffdjQ4\ufffd\ufffd\ufffd('\u5d66\ufffd\ufffdJ\ufffdG1\ufffd\ufffd\ufffdA|ck\ufffdR\ufffd\ufffd\ufffd\ufffdN`\ufffd\ufffd\ufffdLT0\ufffdKd\ufffdM\ufffd0)f\ufffd\u6496g0\ufffd\ufffd\ufffd\ufffdg>\ufffd &\ufffd\ufffd\ufffd\ufffd\ufffd_\ufffd\ufffd\ufffde\ufffdB\ufffd\ufffdk\ufffdI\ufffd\u0716\ufffdwu\u05fd]V\ufffd*
-\ufffd\ufffd4BM^EGA\ufffdl\ufffd\ufffd_=\ufffd\\ufffdM\ufffd\ufffd+7\ufffd\ufffdR\ufffd\ufffdN\ufffd6\ufffd\ufffd\ufffd[\uea34\ufffdM{z\ufffd+5['\ufffdI\ufffd\ufffdL0\ufffd\ufffd7;\u019d\ufffd\ufffdPl\ufffd\ufffd;\u0719Q\ufffd?W\ufffd\ufffdH\ufffd*
	%\ufffd0n\ufffd\u077f!\ufffdCsbj.k\ufffd\ufffd~Ww\ufffdK\ufffdH\ufffd\ufffda)c\ufffd\ufffd9><ynuw^\ufffd\ufffdMY\ufffd\ufffdn\ufffd@\ufffd,\ufffd/\ufffd\u838fw\ufffd\ufffd\ufffd\ufffd\ufffdXa+J>\ufffd\u07c6\ufffd\ufffd1~\ufffd\ufffdH\ufffd\u066d\u054e\ufffd\ufffd}\ufffd\ufffd\ufffd9>\ufffd\ufffd3\ufffd\ufffd\ufffd\u0631Qg`\ufffd(\ufffdl
-\ufffd5\ufffdYw\ufffd\ufffdD\ufffd\ufffd\ufffd\ufffdKK\ufffd\ufffd\ufffdW\ufffdc\ufffd\ufffd\ufffd#\ufffdX\ufffd\ufffd\ufffdX\ufffd\ufffd\ufffd3\ufffd\ufffdGK\ufffdZ\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd?\ufffd;;.s\ufffd\ufffd<\ufffd\ufffd-4\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd#\ufffd\ufffd\ufffde\ufffd\ufffd\ufffd\ufffdK]`\ufffd\ufffd_\ufffd6\ufffd6\ufffd\u06d3\ufffd\ufffd\ufffd;+\ufffdQ\ufffd9B\ufffdO\ufffd\ufffd3\ufffdt\ufffd	\u0313E\ufffd$A\ufffd\ufffd\ufffdm\ufffd)\ufffdF\ub2fb\ufffd\ufffd]a\ufffd9o\ufffdbY9d.#-\ufffdJt\ufffd\ufffdv\ufffd\ufffd\ufffd\ufffdDn\ufffd\ufffd3#\ufffd\u044f\ufffd\ufffd<\ufffd\ufffd\ufffd\ufffd\ufffdewk\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd*2dUN\u0627\ufffd#\ufffd\ufffd\ufffd\ufffd\u0346\ufffd\ufffd~\ufffda\ufffdq\u05e2\ufffd0\ufffdL\ufffdstT\ufffdqi\ufffd{\ufffdo_z\ufffd\ufffd\ufffd\ufffd\ufffdU\\u068d\ufffdX\ufffdq\ufffdk\ufffd\ufffd\ufffdd{<7I\ufffd.\ufffdKf\ufffd&$hr\u05c4\u0481\ufffd\ufffd\ucc07\ufffd\ufffd-X\ufffd\ufffdV;qfq\ufffd\ufffdz\u554c\ufffd\ufffd\ufffd\ufffd\u018bUqf\ufffd!J\ufffdiLs%Fc-\ufffd	\ufffd\u023d\ufffd\ufffd\ufffd:\ufffd\ufffdN\ufffd&ej\ufffdS\ufffd\ufffd.K\ufffd\ufffd\ufffd\ufffdp\u03b7\ufffd\ufffd\ufffd\ufffd\ufffdXi	\ufffd\ufffd\ufffd4\ufffd\ufffd<\ufffdU\ufffd
[\u068e \ufffdL\ufffdgL\ufffd\ufffd\ufffd\ufffdWv\ufffd\ufffd\ufffd])\u0303\ufffd9\ufffd\ufffdL
-\ufffd\ufffdC8\ufffd\ufffd#Ja\ufffd\ufffdF+\ufffd\ufffd\ufffd\ufffdl\ufffd\u0637\ufffdIP<I\ufffd2F\ufffd\ufffd*\ufffd\ufffd\ufffd\ufffdzC\ufffd\ufffd\ufffd\ufffd\u1f54\ufffdN\ufffd4Y#)(K+\ufffd\ufffd\u067a\ufffd*\ufffd\ufffd\ufffd\ufffd\ufffd.\ufffd\u06ac\ufffd^8\ufffd7P;~\ufffdN\u9a35\ufffd&\ufffd>?iKKoFi\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdR\u02cc	\ufffd\ufffdXiTdT\ufffdlk\ufffd\ufffd.\ufffd$\ufffd\u01ea\ufffd\ufffdq*!\ufffdR\ufffd\ufffd\ufffd\ufffd\ufffd^\ufffd\ufffdy\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u0756"\u02af\ufdb7\ufffd\u06d3!\ufffd\ufffd\ufffd1je\ufffd\ufffdXsm\ufffd\ufffdP\ufffd\u1d3a\ufffd\ufffd\ufffdj\ufffd{\ufffd6\ufffd\ufffdW|\ufffd]{\ufffd9\ufffd\ufffd\ufffdG\ufffd\ufffd\ufffd\ufffd\ufffd\$\ufffd+\ufffd0\ufffd\ufffd~\ufffdV/~\ufffd:>\ufffd;/\ufffd\ufffd\ufffd\u0166\ufffdBl;\ufffd\ufffdz
-6\ufffdU\ufffd
\ufffd\ufffd\ufffd'\u07adP%\ufffdl\ufffd=6L\ufffd\ufffd]\u011b\ufffdCk\ufffd|]\ufffdT\ufffd\ufffd\ufffd\ufffd
-\ufffdfc,\ufffd\ufffdZ\ufffd0P\ufffdWm7V\ufffdg.\ufffd\ufffd\ufffd^>!\u04a4\ufffd\u0166\ufffd\ufffdbuJl\\ufffdF\u01266b/`\ufffd{\ufffd\ufffd\u05c9\ufffd\ufffdD\ufffd*2ReK\ufffdsT\ufffd
->\ufffd\ufffd/h	~\ufffd\u02d8\ufffd\ufffd\ufffd\ufffd+\ufffdZ\ufffd\ufffd}\ufffdM\ufffd\ufffdu\ufffdY\ufffd\u0529\ufffd\ufffd\ufffd\ufffdn\ufffd,\ufffd*o\ufffd`\ufffd\ufffd>fNnc1\ufffd\ufffd[t\ufffd\ufffdst\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd%+IL\ufffd:\ufffdK\ufffd	m\ufffdMe\ufffde\ufffdj5\ufffd\ufffd\ufffd
-~\ufffd\ufffdU\ufffd\ufffd\ufffd8@\ufffd4x\ufffd\ufffd\ufffd%\ufffdp\ufffd%\ufffd#\ufffdt\ufffdoI\ufffd9p\ufffd!;E\ufffd\ufffd\ufffdz\ufffd:\ufffd\ufffdU5\ufffd\ufffd\ufffd\ufffd,\ufffd\ufffdU`\ufffd\ufffd:\ufffd\ufffd+\ufffd\ufffd\ufffd_\ufffd\ufffd\ufffd\ufffd\ufffdP\ufffdb]\ufffd\ufffd)\ufffd\ufffdym\ufffd\\ufffda\ufffd?P\ufffdsS\ufffd{\ufffdB%_]R\ufffdl\ufffdh\ufffdq\ufffd\ufffd\ufffd\ufffd6[\ufffd\ufffd^K\ufffdw\ufffd\ufffdWA\ufffdS\ufffd,\ufffd\u020e
qebk\ufffd9\ufffdL\ufffdu\ufffd\ufffd\ufffd\ufffdNo\ufffd\ufffd\ufffd!\ufffd\u03adEK\u038e\ufffd\ufffd\u0199\ufffd#\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdrq\ufffd\ufffd\ufffd)_\u07d6^\ufffd\ufffd\ufffd*\ufffda\ufffd\ufffd\ufffd+\u06d8\ufffd\ufffdo\ufffd\ufffd??\ufffd[4\ufffd\ufffd1\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd_\ufffd\ufffd\ufffd\ufffd\ufffd\u0119\ufffd\ufffd\e\ufffd/\ufffdU\ufffd#55\ufffd\ufffdTE\ufffdYE\ufffdO\u8fd4\ufffd\ufffd\ufffd\ufffd`bK\ufffd_~`\ufffd\ufffdl^\ufffd\ufffd\u9a69S\u04f9\ufffd\u04e7}J\ufffd\ufffds\ufffdO\ufffd\ufffd"\ufffd\ufffd0Y\ufffdgd\ufffd2M\ufffdkN\ufffd c\ufffd\ufffdU\ufffd	\u07b9T\ufffd\ufffd\ufffd\ufffd\ufffdz*(\ufffdt\ufffd\ufffd!?Z]\ufffd\ufffd\ufffd\ufffd$M\ufffd	\ufffd\ufffd\ufffdY	\ufffd\ufffd
JjK\ufffdK\ufffd"\ufffd\ufffd\ufffdr\u0192\ufffd\ufffd\ufffdj\ufffd_;B\ufffdqf\ufffdR`d\ufffd\ufffd\ufffdWW\ufffd(a@\ufffd\u02ef[\ufffd\ufffd\ufffd\ufffdL\ufffd\ufffd8\ufffd\ufffd\u0320%,\ufffd3L	\ufffd\ufffd\ufffd\ufffd8\ufffd^\ufffdq\ufffd\ufffdNpVU\ufffdo\ufffd@\ufffd=c\ufffd|\ufffd\ufffd\ufffd	?\ufffd2\u0187)\ufffd\ufffd\ufffd\ufffds\ufffd\ufffd\ufffde\ufffdKR\ufffd\ufffd%\ufffdcRKE\ufffd-/)\u03ec\ufffdk9\ufffd\ufffd\ufffd\ufffd\ufffd\u07ad\ufffd-\ufffd8\ufffd\ufffd\ufffd\ufffd\ufffdN_\ufffd\ufffd
 ~mi\ufffdtB\ufffdSDu2U\ufffdR}\ufffd\ufffd\ufffd0\ufffdV\ufffd`\ufffd\ufffd\ufffd\ufffdjS\ufffd"Yf\ufffd'\ufffd)G%\ufffd\ufffd\?[\ufffd\ufffd5p_\u02fa\ufffd\ua91a\ufffd\ufffdL(\ufffd\ufffdQJ\ufffdg\ufffds7="Qf\ufffd;MY\ufffd(gW\ufffdI\ufffd^jJ\u02b2eh\ufffd\u057e\ufffd\ufffduI*{iRv\ufffd\ufffdTlZ^\ufffd1\ufffdf\ufffd\ufffd\ufffd\ufffd\ufffdm\ufffdO\ufffd\u019b_Os\u0298=_T\ufffd\u0480\ufffd\ufffdT\ufffd\ufffd\ufffd\ufffdR\ufffd6\ufffdj\ufffdG\ufffd\ufffd\ue32d\ufffd\ufffd\ufffd6\ufffd\ufffd\ufffd1]8\ufffd\ufffd\ufffd\ufffd\ufffd\ufffds#\ufffd9\ufffd\ufffdm\ufffd\u0129\ufffd>ix\ufffd\ufffd\ufffdb\ufffdp\u0237�\ufffd\ufffd\ufffdd\ufffd\ufffdUkh\ufffd]a1*\ufffd\ufffd\ufffd
-D\ufffd\ufffd\ufffd\u038c\ufffd;\ufffdf\ufffd\ufffd&\ufffd\u935e_\ufffd\ufffdYZA\ufffd\ufffd\ufffd
\ufffd'r+L\u0456\ufffd\u01c6\ufffdW\ufffd\ufffd\ufffdL\ufffd\ufffd\ufffdl\ufffd\ufffd'l\ufffd\ufffd}R\u012f�\ufffd\ufffdOei+\ufffdd<\ufffd\u05bd
-f\ufffd@\ufffd#\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdE\ufffd\ufffdI\ufffd0\ufffd<A-8\ufffd/.\ufffd\ufffd/\u01b1\ufffd\ufffd\u047fz\ufffd~1\ufffd\ufffd\ufffd \ufffdy\ufffd6\ufffdP/\ufffd\ufffd'\ufffd4U)d\ufffd5u|?\ufffdi\ufffd\ufffdm\ufffd\ufffd\ufffd\ufffd\ufffd\u034f\ufffd@\ufffd\ufffd\ufffdaVl~k\ufffd\ufffdI\ufffd\ufffd\ufffd\ufffdo/F*c%nx\ufffdz\ufffdQ\*\ufffd\ufffd\ufffd4\ufffd*\ufffd\ufffd\ufffd\ufffd5\ufffdO\ufffd\ufffdXh\|]\ufffd\ufffdDp\ufffd\ufffd2q,\u0405rE\ufffde\ufffdd\ufffd)Csc\ufffd\ufffd\ufffdH/\ufffdT\ufffdX\ufffd\ufffdz\ufffd}\ufffdqi\ufffd\ufffdI?V\ufffd\ufffd69}\ufffd\ufffd\ufffdR\ufffdP\ufffd\ufffdo0#,~u\ufffdW0\ufffd!\ufffd\u0255\ufffdVf\ufffdc\ufffd25W#E\ufffdV\ufffd\ufffd5C\ufffd{l6\ufffd')\ufffd\ufffd\ufffdsE\ufffd\u063d\ufffd\ufffdKb\ufffd\ufffd\ufffd\:Vl\ufffd\ufffd\ufffdPa\ufffd\ufffd\ufffd\ufffd%\ufffdc\ufffd0\ufffd\ufffd{6\ufffd\ufffd\ufffd\ufffd9\ufffd\ufffdL\ufffd=\ufffd\u07fe\ufffd\ufffd\ufffd4\ufffd\u07c9\ufffd\ufffd\ufffd\ufffd\ufffdE\ufffd\u029e\ufffdkq\ufffd#\ufffd\ufffd
\ufffd"\ufffd&\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd@\ufffd
\ufffda\u0782\ufffd/\ufffdN\ufffd\u0635,b.j7\ufffd\u067a\u047fI,(k\ufffdtO\ufffdh\ufffd\ufffd\u063a8z\ufffd@\ufffdM\ufffd\ufffd\ufffdz\ufffda\ufffdj\ufffd\ufffd\ufffdF{\ufffd\ufffd\ufffd\ufffdT\ufffd\ufffd-\ufffd\ufffd)K\ufffd\ufffdyFx\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd
-\ufffdyge\u040f'\ufffd3yp\ufffd\ufffd\ufffd\ufffd
-\ufffd\ufffd\ufffd\ufffd8\ufffdhU\ufffd\ufffd\ufffd^\ufffd�D\ufffdzr\ufffdVAx%\ufffdp\ufffd\ufffdl\ufffd\u016d\ufffd\ufffdg\ufffd]\ufffd\ufffd\ufffd\ufffd\ufffdM;\ufffd\ufffd\ufffd\ufffdg\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdR\ufffd3U\ufffd\ufffdf\ufffdT\ufffd\ufffdT\ufffdd\ufffd\ufffdU\ufffd\ufffd\ufffd\ufffdJU\ufffd\u04a9\ufffd\ufffd\ufffde*U\ufffdf\ufffd2r\ufffd\ufffdcp\ufffd\ufffd2\ufffdC/\ufffd\ufffdJ\ufffd\ufffd:\ufffd~\ufffdN\ufffdW\u045f\ufffd\ufffdp
-n\ufffdG!\ufffd\ufffd\ufffdI,\ufffd\ufffd\ufffd7\ufffd*\ufffd\ufffd\ufffdQ\ufffdr\ufffd\ufffd)\ufffdi\ufffd_\ufffd\ufffd\u0707\ufffd\ufffds\ufffdS\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd^xJxw\ufffd\ufffd\ufffd_\ufffd\ufffd\ufffdg#"#R"*"\ufffd\ufffd\ufffdD&FvG\ufffd\ufffd\ufffd>*/\ufffdSA\ufffd`Jp&\ufffdm\ufffd~:\ufffd\u06d8\ufffd\ufffdb\ufffdf
-\ufffd\ufffd*"D\ufffd\ufffdg\ufffd"\ufffd\ufffd!\ufffd\ufffd\ufffdGSvH\ufffd%h\ufffd\ufffdf\ufffd\ufffdQD\u0361\ufffd0\ufffd\ufffd\ufffd<\ufffd\ufffdy\ufffd\ufffd:1\ufffd:\ufffd\ufffd\ufffd[\ufffd\ufffd�\ufffd\ufffdp\ufffd\ufffd\ufffd\ufffd\#*\ufffd	8z\ufffd\ufffdA\\ufffd\ufffd\ufffd\ufffdr.\ufffdy\ufffd\ufffd\ufffd\ufffd\u5da2Z\ufffd[8>\ufffd\ufffd%\ufffd\ufffd\ufffdr\ufffdp\ufffd[4M]\ufffd\ufffd9\ufffdp;\ufffd\ufffd\ufffd8\ufffd"5g!^7q*P\ufffd\ufffd\ufffd\ufffd\ufffd.\ufffdQM\ufffd\ufffd\ufffdu\ufffdv\ufffd\ufffde \ufffd\_\ufffdQ\ufffd6\ufffdPU\ufffd\ufffd	2\ufffd#+1p\ufffd\ufffd4|\ufffdG\u02b0\ufffdQ\u01c4r\ufffd#\ufffd\ufffdJ\ufffd\ufffd*!\ufffdN\ufffd2\ufffd3V\ufffdi\ufffd\ufffd~\ufffd\ufffd(\ufffdS\ufffd\ufffd\ufffd#/\ufffd9\ufffdcxc8b\ufffd\ufffdy\ufffdO"\ufffdo\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdo\ufffd.\ufffd\u065ez\ufffd\ufffd\u03aa\ufffd\ufffd)\ufffd*~\ufffd \ufffd!\ufffd<O\ufffd?\ufffd\ufffdC\ufffd\ufffd""8\u0161\ufffd\ufffd\ufffdHh\ufffdMx\ufffd\ufffd\ufffd\ufffd|\ufffd\ufffdrT\ufffd\ufffd\ufffdM?\ufffd~\ufffdU\ufffd\U000137fc\ufffd\ufffd\ufffd_\ufffdE\ufffd\ufffdX\ufffd\ufffd\ufffdz\ufffd]	D\ufffd\ufffdP\ufffd\ufffd !\ufffd,b\ufffd\ufffdd\u07a0\ufffdEqH+\ufffdx\ufffd\ufffdT 3VKI\u0208\ufffdG
-J\ufffd\u0562\u07a5Ev\ufffd\ufffd\u0209\ufffd\ufffd\ufffd\u0381H\ufffd\ufffdP\ufffdb\ufffdqJ\ufffdB+\ufffdx\ufffd\ufffdE\ufffdF5\ufffd\ufffdGu\ufffd\ufffd5\ufffd&\ufffd\ufffd\ufffd\ufffd\ufffd6\u050e:P'\u0680\ufffd`\ufffd^\ufffd\ufffd\ufffd
-a\ufffd\ufffdp\ufffd\ufffdV9\ufffd\ufffd\u02a5Z\ufffd~&\ufffd\ufffd\ufffdc�\ufffd~\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd@?	\ufffdz=\ufffdO\ufffd\ufffd\ufffdcy\ufffd\ufffdB\ufffd
\ufffdsP4v\ufffd9H\ufffdK\ufffd\\ufffd\ufffd-\ufffd\ufffdT\ufffd0T\ufffd\ufffd\ufffd\ufffd1\ufffd\ufffdC)\ufffd\ufffd\ufffd\ufffdHBu\ufffd\ufffdd"5\ufffd\ufffd\ufffdm\ufffd\ufffdQqg\ufffd?\ufffd\ufffdO\ufffd(\ufffd\ufffd\ufffd\u0798V\ufffd\ufffd\ufffd\ufffdH\ufffdG\ufffd\ufffd\ufffd\ufffd\ufffd|8\ufffd\ufffd:\ufffd7\ufffd\ufffdB\ufffd\ufffd\ufffdDUOL\ufffdM
\ufffdh2l\ufffd\ufffd\ufffd\ufffd\ufffd~\u037a\ufffd^\ufffd\ufffdptT\ufffd\ufffd\\ufffd\ufffd4\ufffdO\ufffdO\ufffd\ufffd\ufffdg\ufffdN@\ufffd\ufffdCSh
\ufffd!4\ufffdp
\ufffdz\ufffd\ufffd(\ufffd\ufffd:4\ufffdz\ufffd\ufffdB\ufffd(\ufffd\ufffd\ufffd\ufffdf[\ufffdp\ufffdY\ufffd\ufffd\ufffd>d\ufffd\ufffd\ufffd\ufffd\ufffd4\ufffdO
\ufffd\ufffdL\ufffd]pW#{\ufffd0h\ufffd\ufffd\ufffdM\ufffd\ufffd
\ufffdY\ufffdCS5\ufffd3s\ufffdy\ufffd78<>\ufffd1kB\ufffd\u0500\ufffdqV\ufffd\ufffd\ufffdc\ufffd\ufffdA\ufffd8\ufffd\u05c0#k\ufffd\ufffd\ufffd\ufffdH\ufffd\ufffdS\ufffd\ufffd\ufffdt\ufffd-S3;>\ufffd\\ufffd\ufffdK\ufffd:
\ufffdaJ2\ufffd\ufffd,*\ufffdOIc*#\ufffd\u020a\ufffd\ufffd\ufffd43S\ufffd\ufffd\ufffd1\ufffd\u0508fb \ufffd\ufffd\ufffd\ufffd,Q>8f@\ufffdH\ufffdg0\ufffdF\ufffdof\ufffd\ufffd~/\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdK\ufffd\ufffd\ufffd\ufffd53\ufffd\ufffd\ufffd5\ufffd.a-\ufffd\ufffdt\ufffd\ufffd\ufffd\ufffd\ufffdJ|3>\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdxL@B\ufffd\ufffdgN\ufffd$\ufffd/Dl	<4�q\ufffd\ufffdPf\ufffd\ufffdJ\u04e7A=\ufffd^\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdL\ufffdZ
 \ufffd}\ufffd\ufffdA\ufffdbK\ufffd\u0118u\ufffd
-@&\ufffd\ufffd+\ufffd\ufffd\ufffdM\ufffd0\ufffd	V\ufffdd,sja\ufffd\ufffd\ufffd\ufffd$\ufffd\ufffdX\ufffd\ufffdl\ufffdb\ufffd==3\ufffd7<\ufffdJ\ufffd\ufffd\ufffdRV\ufffd^\ufffd=
}\ufffd\ufffd|\ufffdz\ufffd\ufffd|\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdk
-'}\ufffdp
-\I\ufffd=0\ufffdb\ufffd\ufffd:R\ufffdA\ufffdt\ufffd!\ufffd\ufffd>\ufffd'\ufffdXv
-A\ufffd\ufffd\ufffdV>\ufffd=\ufffd}8\ufffd\ufffd\ufffd1\ufffdX\ufffd\ufffd\ufffdA\ufffd\u0174\ufffdz]qimc\ufffd\ufffdA\ufffd\ufffdx}!Z- y
-8\ufffd\ufffd\ufffd\u06a7\ufffd\ufffd\ufffd\ufffdE-L\ufffdR\ufffd\ufffd\ufffdv\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdl\ufffd\ufffd\ufffd\ufffdD\ufffd
c\ufffd>z\<CF\ufffd\ufffd\ufffdz\ufffdh\ufffd\ufffd/\ufffd\ufffd
+x\ufffd\ufffdz	x[\u0575\ufffd\ufffd\ufffd\u0272l\ufffd\ufffdd\u0652\ufffd\u0472,\ufffdlY\ufffd K\ufffd\ufffdx\ufffdGy\ufffdcyv<\ufffd\ufffdcBBHCS @HC &7\ufffd|i\ufffd\ufffd!\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u06bc\ufffdR\ufffd\ufffd\ufffdK)\ufffd\ufffd^\ufffd\ufffd\ufffdK\uc4f7\u0391d\u02ce\ufffd\ufffd\ufffd\u38fd\ufffd9k\ufffd\ufffd_k\ufffd\ufffd\ufffd\ufffdA!\ufffdGV\ufffdA=\ufffd\ufffd	\ufffd\ufffd\ufffd]\ufffd\ufffd\ufffda\ufffd\ufffd\ufffdl\ufffd\ufffd'~\ufffd\ufffdD\ufffdpzd\ufffd\ufffd;\ufffd\ufffdG2N\ufffd=\ufffd\ufffd[7\ufffd\ufffdZJ\ufffd\ufffd=\u0143\ufffd}\u07a8\ufffd\ufffdJ\ufffd>\ufffd0\ufffd\ufffd:\ufffd\ufffd\ufffd\ufffd\uf136z}\ufffd%\ufffd\ufffdw\ufffd\ufffdp\ufffd\ufffd\ufffd\u03b7\ufffd\ufffdh/@\ufffd\ufffdyG\ufffd>\ufffd\ufffd!\ufffd\ufffdB\ufffd\ufffdF\ufffd\ufffdy\ufffdth#1x
+\ufffd\ufffd\\ufffdO?\u0309\ufffd8\ufffd\ufffd\u51c5G"\ufffd\ufffd"\ufffdD\ufffddp%&V\ufffd\ufffd\ufffdW\ufffd\ufffd\ufffd\ufffd%\ufffd
I\ufffd\ufffdT\ufffd\ufffd\ufffd\ufffd\ufffdt[\ufffd\u0751\ufffd\ufffd\ufffd\ufffd\ufffdu\ufffd\ufffd\ufffd
+\ufffd\ufffdKJ\ufffd\ufffd\ufffdUTVU\ufffds\ufffdO\u037fr\ufffd\ufffd\u5bf5\ufffd\ufffdh\ufffdh\ufffd\ufffdD\ufffd\ufffds\ufffd(Fl#u\ufffd\ufffd\ufffdG\ufffdN\ufffd\ufffdq\ufffd\ufffd*|\ufffdV!\ufffd\ufffd\u05f0\ufffd"1\ufffd5\ufffd\ufffdF\ufffd vq%H
+
\ufffd\ufffd\ufffdI\ufffda\ufffd\ufffdq\ufffdT@\ufffd
+q\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdbb\ufffdk\ufffd\ufffd\ufffdwf\ufffd\ufffd5\ufffd\ufffd\ufffdUz:\ufffd#\ufffd\ufffd\cd\ufffd\ufffdZ\ufffd\ufffd3a\ufffd+	\ufffdTBp\ufffd\ufffdM\ufffd9q\ufffd\ufffd \ufffd.\ufffd\ufffd.\ufffdug+\ufffd_\ufffdwd=\ufffd'\ufffd\ufffd+\ufffd\u041f^>\ufffd\u0559\ufffd+k7\u0593\u05e9(B\ufffdPc\ufffdmB\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd9<G\ufffdw\ufffdY\ufffd\ufffd\ufffdw\ufffdw\ufffd\ufffd\ufffd~\ufffdc\ucad7\u0408\ufffdf\u029e\u1c25+	\ufffd?\ufffdnGG_g\ufffd6Q]\ufffd\ufffd\ufffdJ\ufffd\ufffdllPx\ufffd\ufffd\ufffdTgT9\ufffd2S\u02c9
_!\u02899\ufffd/\ufffdFj#\ufffd\ufffd\u02a1C\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdN\ufffd#F(3\ufffdM0�\ufffdO\ufffd5;$:\ufffdBn\ufffdI\ufffd:\ufffd\a\ufffdI\ufffd'\ufffd\ufffd\ufffd\u069edp0g\ufffd<\ufffd\ufffd#j\ufffd#\ufffd-\ufffd\ufffd\ufffd\ufffd\ufffd|\ufffd\u06b4\ufffd\ufffdU*\ufffd\ufffd>\ufffd60\ufffd\ufffd@,\ufffd\ufffda,dKwC\ufffd4
+*\u07b9\ufffd\ufffd\ufffd]gg\ufffd\ufffdf^\u07b1\ufffd\ufffd[\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd<\ufffd"\ufffd\ufffd\ufffdr ?\ufffd\ufffd\ufffds\ufffdo\uf38c\ufffd\ufffde\ufffd?\ufffd%\ufffdl\ufffd\ufffd\ufffd\ufffdO|\ufffd\s\ufffds\ufffd<\ufffd\u0135\ufffd\ufffd\ufffd\ufffdk\ufffd\ufffd\ufffdIs\ufffd\ufffd\u03f0\ufffdY=B\ufffd\ufffd&\ufffd\ufffd\ufffdM\u029dXz~\ufffd\ufffdeRJ\ufffd]JS\ufffd*\ufffd\ufffd\ufffd\ufffd\ufffd.\ufffd\u0665\ufffd\ufffd\ufffdU9V*\ufffdZ\ufffd\ufffdr\ufffd\ufffddz\ufffd~\ufffd\ufffdk\ufffd\ufffd\ufffdad\ufffd\ufffd\ufffdalfd`\ufffd\ufffd \ufffd\ufffd\u0631\ufffdH
+4\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd-;\ufffd\ufffd\ufffd\ufffd#sn\ufffd4\ufffd\ufffd\ufffd/<\ufffd=\ufffd\ufffd\ufffd\ufffdX\ufffdzGis\ufffdH\ufffdoU\ufffd\ufffd\ufffdx\ufffddS3\ufffd?}\ufffdP+\ufffdS\ufffd\ufffd\ufffd\ufffd\ufffdG\ufffd}\ufffd\ufffdQ\ufffd\ufffdX\ufffdOos\ufffd\ufffdlg_\ufffd1\ufffd\ufffd.v\ufffd[\ufffdk\ufffdT\ufffd\ufffd\ufffdM\ufffd\ufffd`r\ufffd\ufffd0&Qr\ufffdD\ufffd\ufffdn\ufffd
\ufffd\ufffd\ufffd\ufffd\ufffdt[\ufffd}\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd{\ufffd\ufffd\ufffd\u014f\ufffdp\ufffd\ufffdNk\ufffdZ\ufffd\ufffdi\ufffdv\ufffdR\ufffd\ufffd\ufffd\ufffd9\ufffd\ufffdh*u\ufffd
+\ufffdm\u069a\ufffd:
+\ufffd*\ufffd\ufffd\ufffd\ufffd\ufffdu\ufffd\ufffd\ufffd\ufffd`\ufffd\ufffd
\ufffd5%\ufffdzJ\ufffd\ufffd8\ufffdQ3P\\ufffd\ufffd8Y\ufffdw7\ufffd\ufffd%\ufffd\ufffdB=\ufffd/:\ufffd\ufffd\ufffd\ufffd1\ufffd\ufffdH}\ufffd\u0470\ufffdpa\ufffd\ufffd&\ufffdI1\ufffd S\ufffd\ufffd\ufffdN\ufffd\u026dU,>\ufffd\ufffdpq/1\ufffdM\ufffd	\ufffdC\ufffd\ufffd5z\ufffd:\ufffd~\ufffd?|\ufffd5k\ufffd\ufffd\ufffd\u0145\ufffd)|\ufffd421nXr\ufffd]v\ufffd\ufffd\ufffd\ufffdU\ufffd\ufffdd_\ufffd!-\ufffd \u0588u3\ufffd\u04d0\ufffd\ufffd.\u034eg_\ufffd
\ufffdOM\ufffd\ufffd,\ufffdW;S\ufffdi\ufffd\ufffdI\ufffd\ufffdG\ufffd\ufffd\ufffd\ufffdA5\ufffd\ufffd\ufffd\ufffd]eE;\ufffd\ufffdL>\u0592\ufffdW\ufffdrm\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdm\ufffd5\ufffd"\ufffdx\ufffd\ufffd\ufffd+Z%\ufffd\ufffd\ufffdh\ufffd\u0231\ufffd\ufffd\ufffdsE\ufffd\ufffdu\ufffd\ufffd\ufffd\u052aL5\ufffd\ufffdv\ufffdm\ufffd6\ufffdT-A\ufffd\ufffd $\u0304rS\ufffd\ufffdp\ufffdn%\ufffd\ufffdg$	\ufffdu\ufffd7\ufffdw>1\ufffd\ufffd\ufffd|l\ufffd\ufffd\u050e\ufffd\ufffd\ufffd\ufffd-\ufffd<;\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u0664\ufffd\ufffd\ufffd0\ufffd\ufffd\ufffd\u01a6\ufffds\ufffd\ufffd%\ufffd!^\ufffd3r\ufffd{\ufffd\ufffd\ufffd\U000a65f1\ufffdz_=~_VBn\ufffd\u0459\ufffd\ufffd\\ufffd_<!\u0564H}|_\ufffd\ufffd\ufffd\ufffd(\ufffd\ufffd,\ufffdO\ufffd\ufffd`\ufffd6\ufffd\ufffd)\u01bb\ufffd\ufffd\ufffd'\ufffdy\ufffd\ufffd\ufffd~<\u9f31\ufffd\ufffd\ufffd$\ua131)`l\ufffd\ufffd \ufffd\ufffd\u0255~J8\ufffd\ufffd-c\ufffd\u0781\ufffd\ufffdz7\ufffdii\ufffd,\ufffd\ufffd.5\ufffdo\ufffd\ufffd]I\ufffd\ufffd\ufffd\ufffdmi\ufffd?9;1uj\u0189?)\ufffdNN\ufffd\ufffd\ufffd\ufffdN\ufffdJ\ufffd56\ufffd\ufffd \ufffd5W\ufffd\ufffd\ufffdT\ufffdo.Uk\ufffd;F
 \ufffd\ufffd\ufffdw\ufffd;wV\ufffd\ufffd\ufffd\ufffd&\ufffd\ufffdOn\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u05d9\ufffd\u06b0>%\ufffd\ufffdt\ufffd`\ufffd\ufffd\ufffd[\ufffd\ufffdR\ufffdm\ufffd\u0316\ufffd<u\ufffdk]\ufffd/\ufffd
\ufffd\ufffd\ufffd\`\ufffd\ufffdb\ufffdJ$f\ufffd\ufffd\ufffd$\u0122\ufffd\u95e9$\ufffdn2\ufffd\ufffd\ufffd\ufffdc\ufffd\ufffd\ufffd\ufffd\U000a3755\ufffd\ufffd\u01c6\ufffd\ufffd\ufffd\ufffd
\ufffd\ufffdI\ufffd"\ufffdu\ufffdhO\ufffdTQ\\ufffdL`tV\u075b\u0790oI\ufffd^\ufffd\ufffdenk\ufffd\ufffdE\ufffdA\ufffd1xxp\ufffd\ufffd\u0755\ufffd'\ufffd3\ufffd\ufffd>1\ufffdR\ufffd\ufffd3xj\ufffdIN\ufffdc\ufffd)WC\ufffdy\ufffd\ufffd\ufffd7\ufffd\ufffdqk\ufffd\ufffd\ufffd{r\ufffd	\ufffd\ufffd\ufffdWg\ufffd\ufffd\ufffd\ufffd\ufffd\ufffderj\ufffdC#h\ufffd\ufffdn\ufffds/\ufffdNJY;\u04edR\ufffd_\ufffd-\ufffd\ufffd\ufffdW\ufffd^;\ufffd\ufffd  /_"\ufffd\ufffdW\ufffduD\ufffd \ufffd/<L\ufffd/<L\ufffd@>;0;\ufffd+\ufffd8\ufffd\ufffd\u0608\ufffd8`\ufffdRt\ufffd\ufffd6\ufffd$\ufffdM\ufffdtL\ufffd\ufffdA@\ufffd\ufffd|\ufffd&\ufffd_Tb\ufffd\ufffd
\ufffdd\ufffdJ\ufffd\ufffd=\ufffd\ufffdMU*/X\ufffdBy\ufffd\ufffdj\ufffd0D'\u0687\ufffd7\ufffd\ufffd\ufffd\ufffd0\ufffd\ufffd\ufffdD$\ufffd\u04e87oF\ufffd\ufffdc!zud_\ufffd\ufffdOW\ufffdK\ufffd\ufffd[\ufffd=\ufffd\u0701\ufffd\ufffdz0i\ufffd9\ufffdyH\ufffd\ufffd\ufffd\ufffd\ufffdB_\u0428)l\ufffd=+\ufffd`j\ufffd\ufffdx\ufffd\ufffdt\ufffd\ufffdL/\ufffd\ufffd-\ufffd\ufffd\f\ufffd\ufffd\ufffd\ufffd\ufffd	=\ufffdcj\ufffd\ufffd\ufffd\ufffd[\ufffd\ufffd\ufffdu[\ufffd\ufffd\ufffdmk\ufffdJ[5\u06fc\ufffd*/\ufffd\ufffd\ufffdx\ufffd9v\u053d{\ufffd\ufffd\ufffd\ufffdUS\ufffd2\ufffd\ufffd\ufffdM\ufffd\ufffdl\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd~u\u0466\ufffd\ufffd>
 \ufffd\ufffdW\ufffd\ufffd<\ufffd\ufffd\ufffd\u02c09\ufffd\ufffd/\u02e2\ufffd4\ufffdH\ufffd\ufffdS6\ufffd\ufffd 16\ufffd\ufffdh\ufffd\ufffd~\ufffdu\ufffd\u0355S-Era\ufffd}\ufffd\ufffd\ufffd\ufffdYm\ufffds\ufffdq\ufffd\u05f9\ufffd4v\ufffd\ufffd\ufffdYii:\ufffd\u0361\ufffd>\ufffdo\ufffd\u04c6%\ufffdu\ufffd)P,D\ufffd\ufffd8\ufffd\ufffd;\ufffd\ufffd\ufffd\ufffda\ufffd\ufffdu\ufffdf%_\ufffd\ufffd\ufffdLG4\ufffd\ufffd\ufffd\ufffd\ufffd7\ufffdmq;SG\ufffd\ufffdm\u047e\ufffd\ufffdm\ufffd\ufffd\ufffdq\ufffd\ufffd\ufffd\ufffd@0\ufffdW\ufffdo.7\ufffd\ufffd8
\u078ca8`\ufffdu\ufffd\ufffd\ufffd\ufffd/\ufffd+\ufffds
T\ufffd\ufffd)\u0797Vb\ufffds�\ufffdg\ufffdZ\ufffdY\ufffd\ufffd%r\ufffd\ufffd\ufffd\u0127d)f\ufffd\ufffdF\ufffd\ufffdD-\ufffd!Oh\\ufffd\ufffd\ufffd\u01a6;\ufffdPs\ufffd\u29fd\ufffd]\ufffd\ufffd-#Y\ufffdYW\ufffd\ufffd \ufffd\u026c\u014b\ufffdX\ufffd\ufffd}JcL\ufffdVN\ufffd\ufffd\ufffd^\ufffd\u0697UY\ufffd\u07f1\ufffdL\ufffd\u06da\ufffd \ufffd:x\ufffd&$2\ufffdt$\ufffd\u05b4\ufffd#3\ufffd^\ufffdv
+\ufffd\ufffd\ufffdD\ufffd\ufffd_x\ufffd\ufffd\ufffd\ufffd8\ufffd\ufffd\ufffdYJ[IR\ufffd\u067b_\ufffd\ufffdpl{\ufffd~\ufffdx
+\ufffdGHx\ufffd\ufffd\ufffdK\ufffd\u037b\ufffd\ufffd\ufffd\ufffdlcx\ufffd0e\u01b35\ufffd\ufffdJ?d5\ufffd9\ufffd\ufffd\ufffd\ufffd<\ufffd/~`\ufffdUm\u07fd\ufffdY[}\ufffd\ufffdj\ufffd\ufffdA.\u04a8\u043aM
+\ufffd\ufffd\ufffd\ufffd)\ufffd\ufffd\ufffd+\ufffd\ufffd\ufffd\ufffdh\ufffdre\ufffdw\ufffd;\u074d\ufffd,_Y\ufffd2\ufffdB=\u020f\ufffdx0\u0573ka\ufffdaU\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd)\ufffds\ufffd\ufffd85\ufffdo}EKX\ufffd\ufffdX\ufffd-\ufffd\ufffdL\8P\ufffd^\ufffd]/t\ufffd\ufffd}\ufffd\ufffd#\u0517\ufffdc\ufffd\ufffd\ufffd\ufffd\ufffdQs\ufffd\ufffdk~s`"\ufffdB
\ufffd\ufffd5$\ufffd(\u0270`\ufffdPe\ufffd\ufffd\ufffd\ufffd{\ufffd\ufffdI\ufffd<\ufffdK\ufffd
t8\ufffd\ufffdb^\u06da\ufffdx%YQ8L4A\ufffd\ufffd\ufffdz\ufffd!S\u02e5
\ufffdn\ufffd\ufffdO\ufffdy\ufffd\ufffd26O\ufffd�L\ufffd\ufffd\ufffd\ufffd{\ufffdw\ufffdM\ufffd\ufffd\ufffd\u0501\u06f8e\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdEk\ufffd�X\ufffd\ufffd/"\ufffdK\ufffd\u02ce\ufffd\ufffd\ufffd\ufffd/
+\ufffd`;\ufffd\ufffd\u0577\ufffd\ufffd\ufffdG\ufffd}A\ufffd\ufffdA\ufffd\ufffd\ufffd\ufffd8\u01f9\ufffd\ufffd8s\ufffd\ufffd\ufffd>u\ufffd\ufffdGkk\ufffd^?\ufffd\u0535\ufffd\u019b\ufffd\ufffdz\ufffd\ufffd\ufffd|\ufffd'5\ufffd\ufffdg\ufffd\ufffdG\ufffdL+\ufffda\ufffdw\ufffd\ufffd\ufffd\ufffd�\ufffd\ufffdx\ufffdA\ufffdxK\ufffd\ufffd\ufffd\ufffd6/\ufffdG\ufffd\ufffd/\ufffdrr\ufffd	\ufffdLy;\u07f8\u04d5}\ufffd\ufffdyb'\ufffd.\ufffd:\ufffd\ufffdF\ufffd\ufffd\ufffd\ufffd\ufffd9~\ufffd\ufffd\ufffd\ufffd\ufffdj\ufffd8;i\ufffdC\ufffd\ufffd^\ufffd\ufffd\ufffd\u1622\ufffd,j\ufffd\ufffd\u03d6l\ufffdf\ufffd
+C`\ufffd\ufffd\ufffd(\ufffd\ufffd\ufffdm\ufffd\ufffd5\ufffdnMK\ufffd3\ufffd\ufffd\ufffd\ufffd_\ufffd\ufffd\ufffd\u01f89\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdM	])C\ufffd\ufffd'r\ufffd\ufffd8\ufffd\ufffda\u0257\ufffd\ufffd\ufffd#6\ufffd\ufffd8\ufffd\ufffd\ufffdv5\ufffd\ufffd\ufffd\ufffd\ufffd\>\ufffd\ufffd]\ufffd\ufffd\ufffd\ufffdt\ufffd\ufffd\u03f3\ufffdi\u0257Adt\ufffdg\ufffdA\ufffd}(\ufffd\ufffd\ufffd\u0768\ufffd\ufffd\ufffd\ufffds\ufffd\ufffd\ufffd%-\u061d\u03ff[?\u05d6+\ufffd$\ufffdn\ufffd\ufffd\ufffdZ\ufffd_\ufffdu\ufffd\ufffd!\ufffd\ufffd1\ufffd\u0777
+\ufffd/5\ufffd
+wnp\ufffd\ufffd\ufffdjx|\ufffd\ufffd\u0241\ufffd\ufffd2RS\ufffd_~\ufffdS\ufffd\u0676\ufffdt\ufffd\ufffd\ufffd\ufffd{;\ufffd5W\ufffd-\ufffd
\ufffdZu\ufffd\u05b6\ufffd\ufffde\ufffd\ufffd*I\ufffd\ufffdwW\ufffd\ufffd\ufffd\ufffd\u063d=\u02f3\ufffdHoh\ufffd\ufffd\ufffd\u5f8d\ufffd\ufffd
\ufffd\ufffd"\ufffduf\ufffd\ufffdcwm\ufffd,J\ufffd\ufffd\ufffdm_\ufffd\ufffd\u033c3\ufffd\ufffd#SY\ufffd \ufffd\ufffd\ufffd.O\u0624\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdfY\ufffdea\ufffdz\ufffd\ufffd2\ufffd\ufffd0Hx;\ufffd\ufffd'It\ufffd\ufffd\ufffd\ufffd\\ufffd6\ufffd\ufffd\ufffd\ufffd,;\ufffdU0\u01ce\ufffd.\ufffd\ufffd\ufffd\ufffd#\ufffdDU\ufffd\ufffd7w\ufffd\ufffdT[\ufffd\ufffd\ufffd\u059dMF_\ufffd\ufffd\ufffdx]b\ufffd\ufffdvR\ufffd<\ufffd\ufffd\ufffdn\ufffdI\ufffd6\u0354\ufffd\ufffd\ufffd\ufffdK\ufffd\ufffd6\u7c98\ufffd\ufffd\ufffd0%3q\ufffd&\ufffd\ufffd\ufffd2\ufffd\ufffd\ufffd8S\ufffd\ufffd\u0689K\ufffdB0\ufffdO\ufffd\ufffd\u0259\ua530Y\u072eP\ufffdU\ufffd0*U\ufffd\ufffd<~Q\ufffd\ufffd�L\ufffd)\ufffdtu]\ufffd|XlP\ufffd.\ufffd\ufffdPQq\ufffd\ufffd\ufffdk\ufffd-O\ufffd\u039d~3\ufffd\ufffd B\ufffd\ufffd\ufffd\ufffde!\ufffdJ\u0255Ju\ufffd\ufffd\ufffd\ufffdG\ufffd(\ufffd$\ufffd4\u011d!y\\ufffd\ufffdAiJPF\ufffd\ufffd\ufffd\ufffd/\u047f\ufffd\ufffd\ufffd\ufffd5\ufffd\ufffd\ufffd\ufffd.7#\ufffd\ufffd\ufffd{\ufffd_+\ufffd8\ufffdCl
W*\ufffd,.\ufffd\ufffdv3\ufffd\ufffd\ufffd\ufffd{%\ufffd\ufffd~YQ\ufffd\ufffdr\ufffd\ufffd\ufffd\ufffd\ufffdL\ufffd\\ufffd\ufffd\ufffd[F\u028c`\ufffd\ufffd\ufffdr\ufffd: \ufffd\ufffdy\ufffdW`\ufffdc_\ufffd'\ufffdp\ufffd"e\ufffd9-\ufffd\ufffd\u03daj
\ufffd\ufffd�q
+\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\:&B\ufffdi1\ufffda}J\ufffd\ufffd\ufffd R\ufffd:\ufffd\ufffdO\ufffd\ufffd\ufffdW\u0792\ufffdq\ufffd"Y\ufffd\ufffd\u8c92\ufffd\ufffd\ufffdgs\ufffd<\ufffd\ufffdhe\ufffd\ufffd\u04a7#4	\ufffd(]\ufffd\ufffd\ufffdu$\ufffdz'\\ufffd\ufffd\ufffd(\ufffd%l\u0439!\ufffdc\ufffd\ufffd\ufffd\ufffd\ufffdu\ufffd2\ufffdf?\ufffdd^\ufffd\ufffd@\ufffdK\ufffdIB\ufffd*5Ir9a\ufffd\ufffd\ufffdIBb\ufffdOH\ufffd*4	\ufffd]a\ufffd3_\ufffd\ufffd6$\ufffd\ufffd\ufffd\ufffd7\ufffdVv\ufffd\ufffd]\ufffd#\ufffdFy8x\ufffd(&">'\ufffd\ufffd\ufffd7g\ufffdv\ufffd
+\ufffd_\ufffd\ufffdbM&@\ufffdw\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd'F\ufffd\ufffdA\ufffd	W\ufffd\ufffd\ufffd7\ufffdZ_^\u05b6\ufffd7B|\ufffd\u054dsK{tU\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd)\ufffdb\ufffdU\ufffd4k\ufffd\ufffd\ufffd7\ufffd'9\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd/\ufffdgoy\ufffd}M\ufffd\ufffdk\u0233\ufffd\ufffd\ufffd\ufffdYh\ufffd\ufffdG\ufffd\ufffd\ufffdA\ufffd\u0419I\ufffdB\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd*\u011fD\ufffdX\u04e3\ufffd\ufffd\ufffdZ\ufffdRm]]U<\ufffd\ufffda\ufffdc\ufffd:\ufffd\ufffd\ufffd\ufffdX\ufffd\ufffd\ufffd
+\ufffdbvk.q)p�A\ufffd-p\ufffd1b\ufffd\ufffd\ufffd}e\ufffd\ufffd\ufffdg\ufffdU\ufffd;\ufffdM\ufffd9}\ufffdVu\ufffd\ufffdi(\u04e0p\ufffdZ-T\u75b7\ufffd\ufffd4Y\ufffd\ufffd\ufffd\ufffd\ufffdI\ufffd\ufffd\u06351\ufffdbS\ufffdq.\ufffd\ufffd\ufffd hr\ufffd9e\ufffd
+K\ufffd\ufffdqO\ufffd\ufffd\ufffddi\ufffd\ufffd)\ufffd\U00046eb9\ufffdcGB\ufffds\ufffd\ufffd\ufffdWxg\ufffd;*\ufffd\ufffdJ6\ufffdBV\ufffd!\ufffd\ufffd\ufffd
\ufffd\ufffd6\ufffdp\ufffdb\ufffdAL\ufffdfn:\ufffd\ufffd\ufffdvFG$\ufffd\ufffdX\ufffd\ufffdXQx\ufffd\ufffdO\ufffdS\u0555\ufffdwxS&\ufffd\ufffdW(
+\ufffd\ufffd7\ufffd\ufffd\ufffd\^\ufffd\ufffd\ufffd\ufffd/\ufffd[\ufffd\ufffd\ufffd\ufffda+|k\ufffd\ufffd\ufffd\u0693\ufffd6K\ufffd=\ufffdh\ufffd\ufffd.#\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u03cd\ufffdq\ufffd\ufffd\ufffd\ufffd\ufffd@~Z#E3\ufffd\ufffdb\ufffd(\ufffd?ygI\ufffd\u073fy\ufffdw\ufffd\ufffdw\ufffdG\ufffd2\ufffd\ufffd~n\ufffd\ufffdHIj\ufffd\u0752\ufffd\ufffd^z|\ufffd\ufffdY\ufffd\ufffd\ufffde9VO\ufffd>u\ufffd\ufffd\u078f\ufffdP\ufffd\ufffd\ufffd+\ufffd\ufffd\ud740^\ufffd<\ufffdW\ufffdr\ufffdY\ufffd\ufffd\ufffd\u0316h0cW \ufffd\ufffd\ufffd\ufffdYI4\u0390#\ufffd\ufffd\ufffd\ufffd\u025c>f\ufffd\ufffd\ufffd\ufffd$IP\ufffdu<Kk\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd.W\ufffdWXn\ufffdY*YV\ufffdKOM\ufffd\ufffd`\ufffd\ufffdh\ufffd15\ufffd\ufffd3\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd%\ufffdO<\ufffd)\ufffd\ufffdh\u061dC\ufffd%b\ufffd\ufffdc\ufffd\ufffdZ\ufffd\ufffd\u02790\ufffdaLF\ufffd~\ufffd\ufffdmW?\ufffd92\ufffd\\ufffd\ufffd\ufffdu\ufffd\ufffd\ufffdl\ufffd 6\ufffdm\ufffd\ufffd+/\ufffd\ufffd\u06d5qs\ufffd\U000a12fb\ufffd
+k\ufffds/\ufffdvN<3\ufffd\ufffdd\ufffd\ufffd&\ufffdUe\ufffdI\ufffd\u0704M\ufffd\ufffdQ\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdo\ufffdj#N/\ufffda\\ufffd\ufffd\ufffd\ufffdyoc\ufffdX\ufffd2\ufffd\ufffd\ufffdG\ufffd2\ufffd\u0384H\ufffd\ufffd?e\ufffd\ufffd_#o\ufffd\ufffd]i\ufffd\ufffdu\J|\ufffd\ufffdi\ufffd\ufffdu\ufffdz3\u0559=-\ufffd\ufffd\ufffd^\u050cF\ufffd6\ufffd\ufffd\ufffdj\ufffd!K\ufffd\ufffd\ufffd	\ufffdI\ufffd6\ufffd\ufffd\ufffd\ufffdnT:\ufffd\ufffd+e\ufffdy4R\ufffdI!\ufffd\ufffdw\ufffd \ufffd\ufffdG\u020dq\ufffdH\ufffdT\ufffd,\u0459\ufffd\ufffd\ufffd60	\ufffd'IPD\ufffd\ufffd\ufffd_;~R\ufffd/\ufffd\ufffd�?|\ufffd\\ufffda\ufffd&\ufffd%\ufffd\ufffd\ufffd%\ufffdXk\ufffdC^}\ufffd+-22)\u0769U\ufffd\ufffd\ufffdGcr\ufffdk\ufffdl\ufffd*\ufffd5\ufffd\u07e4\ufffd\ufffd%ni\ufffdI/I7\ufffd\ufffd4Q\ufffdhC\ufffd0<F\ufffd2\ufffdR\ufffd\ufffd\u04ce1\ufffd\ufffd1\ufffdDY\ufffdR\ufffd1\ufffdm.ly\ufffd\ufffdqdn[~Rh\ufffd2\u0661q\ufffd&\ufffd\ufffd\ufffdl\ufffd\ufffdwg\ufffd\ufffdc"\ufffd\ufffdha\ufffd\ufffdf\ufffd\ufffd&K\ufffd/lwX\:Adr\u0675k\ufffd\ufffd\ufffd-\ufffd\ufffd=\ufffd\ufffd\ufffd\ufffdZ\ufffd\ufffd\ufffd\ufffd`{\ufffd\ufffd\ufffdMp|\ufffda\ufffd?Z\ufffd\ufffd\ufffdtXc\ufffds \ufffd\ufffd\ufffd{\ufffd\ufffd\J\ufffd\ufffd}Q\ufffd\ufffd+\ufffd_\ufffdx\ufffd\ufffd}\ufffd.\ufffd\ufffd\ufffdr\ufffd\ufffdy\ufffd\ufffd\ufffde\ufffdZ_\ufffdo\ufffd3\ufffd1\ufffdY\ufffde\ufffdD\ufffd/\u016b\ufffd+\ufffd3\ufffd\ufffd\ufffdc\ufffd\ufffd\ufffdcc\ufffdUb\ufffd*9&6Y-bS\ufffd\ufffd\ufffd=O\ufffd\ufffdDN~\ufffdU\ufffd\ufffd&\ufffd9"B	\ufffd\u0597\ufffd?\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd+\ufffdZ\ufffd\ufffdy\ufffd
 U\ufffd\ufffdq\ufffdX\ufffd\ufffdT)11)\ufffdn\ufffd,\ufffd*ng\ufffd\ufffd^fNnc1\ufffd\ufffdt\ufffd\ufffdst\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd%+QL\ufffd,\u0687J\ufffd\ufffdS\ufffd\ufffd)g\ufffdn5\ufffd4)r~\ufffd
\ufffdS\ufffd\ufffd\ufffd8@\ufffd{<a\ufffd\ufffd\u0178`\ufffd\ufffd#\ufffdt\ufffdkN\ufffd\ufffdq\ufffd>+Y)\ufffd\ufffdxz\ufffd}\ufffdU5\ufffd\ufffd\ufffd\ufffd,e\ufffdc\ufffd\ufffd:\ufffd\ufffdk\ufffd\ufffdo\\ufffd\ufffd\ufffd\ufffd\ufffdP\ufffdb]\ufffd\ufffd)\ufffd\ufffd\ufffdym\ufffd\\ufffda\ufffd?R\ufffdr\ufffde\ufffd{\ufffd_U\\ufffddMo\ufffdv\ufffd\ufffd\ufffd\ufffdVk\u035d\ufffd\ufffdwe\ufffdzg~\ufffdC\ufffd,j\u03ca	rebk\ufffd\ufffd\ufffd\ub310u\ufffdl\ufffd\ufffd6Nks\ufffdyA\ufffd\ufffd\ufffd\ufffdK\u038e\ufffd\ufffd\u0199\ufffd#\ufffd\ufffd\ufffd\ufffd\ufffdrq\ufffd\ufffd\ufffd.[\u07daV\ufffd\ufffd\ufffd"\ufffd!\ufffdS\ufffd\ufffd+\u0758\ufffd\ufffdo\ufffd\ufffd/?\ufffd[$\ufffd\ufffdQ\ufffd\ufffd\ufffd|\ufffd\ufffd_\ufffdM\ufffd}u\ufffd\ufffd\\ufffd?\ufffd1\ufffd\ufffd\u02a2\ufffd\ufffd\ufffdM\ufffd\ufffd\ufffdB\ufffd\ufffd$\ufffd\ufffd_J\ufffd\ufffd!H01%\ufffd/=4yj&7w\ufffd\ufffd\ufffd\ufffd\u0269\ufffd\ufffd\ufffd\ufffd\ufffd>\ufffd\ufffdY\ufffd'f~]]\ufffd,\ufffd3\u04702\ufffd\ufffdkN\ufffdc\u0119U\ufffd	\u07b9T\ufffd\ufffd\ufffd\ufffd\ufffdz*\ufffdq\ufffdt\ufffd\ufffd!?Y]\ufffd\ufffdU\ufffd$m7\ufffd\ufffd	\ufffdwL\ufffd\ufffd
JjK\ufffd+\ufffd"\ufffd\ufffd\ufffdr\u0192\ufffdJ\ufffdj\ufffdW;B\ufffdqd\ufffdV`d\ufffd\ufffd\ufffdWW\ufffd\ufffd*f@\ufffd\u02af\u06cb=.\ufffd\ufffdL\ufffd\ufffd8\ufffd\ufffd\u0320%,\ufffd\ufffdL	\ufffd\ufffd\ufffd\ufffd8\ufffd^\ufffdy\ufffd\ufffdNpVU\ufffdoC\ufffd=c\ufffd|\ufffd
 \ufffd\ufffd	\ufffd\u047e\ufffdR@\ufffd\ufffd_\ufffd.;\ufffd\ufffd\ufffd\ufffd$\ufffd\u068a'F\ufffd\ufffd\ufffdknb\ufffdI%\ufffd1\u05f2\ufffd\ufffd\ufffd}s\ufffdKWS\ufffdv\ufffdM\ufffd)e\ufffd.\ufffd\ufffd\ufffd\u903a\ufffd\ufffd\ufffd`\ufffd\u06a5\ufffd0\ufffd3Voa$\ufffd\ufffd\ufffd8U\ufffd\ufffd\u016a0\ufffdD\ufffdM\ufffd\ufffd\ufffdl\ufffd,\ufffd\ufffdb\ufffdLUbf\ufffd\ufffd\ufffd&\ufffd\ufffd\u02da\ufffd3\ufffd\ufffdG)\ufffd\ufffd\ufffdL\ufffd\ufffd\ufffdD\ufffdY\ufffd0f\ufffd#\ufffdeFEZ\ufffd11\u04da\ufffd\ufffdTy\ufffdJG\ufffd%*m%\ufffdYE\ufffd1\ufffd\ufffd	\ufffdl\ufffd)N[X\u04dd_\ufffd\ufffd.	\ufffdn]%\ufffd\ufffd2{\ufffdz\ufffdZ\ufffd~{C\ufffd-X!\u06e4lmM\ufffd\ufffdnuDr\ufffd#\ufffdf\ufffd\wX\u07ea\u0565Du\ufffdp\ufffdzS\ufffd\ufffd\ufffd
\ufffdh*\ufffd\ufffd'\ub57a\u0121\ufffd3\ufffd5C\ufffd \ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdVW\ufffd\ufffd1w\ufffd\u0168L\ufffd"\ufffdk\ufffd*;\ufffd\ufffd\ufffd\ufffd|6\ufffd\ufffd5\ufffd\ufffd\ufffdyJfi9\ufffdS6\ufffd\ufffd)7F\ufffd\ufffd\ufffd\ufffd_\ufffd&Zt1\ufffd\u06bc\ufffd\ufffd:\ufffd\ufffdIy\ufffd\ufffd\ufffd=\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd*\ufffd=\ufffd@r\ufffd\ufffd\ufffd\ufffd+\ufffdB8\ufffdx\ufffd\ufffd?\ufffd\ufffd8\ufffd\ufffd\ufffd\ufffdF\ufffd\ufffd5\ufffd\ufffdpfO\ufffd\ufffd\ufffd\ufffdXmB\ufffd\ufffd\u079e\ufffd\ufffdX)\ufffd.\ufffd\ufffd\ufffd\ufffd\ufffdM\ufffd/n'\ufffd=\ufffd/n><B\ufffd\ufffd\ufffdb\ufffdXc\ufffdDG\ufffd\u063d\ufffdC&{!\#\ufffdpC\ufffdT\ufffd\ufffd\ufffd\ufffd>+W\ufffd\ua511\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd<K_g\ufffdq\ufffd
\ufffd\ufffd\ufffd\ufffd\ufffdG\ufffd\ufffd`\ufffd.\ufffd\ufffd#.Q\u014b\ufffd\ufffd*\ufffd\ufffdzp\ufffd\ufffd\ufffd\ufffd\u05f9m'
 \ufffd{N\ufffd\ufffdz<\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd*\ufffd\ufffdd}\ufffd\ufffdf\ufffd\ufffd0\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdL\ufffd\ufffd\u01b00\ufffd\ufffd\ufffd\u0188Vap5R\ufffdg\ufffd\ufffdaX\ufffdU\ufffd\ufffd&S]\ufffdb\ufffd\ufffdW\ufffd\ufffd\ufffd\ufffd`\ufffd$\ufffd\ufffdS�c\ufffd\ufffd\ufffd\ufffdt%&h\ufffd\ufffddV<v#V\ufffdg\ufffd,\ufffd<\ufffd\ufffdA\ufffd\ufffd\ufffd0\ufffd_\ufffd�\ufffd\ufffd*U}\ufffdp\ufffdV\ufffdn^\ufffd+m\ufffd\ufffdw\u0673<\ufffdPat\ufffd\u0528>\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffda<\ufffd[~\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdE\ufffd\ufffd2[W"\ufffd7	\ufffd\ufffd
\ufffd\ufffdk
]K\ufffd\ufffd5)@\ufffdU\ufffd\ufffdzP\ufffdRDS\ufffd0\ufffd|o(\ufffd\ufffd\ufffd\ufffd\ufffd|\ufffd\ufffd\ufffd\ufffd\ufffd(\ufffd{\u4007\u07216\ufffd\ufffdO:\ufffdk\ufffd+\ufffd\ufffdvV\ufffdp\ufffd;\ufffd\ufffdS\ufffd{\ufffd\ufffd\ufffdV\ufffd&\ufffd\ufffd(\ufffd\u0139\ufffdJ\ufffd\ufffd\ufffd^'\ufffd\ufffd7\ufffd24\ufffd0\ufffd#!\ufffd\ufffd'g\ufffd\ufffd.\ufffd\ufffd>SO\ufffd&\ufffd\ufffd<\ufffdk\\ufffd\ufffd/>M\ufffd\ufffd]\ufffd\u0555b\ufffd\ufffd\ufffd7'\ufffd\ufffd"9\ufffd\ufffd;+\ufffd\ufffd\ufffdH|\ufffd8Y\ufffdT\ufffdL66n.U*K73\uf511Sx?\ufffd,\ufffd\ufffdK\ufffdq\ufffdz\ufffd\ufffd\ufffdD\ufffd\u022e\ufffd\ufffdz\ufffd	\ufffd
'\ufffd|rK>\ufffd\ufffd\ufffd\ufffd\ufffd|\ufffd\\ufffdr\ufffdZ\ufffd\ufffd-\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd}\ufffd\ufffd&\ufffdj\ufffd2d,\ufffdT\ufffd5^:\ufffd'\ufffdB\ufffdC\ufffdB\ufffd\ufffd\ufffd/\ufffd	K+\ufffdM\ufffd\ufffd\ufffd\ufffd~.\ufffd\ufffd\ufffd\u0708\ufffd\ufffdI\ufffd\ufffdH^\ufffd9\ufffd\ufffd\ufffdo\ufffd\ufffd\ufffd\ufffd\ufffdV
 !\ufffd_\ufffd\ufffd\ufffdU\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdG\ufffd/\ufffd\ufffdyL\ufffd!K\ufffd\ufffd6\ufffd!\u03b3G!5\ufffdv\ufffd\ufffdvs\ufffd\ufffd\ufffd\ufffd\ufffd,\ufffdc\ufffdpl\ufffdC\ufffdf8\ufffd\ufffd1G's\ufffd\ufffd@\ufffd\ufffd\ufffdfdp\ufffd!\ufffd8Q
\ufffd\ufffd\ufffd\\ufffd\ufffd\ufffd\ufffd\ufffd9\ufffdmA5\u0137p|r\ufffd+\ufffd?d'\ufffd\ufffd*\ufffd\u06b7h\ufffd\ufffd\ufffd;s\ufffd\ufffd\ufffd6\ufffd\ufffd%2r^G*N?B\ufffd.$\u2523(\ufffd\ufffdq]\ufffd\ufffd\ufffd<y\ufffd;\ufffd\ufffdK\ufffdD\ufffd\ufffdKO~\ufffd\ufffd\ufffd\ufffdm&\ufffd\ufffdL\ufffdY8\ufffd'D\ufffd\ufffd\u0597\ufffd)\ufffd>\ufffd!\ufffdl\ufffdeSG\ufffd\ufffd\ufffd3\ufffdyTLF\ufffdEd\ufffdg,\u0533\ufffd\ufffd\ufffd\ufffdQ\u0127v#%C\ufffd\ufffd\ufffd\ufffd\ufffdp\ufffd\ufffd!\ufffd\ufffd/\ufffd@\ufffd\ufffdHW\ufffd5\ufffd\ufffd\ufffd\ufffd\]\ufffd\u0531=u\ufffdQ\ufffd\ufffdU\ufffd	hS\ufffd5\ufffd\A\ufffdCx\ufffd\ufffdw&\ufffd\ufffd\ufffd\ufffd	D\ufffdq\ufffdC\ufffd,\ufffd\ufffd\ufffd\ufffd[\ufffd\ufffd\ufffdM\ufffd\ufffd\ufffde(\ufffd\ufffd[>\ufffd\ufffdD\ufffd\ufffd?\ufffd,V<#\ufffd\ufffd\ufffd\u042d~\u053f\u6ee5u\ufffd\ufffd\ufffda(	\ufffd\ufffdBB$\ufffdY\u013c\ufffd\u027cA\ufffdb\ufffdVq()Af\ufffd\ufffd\ufffd%\ufffdd\ufffd\ufffdE\ufffdK\ufffdlP\ufffd\u0651eB\ufffd\ufffd
\ufffd\ufffd	+*7\ufffd,DEP\ufffd@\ufffdV\ufffdv\u030bJT\ufffd\ufffdQ
Z\ufffdjC=j@\ufffd\ufffd	bC3jA\ufffd\ufffd
\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd236d\ufffd\ufffdB
\ufffd\ufffd\ufffd%-,rL1\ufffdK'\ufffd|\ufffdL\\ufffd\ufffd\ufffd\ufffd0\ufffd\ufffd\ufffd\ufffd
+A/\ufffd\ufffd	\ufffdK\ufffd~F\ufffd\ufffd\ufffd\ufffd\u0117\ufffd\ufffd\ufffdc\ufffd\ufffd\ufffdB\ufffd\ufffd\ufffdsP$\ufffd\ufffd\ufffd9H\ufffd\ufffd\ufffd\ufffd\\ufffd\ufffd-i\ufffd\ufffd\ufffdT\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdC\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdHBt\ufffd\ufffd$"\ufffd\ufffd\ufffd\ufffdm\ufffd\ufffd\ufffdQ'q\ufffd\ufffd?)\ufffd\ufffd\ufffd\ufffda(\ufffd\ufffd\ufffd\u0798V\ufffd9\ufffd\ufffdp\ufffdK\ufffd\ufffd\ufffd#\ufffd\ufffd|\ufffd\ufffd\ufffd:\u0237\ufffd\ufffd\ufffdL)\ufffd\ufffd\ufffdH\ufffd\ufffdO\ufffdN
N\ufffd\u04edi\ufffd\ufffd\ufffd\ufffd>\ufffd\ufffd\ufffd\ufffd\ufffd`dD]\ufffd\\ufffdR\ufffd\ufffdM\ufffdM\ufffd\ufffd\ufffdk\ufffd\ufffdC\ufffd\ufffdE\ufffdh
\ufffdA4
\ufffd\ufffdw5\ufffdz\ufffd\ufffd\ufffd\ufffd:4\ufffdz\ufffd\ufffd@\ufffd\ufffd\ub5de\ufffdb[}p\ufffdYw\ufffd\ufffd^d\ufffd\ufffdW7\ufffdM\ufffd\ufffd\ufffd\ufffd\ufffd]\ufffdpW{\ufffd\ufffd\ufffd\ufffd\ufffdN\ufffd\ufffd
\ufffd\ufffdE\ufffd\ufffd\ufffdc\ufffd\u04f3y\ufffd;046\ufffd6\ufffd\ufffd\ufffdT\ufffd\ufffd1V\ufffd,\ufffd\ufffda\ufffd\ufffd@\ufffd\ufffdW\ufffd#\ufffd\ufffd\ufffd\ufffd\ufffdH<}\ufffdSC\ufffdc\ufffd4\ufffd5C=3>\ufffd\\ufffd\ufffdK\ufffd:5\ufffdaJ2\ufffd\ufffd,\ufffdOqy
+#\ufffd\u020a\ufffdR{\ufffd\u04d3\ufffd\u07beQ\ufffd\ufffdz\ufffd?\ufffd\ufffd \ufffdC,Q^8\ufffdA\ufffdH\ufffdc0\ufffd\ufffd\ufffdof\ufffd\ufffd~/\ufffd\ufffd\ufffd\ufffd\ufffd\u01cb\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd}\ufffd\ufffd5\ufffd.f-\ufffd\ufffdt\ufffd\ufffd\ufffd\ufffdF\ufffd\ufffd\ufffd^\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd4x\ufffd_B_\ufffd\ufffd{V\ufffd$\ufffd7Hl1<4\u034eq\ufffd\ufffdP\ufffd}\ufffdJ\u04e7F\u0760^\ufffd\ufffd\u07b5\ufffdNOO\ufffdX,=\ufffd}\ufffd\ufffdbs\ufffd\ufffd\ufffde\ufffd@\ufffd-\ufffd+N\ufffd\ufffd9M,0\ufffdqV\ufffdd,sjf\ufffdG\ufffd\ufffdc~\ufffdX\ufffd\ufffd\ufffdl\ufffdb\ufffd\ufffd=5=\ufffd;4\ufffdJ\ufffd\ufffd\ufffdRV\ufffd^\ufffd=}3\ufffd|\ufffdj\ufffd\ufffdol
+\ufffd\ufffd\ufffdTO\ufffd\ufffd&\ufffd=p\ufffd_IU<0\ufffdl\ufffd\ufffd:R\ufffd@\ue51f!\ufffd\ufffd^\ufffd'Yv
+@\ufffd\ufffd\ufffdV>\ufffd
+=\ufffd}8\ufffd\ufffd\ufffd1zY\ufffd\ufffd\ufffd\u02c8\u0154\ufffdj]QIMC\ufffd\ufffdA\ufffd\ufffdx\ufffdAZ\ufffd y8\ufffd\ufffd\ufffd\u06a7\ufffd\ufffd
+\ufffd\ufffdE
L\ufffd\ufffd\ufffd\ufffdv\ufffd\ufffd\ufffd\ufffd]\u07e4\ufffd\u077a12\ufffd\ufffd\ufffd0\ufffd.~\ufffd4p\ufffd<\ufffdB\ufffd\ufffdu\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd:\ufffd
 endstream
 endobj
-127 0 obj
+126 0 obj
 << /Type /FontDescriptor
-/FontName /AAAADS+NotoSerif
-/FontFile2 126 0 R
+/FontName /AAAADH+NotoSerif
+/FontFile2 125 0 R
 /FontBBox [-212 -250 1246 1047]
 /Flags 6
 /StemV 0
@@ -11330,7 +12080,7 @@ endobj
 /XHeight 1098
 >>
 endobj
-128 0 obj
+127 0 obj
 << /Length 1286
 /Filter [/FlateDecode]
 >>
@@ -11340,43 +12090,53 @@ x
 \ufffd\ufffd\ufffdJ\ufffd\ufffd\ufffdJ\ufffd\ufffd\ud2b9\ufffd\ufffd\ufffdx\ufffd\ufffdx\ufffd\ufffdx\ufffd\ufffd+\ufffd!�w\ufffd\ufffdB\ufffdx\ufffdb\ufffdx\ufffd\ufffd+\u0781\ufffdr\ufffd;\ufffd\ufffd2\ufffd\ufffdk\ufffd\u039c\ufffdJ\ufffdY\ufffde\ufffdY\ufffd\ufffd7+|\ufffd\ufffdx\ufffdoS\ufffd\ufffd7+[\u019be\u021b\u05day\u07a2oV\ufffd\ufffd\u6d56-\u3b4c\ufffd\ufffd\ufffd"\ufffd\ufffd\ufffdR\ufffdW\ufffd*\ufffd\ufffd4Xq\ufffd\ufffdC\ufffd^J\ufffd[(\ufffd\ufffd^\ufffd1\ufffd�\ufffdy]\ufffd\ufffd\ufffdk\ufffd}\ufffdYM-x\ufffd\ufffd\ufffd\ufffdV\ufffdz\ufffd\ufffd\ufffd\ufffd\ufffd[YE\ufffdV\ufffdY\ufffd\ufffd\ufffd_}/7\ufffd*\ufffdY%\ufffd\ufffde\ufffd\u04ebq+\ufffd\ufffd:\ufffd\ufffd.\ufffd7\ufffdJ\ufffd\ufffd\ufffdE\ufffd/\ufffd3Y(Y\ufffd*A\ufffdW	R\ufffd\ufffdVJS\ufffd\ufffd\ufffd\ufffd\ufffd:(u@c\ufffd\ufffdD\ufffd]a*\ufffd\ufffdf)\ufffd9J\ufffd\ufffd\ufffd)\ufffdo,#\ufffd\\ufffdZ>M\ufffdU\ufffd\ufffd\\ufffdjPS\ufffd
{HS\ufffd\ufffdM\ufffd\ufffd\ufffdj\ufffd\ufffd\ufffd\ufffd{fk\ufffd\ufffd\ufffdyG\ufffdm[z*E\ufffdsa\ufffd\ufffd>\ufffd&\ufffd\u04eb\ufffd\ufffd\ufffdj%u\ufffd\ufffd\ufffd;\ufffd2^\ufffd\ufffd\ufffdW\ufffd[\ufffd\ufffd\ufffd�\ufffdv\ufffd[\ufffd\ufffd\ufffd2\ufffd\ucbf2u\ufffd[\ufffd\ufffd\ufffdP\ufffd:\ufffd\ufffd\ufffdV\u0321\ufffd\u0545>\ufffdM\ufffd\ufffdBi2.\u0126\ufffd\ufffd\ufffd\ufffd\u0507!\ufffd\ufffd\ufffdd\ufffdk\ufffd`\ufffd\ufffd\ufffd=o\ufffd\ufffdqW\u0795wdJF(\ufffdL164\ufffdU\ufffd\ufffd)\ufffdx0E\ufffd~\ufffd\ufffdZ?\ufffd=\ufffd\ufffd/\ufffd\ufffd\ufffd\ufffd\u03af\ufffd\ufffd\ufffd~:\ufffdo?$\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdO
 endstream
 endobj
-129 0 obj
+128 0 obj
 [259 1000 408 1000 1000 1000 1000 220 346 346 1000 559 250 310 250 288 559 559 559 559 559 559 559 559 559 559 286 286 1000 559 1000 1000 1000 705 653 613 727 623 589 713 792 367 356 1000 623 937 763 742 604 742 655 543 612 716 674 1046 660 625 1000 359 1000 359 1000 458 577 562 613 492 613 535 369 538 634 319 299 584 310 944 645 577 613 613 471 451 352 634 579 861 578 564 511 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 361 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 259 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 250 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 
 1000 1000 1000 1000 1000 1000 1000 1000 1000]
 endobj
-130 0 obj
+129 0 obj
 << /Length1 9080
 /Length 6051
 /Filter [/FlateDecode]
 >>
 stream
-x\ufffd\ufffdYytS\ufffd\ufffd\ufffd\ufffd\ufffddY\ufffde\ufffd\ufffdbY\ufffd\ufffd]\ufffd\ufffdZ\ufffdeY\ufffd	\ufffd+F0\ufffd�,y7\ufffd!\ufffd\ufffd%@B\ufffd\ufffd\ufffd!\ufffd\ufffd\ufffdt\ufffd\ufffd\ufffd\ufffdNi&\ufffdd\ufffd\ufffd4\ufffd\ufffdf2\ufffd\ufffd$\ufffd\ufffd	i\ufffd\ufffdL\ufffd\u04c2-\ufffd'\ufffd\ufffdi\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd{\ufffd\ufffd\ufffd3\ufffd!.\ufffd"\uf2c5\ufffdP@\ufffdB8{0:;\ufffd\ufffdE>\ufffd~!IQt\ufffd/\ufffd\ufffd_\ufffd\ufffd\ufffdy\ufffd\ufffd{z\ufffdb\u04f7\ufffd\ufffd?\u0540\ufffd\ufffd\ufffdg\ufffd\ufffd"a~+\ufffd\ufffdS\ufffdV\ufffd�\ufffd\ufffdZ<
\ufffd"X\ufffd[\ufffd[l\ufffd\ufffd?\ufffd5}\ufffd\ufffd\ufffd\ufffd45�\ufffd'`}\ufffdh8y=\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\`\u05dfqp\ufffdE\ufffdT\ufffd\ufffd\ufffdh\ufffd\ufffd\ufffd%}\ufffd'\ufffdI(;\ufffd\ufffdJo8\ufffdIC\ufffd<\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd \ufffdH\ufffd+\ufffd\ufffd O\ufffd_ +\ufffd+\ufffd*\ufffd\ufffdhuEH_l0\ufffd2\ufffd\ufffd\ufffd\ufffdF3\ufffd\ufffd\ufffd\ufffd&$\ufffd\ufffd@F\ufffd\ufffdf\ufffdp:\ufffd+\ufffd[\ufffd#\ufffd\u02d2\ufffdm\ub7bb\ufffdhm\ufffd[w[@B\ufffd\ufffd\ufffds\ufffd\ufffd\u06c2?\ufffd\ufffd;\ufffd\ufffd\ufffd\ufffdL\ufffdn\ufffd\ufffdw>\ufffdyU\ufffd\ufffd\ufffd\ufffdfB\ufffd\ufffdB\ufffd\ufffd)\ufffd
-\ufffdHj^\u02d61\ufffdjh^\ufffd\ufffds\ufffdw\ufffd\ufffd\ufffd\ufffd=u<~\ufffd?
n\ufffd>\ufffd\ufffdk\ufffd\ufffd?\ufffd\ufffd\ufffd\ufffd \ufffdvTv\ufffd\ufffd
-x\ufffdJi&\ufffd\ufffd*TJ\ufffdY*5\ufffd\ufffd\ufffd
-S\ufffd\ufffd_\ufffd\ufffd\ufffd\ufffd[\ufffdZ>_[A?\ufffd	X/#Bv\ufffd\ufffdVA8\ufffd<\ufffd~\ufffd\ufffd\ufffd\ufffd{\ufffdb\ufffd'\ufffdy\ufffd`\ufffd\ufffdPb\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd>M\ufffd\ufffdO\ufffd2dvEX[J\ufffdE\ufffdJ\ufffdX\ufffd\ufffdl\ufffd\ufffd\u06d4\ufffd\ufffd\ufffd\ufffd\ufffd_!\ufffd7\ufffd\ufffd6\ufffd%N\A:Z\ufffd\ufffd-\ufffd\ufffd%\ufffd\ufffd\ufffd	K\ufffd6|\ufffd_\ufffd\u035fM\ufffd+\u0156u\ufffd/\ufffd_\ufffd8\ufffdYj=\ufffd\u03ccO\ufffd\ufffdTNm\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdk\ufffdA\ufffd\ufffd]\ufffd?~\ufffd\ufffd\u0599\ufffdO\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd&\ufffd\ufffdkk\ufffdv\ufffdk_2\ufffd\ufffd`_\ufffdnA\ufffd\ufffd\ufffd8
\ufffdG\ufffdZ\ufffd"E\ufffd\ufffdH\ufffd\ufffd/O?=b\u03f7\ufffdU\ufffd\uad65\ufffd5\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdw\ufffd^_)u\ufffd\ufffdZ\ufffd]\ufffdy&\ufffd\ufffd\ufffd\ufffd\m\ud72c\ufffd\ufffd{C`\ufffd\ufffd\ufffdVYu\ufffdzA\ufffd\ufffdjE~`\ufffd\u02fb\ufffd\ufffd\ufffdNC\ufffdX\ufffd\ufffdV\ufffd\ufffd\ufffd\ufffdU=\ufffdu\ufffdE\ufffd\ufffdm\ufffd\ufffd\ufffd8\ufffd\ufffdsk\u05d6g\ufffd4nIAw\ufffd\ufffdP.R\ufffd6\ufffd	S(\ufffd>
+x\ufffd\ufffdY{t\ufffd\ufffd\ufffd\ufffd\ufffd,\u02f6l\ufffdzX\ufffd-\ufffd-\ufffdzZO\u02f2,?$\ufffd~b\ufffdc,l\ufffd\ufffd%\ufffd
q!\ufffd%@B\ufffd\ufffdGCB)!$\ufffdI\ufffd)\ufffd\ufffdl6\ufffd&\ufffdi\ufffd
\ufffdf	\ufffdI6\ufffd\ufffd4iO\u02f69-\ufffdb\ufffdd0\ufffd\ufffd_+\ufffd\ufffd\ufffdw5s\ufffd\ufffd\ufffd;F!\ufffdEV\ufffdB\ufffd}\ufffd\ufffd\ufffdC\ufffd(?@gFg\ufffd~\ufffd\ufffd\u05ef"$)\ufffd\ufffd\ufffd\ufffdw\ufffd\ufffd>\ufffd=\ufffdpO\ufffdPl\ufffd\ufffd_\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdP$\ufffdoe\ufffd|
+\ufffd\ufffdX\ufffd\ufffdqT\ufffd\ufffda]ky\ufffdr\ufffd\ufffdo|\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdfXw\ufffd\ufffd$\ufffd\ufffd
\ufffd"o/\ufffdC\ufffd\ufffdg\ufffd\ufffd\ufffd\ufffdC\ufffd.!\ufffd\ufffd\ufffd\ufffd]p`D\ufffdE(.\ufffd\ufffd[?8y&H\ufffd@\ufffd\ufffd)\ufffdTz\ufffd\ufffdOJ\ufffd\ufffdL\ufffd\u0147Ev\ufffd	E\ufffd\\ufffdMy\ufffd\ufffdY\ufffd\\ufffdT!\ufffdF\ufffd+B\ufffdb\ufffd\u0444\ufffd\ufffd\ufffde\ufffd?}0\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd6!!,2B,4\ufffd\u04d1]\ufffd\ufffdB\ufffd_\ufffd\ufffdX\ufffd\ufffd\ufffd\ufffdjk\ufffd\ufffd\ufffd\ufffd;b\u03dd_\ufffd?\ufffd\ufffd\ufffd\ufffd\ufffdp\u0789\ufffd\ufffd\ufffdg\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdU
\ufffd^I\ufffdr\ufffd	\ufffdSFd\ufffd8+H<#\ufffdax-[\ufffd\ufffdy}\ufffd\ufffdi\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd?\ufffdD\ufffd\ufffd\ufffd~\ufffd\ufffd?s\ufffdK\ufffd\u05ce\ufffd\ufffd\ufffdc7\ufffdA\ufffd\ufffd \ufffd6!\ufffd\ufffd\ufffdL\ufffd\ufffd3U\ufffd\ufffd>\ufffdTj\ufffd)U\ufffd\ufffd\ufffd\ufffd6+K\ubdd8+\ufffd|\ufffd\ufffd\ufffd~>\ufffd^A
+\ufffd\ufffdN\ufffd\ufffd\ufffdp\ufffdy$\ufffd4@\ufffdc;\ufffd\ufffd\ufffd�N\ufffdi\ufffd\ufffdu\ufffdJ_\ufffd\ufffd \ufffd)4w\ufffd\ufffd\ufffd*\ufffd\u02df\ufffde\ufffd\ufffd:\ufffd\ufffd\ufffd\ufffd
+\ufffdJ\ufffd\ufffd\u01a9\ufffdp\ufffd!\ufffd)\ufffd1\ufffd>HIY\ufffd@

<TRUNCATED>

[40/44] isis-site git commit: ISIS-1594: provide an 'edit' button

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/guides/cgcom.pdf
----------------------------------------------------------------------
diff --git a/content/guides/cgcom.pdf b/content/guides/cgcom.pdf
index 4a1fc41..c8e1a27 100644
--- a/content/guides/cgcom.pdf
+++ b/content/guides/cgcom.pdf
@@ -4,16 +4,16 @@
 << /Title (Committers' 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:20170224170956+00'00')
-/ModDate (D:20170224170956+00'00')
+/CreationDate (D:20170307233802+00'00')
+/ModDate (D:20170307233802+00'00')
 >>
 endobj
 2 0 obj
 << /Type /Catalog
 /Pages 3 0 R
 /Names 16 0 R
-/Outlines 620 0 R
-/PageLabels 696 0 R
+/Outlines 619 0 R
+/PageLabels 695 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 76
-/Kids [7 0 R 10 0 R 12 0 R 14 0 R 36 0 R 45 0 R 50 0 R 53 0 R 68 0 R 75 0 R 81 0 R 84 0 R 92 0 R 96 0 R 102 0 R 108 0 R 111 0 R 116 0 R 122 0 R 126 0 R 130 0 R 134 0 R 138 0 R 142 0 R 148 0 R 152 0 R 155 0 R 168 0 R 178 0 R 183 0 R 185 0 R 196 0 R 201 0 R 209 0 R 219 0 R 222 0 R 226 0 R 243 0 R 251 0 R 257 0 R 266 0 R 274 0 R 279 0 R 285 0 R 291 0 R 293 0 R 301 0 R 307 0 R 314 0 R 318 0 R 329 0 R 332 0 R 345 0 R 349 0 R 357 0 R 359 0 R 361 0 R 364 0 R 366 0 R 371 0 R 373 0 R 382 0 R 390 0 R 392 0 R 400 0 R 403 0 R 415 0 R 419 0 R 431 0 R 435 0 R 440 0 R 450 0 R 453 0 R 459 0 R 463 0 R 469 0 R]
+/Kids [7 0 R 10 0 R 12 0 R 14 0 R 36 0 R 45 0 R 49 0 R 52 0 R 67 0 R 74 0 R 80 0 R 83 0 R 91 0 R 95 0 R 101 0 R 107 0 R 110 0 R 115 0 R 121 0 R 125 0 R 129 0 R 133 0 R 137 0 R 141 0 R 147 0 R 151 0 R 154 0 R 167 0 R 177 0 R 182 0 R 184 0 R 195 0 R 200 0 R 208 0 R 218 0 R 221 0 R 225 0 R 242 0 R 250 0 R 256 0 R 265 0 R 273 0 R 278 0 R 284 0 R 290 0 R 292 0 R 300 0 R 306 0 R 313 0 R 317 0 R 328 0 R 331 0 R 344 0 R 348 0 R 356 0 R 358 0 R 360 0 R 363 0 R 365 0 R 370 0 R 372 0 R 381 0 R 389 0 R 391 0 R 399 0 R 402 0 R 414 0 R 418 0 R 430 0 R 434 0 R 439 0 R 449 0 R 452 0 R 458 0 R 462 0 R 468 0 R]
 >>
 endobj
 4 0 obj
@@ -80,11 +80,11 @@ endobj
 << /Type /Font
 /BaseFont /AAAAAA+NotoSerif
 /Subtype /TrueType
-/FontDescriptor 698 0 R
+/FontDescriptor 697 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 700 0 R
-/ToUnicode 699 0 R
+/Widths 699 0 R
+/ToUnicode 698 0 R
 >>
 endobj
 9 0 obj
@@ -1639,7 +1639,7 @@ endobj
 /F1.0 8 0 R
 >>
 >>
-/Annots [470 0 R 471 0 R 472 0 R 473 0 R 474 0 R 475 0 R 476 0 R 477 0 R 478 0 R 479 0 R 480 0 R 481 0 R 482 0 R 483 0 R 484 0 R 485 0 R 486 0 R 487 0 R 488 0 R 489 0 R 490 0 R 491 0 R 492 0 R 493 0 R 494 0 R 495 0 R 496 0 R 497 0 R 498 0 R 499 0 R 500 0 R 501 0 R 502 0 R 503 0 R 504 0 R 505 0 R 506 0 R 507 0 R 508 0 R 509 0 R 510 0 R 511 0 R 512 0 R 513 0 R 514 0 R 515 0 R 516 0 R 517 0 R 518 0 R 519 0 R 520 0 R 521 0 R 522 0 R 523 0 R 524 0 R 525 0 R 526 0 R 527 0 R 528 0 R 529 0 R 530 0 R 531 0 R 532 0 R 533 0 R 534 0 R 535 0 R 536 0 R 537 0 R 538 0 R 539 0 R 540 0 R 541 0 R 542 0 R 543 0 R 544 0 R 545 0 R]
+/Annots [469 0 R 470 0 R 471 0 R 472 0 R 473 0 R 474 0 R 475 0 R 476 0 R 477 0 R 478 0 R 479 0 R 480 0 R 481 0 R 482 0 R 483 0 R 484 0 R 485 0 R 486 0 R 487 0 R 488 0 R 489 0 R 490 0 R 491 0 R 492 0 R 493 0 R 494 0 R 495 0 R 496 0 R 497 0 R 498 0 R 499 0 R 500 0 R 501 0 R 502 0 R 503 0 R 504 0 R 505 0 R 506 0 R 507 0 R 508 0 R 509 0 R 510 0 R 511 0 R 512 0 R 513 0 R 514 0 R 515 0 R 516 0 R 517 0 R 518 0 R 519 0 R 520 0 R 521 0 R 522 0 R 523 0 R 524 0 R 525 0 R 526 0 R 527 0 R 528 0 R 529 0 R 530 0 R 531 0 R 532 0 R 533 0 R 534 0 R 535 0 R 536 0 R 537 0 R 538 0 R 539 0 R 540 0 R 541 0 R 542 0 R 543 0 R 544 0 R]
 >>
 endobj
 11 0 obj
@@ -3096,7 +3096,7 @@ endobj
 /F3.0 38 0 R
 >>
 >>
-/Annots [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]
+/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]
 >>
 endobj
 13 0 obj
@@ -3688,7 +3688,7 @@ endobj
 /Font << /F2.0 18 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 619 0 R
+/XObject << /Stamp1 618 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 33 0 R 34 0 R]
@@ -3703,18 +3703,18 @@ endobj
 >>
 endobj
 17 0 obj
-<< /Kids [98 0 R 99 0 R 157 0 R 289 0 R 187 0 R 368 0 R 228 0 R 384 0 R 305 0 R]
+<< /Kids [97 0 R 98 0 R 156 0 R 288 0 R 186 0 R 367 0 R 227 0 R 383 0 R 304 0 R]
 >>
 endobj
 18 0 obj
 << /Type /Font
 /BaseFont /AAAAAB+NotoSerif-Bold
 /Subtype /TrueType
-/FontDescriptor 702 0 R
+/FontDescriptor 701 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 704 0 R
-/ToUnicode 703 0 R
+/Widths 703 0 R
+/ToUnicode 702 0 R
 >>
 endobj
 19 0 obj
@@ -4499,7 +4499,7 @@ endobj
 /F1.0 8 0 R
 /F3.0 38 0 R
 >>
-/XObject << /Stamp1 619 0 R
+/XObject << /Stamp1 618 0 R
 >>
 >>
 /Annots [40 0 R 42 0 R]
@@ -4512,11 +4512,11 @@ endobj
 << /Type /Font
 /BaseFont /AAAAAC+mplus1mn-regular
 /Subtype /TrueType
-/FontDescriptor 706 0 R
+/FontDescriptor 705 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 708 0 R
-/ToUnicode 707 0 R
+/Widths 707 0 R
+/ToUnicode 706 0 R
 >>
 endobj
 39 0 obj
@@ -4551,7 +4551,7 @@ endobj
 [36 0 R /XYZ 0 163.2700000000005 null]
 endobj
 44 0 obj
-<< /Length 13266
+<< /Length 10096
 >>
 stream
 q
@@ -4728,24 +4728,13 @@ f
 h
 S
 Q
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
-
-BT
-59.24000000000001 616.0850000000002 Td
-/F3.0 11 Tf
-<2420> 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
-70.24000000000001 616.0850000000002 Td
+59.24000000000001 616.0850000000002 Td
 /F3.0 11 Tf
-<7368206769746875622d70722e736820697369732031313632203331> Tj
+<24207368206769746875622d70722e736820697369732031313632203331> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4844,18 +4833,7 @@ ET
 BT
 59.24000000000001 439.20500000000015 Td
 /F3.0 11 Tf
-<44656c6574696e67206272616e636820> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-147.24 439.20500000000015 Td
-/F3.0 11 Tf
-<27495349532d313136325f70722d333127> Tj
+<44656c6574696e67206272616e63682027495349532d313136325f70722d333127> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4866,51 +4844,7 @@ ET
 BT
 59.24000000000001 424.46500000000015 Td
 /F3.0 11 Tf
-<44656c65746564206272616e636820495349532d313136325f70722d333120> 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
-229.74 424.46500000000015 Td
-/F3.0 11 Tf
-<28> 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
-235.24 424.46500000000015 Td
-/F3.0 11 Tf
-<7761732062643265336332> 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
-295.74 424.46500000000015 Td
-/F3.0 11 Tf
-<29> 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
-301.24 424.46500000000015 Td
-/F3.0 11 Tf
-<2e> Tj
+<44656c65746564206272616e636820495349532d313136325f70722d333120287761732062643265336332292e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4932,18 +4866,7 @@ ET
 BT
 59.24000000000001 394.9850000000001 Td
 /F3.0 11 Tf
-<537769746368656420746f2061206e6577206272616e636820> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-196.74 394.9850000000001 Td
-/F3.0 11 Tf
-<27495349532d313136325f70722d333127> Tj
+<537769746368656420746f2061206e6577206272616e63682027495349532d313136325f70722d333127> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4976,29 +4899,7 @@ ET
 BT
 59.24000000000001 350.76500000000016 Td
 /F3.0 11 Tf
-<ca> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
-
-BT
-64.74000000000001 350.76500000000016 Td
-/F4.0 11 Tf
-<2a> 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
-70.24000000000001 350.76500000000016 Td
-/F3.0 11 Tf
-<206272616e63682020202020202020202020206d617374657220202020202d3e2046455443485f48454144> Tj
+<ca2a206272616e63682020202020202020202020206d617374657220202020202d3e2046455443485f48454144> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5020,29 +4921,7 @@ ET
 BT
 59.24000000000001 321.28500000000014 Td
 /F3.0 11 Tf
-<4d65726765206d6164652062792074686520> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-158.24 321.28500000000014 Td
-/F3.0 11 Tf
-<2772656375727369766527> 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
-218.74 321.28500000000014 Td
-/F3.0 11 Tf
-<2073747261746567792e> Tj
+<4d65726765206d616465206279207468652027726563757273697665272073747261746567792e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5075,84 +4954,7 @@ ET
 BT
 59.24000000000001 277.0650000000001 Td
 /F3.0 11 Tf
-<ca322066696c6573206368616e6765642c2031383620696e73657274696f6e73> 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
-235.24 277.0650000000001 Td
-/F3.0 11 Tf
-<28> 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
-240.74 277.0650000000001 Td
-/F3.0 11 Tf
-<2b> 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
-246.24 277.0650000000001 Td
-/F3.0 11 Tf
-<29> 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
-251.74 277.0650000000001 Td
-/F3.0 11 Tf
-<2c2031352064656c6574696f6e73> 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
-328.74 277.0650000000001 Td
-/F3.0 11 Tf
-<28> 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
-334.24 277.0650000000001 Td
-/F3.0 11 Tf
-<2d> 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
-339.74 277.0650000000001 Td
-/F3.0 11 Tf
-<29> Tj
+<ca322066696c6573206368616e6765642c2031383620696e73657274696f6e73282b292c2031352064656c6574696f6e73282d29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5223,51 +5025,7 @@ ET
 BT
 59.24000000000001 141.58500000000006 Td
 /F3.0 11 Tf
-<67697420636865636b6f7574206d617374657220> 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
-169.24 141.58500000000006 Td
-/F3.0 11 Tf
-<2626> 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
-180.24 141.58500000000006 Td
-/F3.0 11 Tf
-<20676974206d65726765202d2d6e6f2d666620495349532d313136325f70722d333120> 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
-372.74 141.58500000000006 Td
-/F3.0 11 Tf
-<2626> 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
-383.74 141.58500000000006 Td
-/F3.0 11 Tf
-<20676974206272616e6368202d6420495349532d> Tj
+<67697420636865636b6f7574206d617374657220262620676974206d65726765202d2d6e6f2d666620495349532d313136325f70722d333120262620676974206272616e6368202d6420495349532d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5327,9 +5085,8 @@ endobj
 /Font << /F1.0 8 0 R
 /F3.0 38 0 R
 /F2.0 18 0 R
-/F4.0 47 0 R
 >>
-/XObject << /Stamp1 619 0 R
+/XObject << /Stamp1 618 0 R
 >>
 >>
 >>
@@ -5338,17 +5095,6 @@ endobj
 [45 0 R /XYZ 0 706.7700000000001 null]
 endobj
 47 0 obj
-<< /Type /Font
-/BaseFont /AAAAAD+mplus1mn-bold
-/Subtype /TrueType
-/FontDescriptor 710 0 R
-/FirstChar 32
-/LastChar 255
-/Widths 712 0 R
-/ToUnicode 711 0 R
->>
-endobj
-48 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 241
@@ -5415,7 +5161,7 @@ l
 \ufffdp\ufffd\u035b7\ufffd\ufffd\ufffdx\ufffd\ufffdB\ufffd\ufffd\u0726C|\ufffd\ufffd\ufffd\ufffdU\ufffd\ufffd\ufffd\ufffd\ufffd!\ufffdx\ufffd\ufffd\ufffd\ufffd\ufffd.\ufffd"&\ufffdP\ufffd\ufffd\ufffdF]\ufffd&L\ufffd+\ufffdE\u04cf\ufffd9\ufffd?\ufffd\ufffdI\ufffd\u07ad\u06b4\ufffd1hD\ufffd13\ufffd\ufffd\ufffd\u046d\ufffd\ufffdpz\ufffd3kkk\ufffd,\ufffd-\u0791\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd(\ufffdK\ufffdqS\u079beM\ufffd\ufffd\ufffd\ufffdB\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdx'\ufffdo@S\ufffd\ufffd\ufffd2S
 endstream
 endobj
-49 0 obj
+48 0 obj
 << /Length 1609
 >>
 stream
@@ -5503,22 +5249,22 @@ Q
 
 endstream
 endobj
-50 0 obj
+49 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 49 0 R
+/Contents 48 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/XObject << /I1 48 0 R
-/Stamp1 619 0 R
+/XObject << /I1 47 0 R
+/Stamp1 618 0 R
 >>
 /Font << /F1.0 8 0 R
 >>
 >>
-/Annots [51 0 R]
+/Annots [50 0 R]
 >>
 endobj
-51 0 obj
+50 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -5529,7 +5275,7 @@ endobj
 /Type /Annot
 >>
 endobj
-52 0 obj
+51 0 obj
 << /Length 13512
 >>
 stream
@@ -6330,26 +6076,26 @@ Q
 
 endstream
 endobj
-53 0 obj
+52 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 52 0 R
+/Contents 51 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 18 0 R
 /F1.0 8 0 R
 /F3.0 38 0 R
 >>
-/XObject << /Stamp1 619 0 R
+/XObject << /Stamp1 618 0 R
 >>
 >>
-/Annots [55 0 R 56 0 R 57 0 R 58 0 R 59 0 R 60 0 R 61 0 R 62 0 R 64 0 R 65 0 R]
+/Annots [54 0 R 55 0 R 56 0 R 57 0 R 58 0 R 59 0 R 60 0 R 61 0 R 63 0 R 64 0 R]
 >>
 endobj
-54 0 obj
-[53 0 R /XYZ 0 841.89 null]
+53 0 obj
+[52 0 R /XYZ 0 841.89 null]
 endobj
-55 0 obj
+54 0 obj
 << /Border [0 0 0]
 /Dest (_cgcom_verifying-releases)
 /Subtype /Link
@@ -6357,7 +6103,7 @@ endobj
 /Type /Annot
 >>
 endobj
-56 0 obj
+55 0 obj
 << /Border [0 0 0]
 /Dest (_cgcom_post-release-successful)
 /Subtype /Link
@@ -6365,7 +6111,7 @@ endobj
 /Type /Annot
 >>
 endobj
-57 0 obj
+56 0 obj
 << /Border [0 0 0]
 /Dest (_cgcom_post-release-unsuccessful)
 /Subtype /Link
@@ -6373,7 +6119,7 @@ endobj
 /Type /Annot
 >>
 endobj
-58 0 obj
+57 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -6384,7 +6130,7 @@ endobj
 /Type /Annot
 >>
 endobj
-59 0 obj
+58 0 obj
 << /Border [0 0 0]
 /Dest (_cgcom_verifying-releases)
 /Subtype /Link
@@ -6392,7 +6138,7 @@ endobj
 /Type /Annot
 >>
 endobj
-60 0 obj
+59 0 obj
 << /Border [0 0 0]
 /Dest (_cgcom_verifying-releases)
 /Subtype /Link
@@ -6400,7 +6146,7 @@ endobj
 /Type /Annot
 >>
 endobj
-61 0 obj
+60 0 obj
 << /Border [0 0 0]
 /Dest (_cgcom_post-release)
 /Subtype /Link
@@ -6408,7 +6154,7 @@ endobj
 /Type /Annot
 >>
 endobj
-62 0 obj
+61 0 obj
 << /Border [0 0 0]
 /Dest (_cgcom_release-process-prereqs)
 /Subtype /Link
@@ -6416,10 +6162,10 @@ endobj
 /Type /Annot
 >>
 endobj
-63 0 obj
-[53 0 R /XYZ 0 386.6900000000002 null]
+62 0 obj
+[52 0 R /XYZ 0 386.6900000000002 null]
 endobj
-64 0 obj
+63 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -6430,7 +6176,7 @@ endobj
 /Type /Annot
 >>
 endobj
-65 0 obj
+64 0 obj
 << /Border [0 0 0]
 /Dest (_cgcom_versioning-policy)
 /Subtype /Link
@@ -6438,11 +6184,11 @@ endobj
 /Type /Annot
 >>
 endobj
-66 0 obj
-[53 0 R /XYZ 0 200.1500000000002 null]
+65 0 obj
+[52 0 R /XYZ 0 200.1500000000002 null]
 endobj
-67 0 obj
-<< /Length 19679
+66 0 obj
+<< /Length 16108
 >>
 stream
 q
@@ -6476,14 +6222,14 @@ h
 S
 Q
 /DeviceRGB cs
-0.000 0.200 0.533 scn
+0.200 0.200 0.200 scn
 /DeviceRGB CS
-0.000 0.200 0.533 SCN
+0.200 0.200 0.200 SCN
 
 BT
 59.24 783.0649999999999 Td
 /F3.0 11 Tf
-<636420> Tj
+<636420636f7265> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6492,53 +6238,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-75.74000000000001 783.0649999999999 Td
-/F3.0 11 Tf
-<636f7265> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.200 0.533 scn
-0.000 0.200 0.533 SCN
-
-BT
 59.24 768.3249999999999 Td
 /F3.0 11 Tf
-<6578706f727420> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-97.74000000000001 768.3249999999999 Td
-/F3.0 11 Tf
-<49534953544d50> 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
-136.24 768.3249999999999 Td
-/F3.0 11 Tf
-<3d> 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
-141.74 768.3249999999999 Td
-/F3.0 11 Tf
-<2f632f746d7020202020202020202020202020202020202020202020202020202020202020> Tj
+<6578706f72742049534953544d503d2f632f746d7020202020202020202020202020202020202020202020202020202020202020> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6554,35 +6256,13 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.200 0.533 scn
-0.000 0.200 0.533 SCN
-
-BT
-59.24 753.585 Td
-/F3.0 11 Tf
-<6578706f727420> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-97.74000000000001 753.585 Td
-/F3.0 11 Tf
-<49534953444556> 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
-136.24 753.585 Td
+59.24 753.585 Td
 /F3.0 11 Tf
-<3d> Tj
+<6578706f727420495349534445563d312e31362e302d534e415053484f54> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6591,31 +6271,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-141.74 753.585 Td
-/F3.0 11 Tf
-<312e31362e302d534e415053484f54> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.200 0.533 scn
-0.000 0.200 0.533 SCN
-
-BT
 59.24 738.845 Td
 /F3.0 11 Tf
-<6578706f727420> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-97.74000000000001 738.845 Td
-/F3.0 11 Tf
-<4953495352454c> Tj
+<6578706f7274204953495352454c3d312e31352e30> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6624,53 +6282,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-136.24 738.845 Td
-/F3.0 11 Tf
-<3d> 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
-141.74 738.845 Td
-/F3.0 11 Tf
-<312e31352e30> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.200 0.533 scn
-0.000 0.200 0.533 SCN
-
-BT
 59.24 724.105 Td
 /F3.0 11 Tf
-<6578706f727420> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-97.74000000000001 724.105 Td
-/F3.0 11 Tf
-<495349535243> 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
-130.74 724.105 Td
-/F3.0 11 Tf
-<3d> Tj
+<6578706f7274204953495352433d524331> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6679,64 +6293,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-136.24 724.105 Td
-/F3.0 11 Tf
-<524331> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.200 0.533 scn
-0.000 0.200 0.533 SCN
-
-BT
 59.24 709.365 Td
 /F3.0 11 Tf
-<6578706f727420> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-97.74000000000001 709.365 Td
-/F3.0 11 Tf
-<495349534252414e4348> 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
-152.74 709.365 Td
-/F3.0 11 Tf
-<3d> 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
-158.24 709.365 Td
-/F3.0 11 Tf
-<72656c656173652d> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-202.24 709.365 Td
-/F3.0 11 Tf
-<244953495352454c> Tj
+<6578706f727420495349534252414e43483d72656c656173652d244953495352454c2d24495349535243> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6745,64 +6304,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-246.24 709.365 Td
-/F3.0 11 Tf
-<2d> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-251.74 709.365 Td
-/F3.0 11 Tf
-<24495349535243> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.200 0.533 scn
-0.000 0.200 0.533 SCN
-
-BT
 59.24 694.625 Td
 /F3.0 11 Tf
-<6578706f727420> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-97.74000000000001 694.625 Td
-/F3.0 11 Tf
-<495349534a495241> 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
-141.74 694.625 Td
-/F3.0 11 Tf
-<3d> 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
-147.24 694.625 Td
-/F3.0 11 Tf
-<495349532d39393939202020202020202020202020202020202020202020202020202020> Tj
+<6578706f727420495349534a4952413d495349532d39393939202020202020202020202020202020202020202020202020202020> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6818,46 +6322,13 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.200 0.533 scn
-0.000 0.200 0.533 SCN
-
-BT
-59.24 679.885 Td
-/F3.0 11 Tf
-<6578706f727420> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-97.74000000000001 679.885 Td
-/F3.0 11 Tf
-<434154414c494e415f484f4d45> 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
-169.24 679.885 Td
-/F3.0 11 Tf
-<3d> 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
-174.74 679.885 Td
+59.24 679.885 Td
 /F3.0 11 Tf
-<2f632f6a6176612f6170616368652d746f6d6361742d382e302e3330202020> Tj
+<6578706f727420434154414c494e415f484f4d453d2f632f6a6176612f6170616368652d746f6d6361742d382e302e3330202020> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7138,7 +6609,7 @@ Q
 
 BT
 76.73933333333332 433.8900000000002 Td
-/F5.1 24 Tf
+/F4.1 24 Tf
 <21> Tj
 ET
 
@@ -7433,18 +6904,7 @@ ET
 BT
 59.239999999999995 237.18500000000012 Td
 /F3.0 11 Tf
-<67697420636865636b6f7574202d6220> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-147.24 237.18500000000012 Td
-/F3.0 11 Tf
-<24495349534252414e4348> Tj
+<67697420636865636b6f7574202d622024495349534252414e4348> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7648,36 +7108,36 @@ Q
 
 endstream
 endobj
-68 0 obj
+67 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 67 0 R
+/Contents 66 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F3.0 38 0 R
-/F3.1 69 0 R
+/F3.1 68 0 R
 /F1.0 8 0 R
-/F5.1 72 0 R
+/F4.1 71 0 R
 /F2.0 18 0 R
 >>
-/XObject << /Stamp1 619 0 R
+/XObject << /Stamp1 618 0 R
 >>
 >>
-/Annots [70 0 R 71 0 R]
+/Annots [69 0 R 70 0 R]
 >>
 endobj
-69 0 obj
+68 0 obj
 << /Type /Font
-/BaseFont /AAAAAE+mplus1mn-regular
+/BaseFont /AAAAAD+mplus1mn-regular
 /Subtype /TrueType
-/FontDescriptor 714 0 R
+/FontDescriptor 709 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 716 0 R
-/ToUnicode 715 0 R
+/Widths 711 0 R
+/ToUnicode 710 0 R
 >>
 endobj
-70 0 obj
+69 0 obj
 << /Border [0 0 0]
 /Dest (_cgcom_post-release-successful_update-jira_create-new-jira)
 /Subtype /Link
@@ -7685,7 +7145,7 @@ endobj
 /Type /Annot
 >>
 endobj
-71 0 obj
+70 0 obj
 << /Border [0 0 0]
 /Dest (_cgcom_post-release-unsuccessful)
 /Subtype /Link
@@ -7693,22 +7153,22 @@ endobj
 /Type /Annot
 >>
 endobj
-72 0 obj
+71 0 obj
 << /Type /Font
-/BaseFont /AAAAAF+FontAwesome
+/BaseFont /AAAAAE+FontAwesome
 /Subtype /TrueType
-/FontDescriptor 718 0 R
+/FontDescriptor 713 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 720 0 R
-/ToUnicode 719 0 R
+/Widths 715 0 R
+/ToUnicode 714 0 R
 >>
 endobj
-73 0 obj
-[68 0 R /XYZ 0 373.13000000000017 null]
+72 0 obj
+[67 0 R /XYZ 0 373.13000000000017 null]
 endobj
-74 0 obj
-<< /Length 21515
+73 0 obj
+<< /Length 14808
 >>
 stream
 q
@@ -7742,13 +7202,13 @@ h
 S
 Q
 /DeviceRGB cs
-0.733 0.000 0.400 scn
+0.184 0.435 0.624 scn
 /DeviceRGB CS
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 SCN
 
 BT
 59.24 783.0649999999999 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c67726f757049643e> Tj
 ET
 
@@ -7765,23 +7225,23 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 218.74 783.0649999999999 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f67726f757049643e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 59.24 768.3249999999999 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c617274696661637449643e> Tj
 ET
 
@@ -7798,23 +7258,23 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 147.24 768.3249999999999 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f617274696661637449643e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 59.24 753.585 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c76657273696f6e3e> Tj
 ET
 
@@ -7831,12 +7291,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 191.24 753.585 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f76657273696f6e3e> Tj
 ET
 
@@ -7886,40 +7346,7 @@ Q
 BT
 59.24 677.0649999999999 Td
 /F3.0 11 Tf
-<6772657020534e415053484f5420> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-136.24 677.0649999999999 Td
-/F3.0 11 Tf
-<60> 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
-141.74 677.0649999999999 Td
-/F3.0 11 Tf
-<2f62696e2f66696e64202e202d6e616d6520706f6d2e786d6c207c2067726570202d7620746172676574207c2067726570202d76206d6f746862616c6c207c20736f7274> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-515.74 677.0649999999999 Td
-/F3.0 11 Tf
-<60> Tj
+<6772657020534e415053484f5420602f62696e2f66696e64202e202d6e616d6520706f6d2e786d6c207c2067726570202d7620746172676574207c2067726570202d76206d6f746862616c6c207c20736f727460> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7973,7 +7400,7 @@ Q
 
 BT
 80.17133333333334 595.01 Td
-/F5.1 24 Tf
+/F4.1 24 Tf
 <22> Tj
 ET
 
@@ -8126,24 +7553,13 @@ f
 h
 S
 Q
-0.000 0.200 0.533 scn
-0.000 0.200 0.533 SCN
-
-BT
-59.24000000000001 481.12500000000017 Td
-/F3.0 11 Tf
-<636420> 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
-75.74000000000001 481.12500000000017 Td
+59.24000000000001 481.12500000000017 Td
 /F3.0 11 Tf
-<636f7265> Tj
+<636420636f7265> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -8197,35 +7613,13 @@ f
 h
 S
 Q
-0.000 0.200 0.533 scn
-0.000 0.200 0.533 SCN
-
-BT
-59.24000000000001 371.3250000000001 Td
-/F3.0 11 Tf
-<6578706f727420> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-97.74000000000001 371.3250000000001 Td
-/F3.0 11 Tf
-<49534953415254> 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
-136.24 371.3250000000001 Td
+59.24000000000001 371.3250000000001 Td
 /F3.0 11 Tf
-<3d> Tj
+<6578706f727420495349534152543d69736973> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -8234,53 +7628,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-141.74 371.3250000000001 Td
-/F3.0 11 Tf
-<69736973> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.200 0.533 scn
-0.000 0.200 0.533 SCN
-
-BT
 59.24000000000001 356.5850000000001 Td
 /F3.0 11 Tf
-<6578706f727420> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-97.74000000000001 356.5850000000001 Td
-/F3.0 11 Tf
-<49534953434f52> 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
-136.24 356.5850000000001 Td
-/F3.0 11 Tf
-<3d> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-141.74 356.5850000000001 Td
-/F3.0 11 Tf
-<225922> Tj
+<6578706f72742049534953434f523d225922> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -8482,29 +7832,7 @@ Q
 BT
 59.24000000000001 157.96500000000003 Td
 /F3.0 11 Tf
-<6d766e206f72672e6170616368652e7261743a6170616368652d7261742d706c7567696e3a636865636b202d44207261742e6e756d556e617070726f7665644c6963656e736573> 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
-449.74 157.96500000000003 Td
-/F3.0 11 Tf
-<3d> 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
-455.24 157.96500000000003 Td
-/F3.0 11 Tf
-<3530202d6f20> Tj
+<6d766e206f72672e6170616368652e7261743a6170616368652d7261742d706c7567696e3a636865636b202d44207261742e6e756d556e617070726f7665644c6963656e7365733d3530202d6f202626205c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -8513,64 +7841,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-488.24 157.96500000000003 Td
-/F3.0 11 Tf
-<2626> 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
-499.24 157.96500000000003 Td
-/F3.0 11 Tf
-<20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
-
-BT
-504.74 157.96500000000003 Td
-/F3.0 11 Tf
-<5c> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
-
-BT
 59.24000000000001 143.22500000000002 Td
-/F4.0 11 Tf
-<666f7220> 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
-81.24000000000001 143.22500000000002 Td
 /F3.0 11 Tf
-<6120> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
-
-BT
-92.24000000000001 143.22500000000002 Td
-/F4.0 11 Tf
-<696e> Tj
+<666f72206120696e20602f62696e2f66696e64202e202d6e616d65207261742e747874202d7072696e74603b20646f20677265702027213f3f3f272024613b20646f6e65207c7c205c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -8579,339 +7852,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-103.24000000000001 143.22500000000002 Td
-/F3.0 11 Tf
-<20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-108.74000000000001 143.22500000000002 Td
-/F3.0 11 Tf
-<60> 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
-114.24000000000001 143.22500000000002 Td
-/F3.0 11 Tf
-<2f62696e2f66696e64202e202d6e616d65207261742e747874202d7072696e74> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-290.24 143.22500000000002 Td
-/F3.0 11 Tf
-<60> 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
-295.74 143.22500000000002 Td
-/F3.0 11 Tf
-<3b20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
-
-BT
-306.74 143.22500000000002 Td
-/F4.0 11 Tf
-<646f20> 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
-323.24 143.22500000000002 Td
-/F3.0 11 Tf
-<6772657020> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-350.74 143.22500000000002 Td
-/F3.0 11 Tf
-<27213f3f3f27> 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
-383.74 143.22500000000002 Td
-/F3.0 11 Tf
-<20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-389.24 143.22500000000002 Td
-/F3.0 11 Tf
-<2461> 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
-400.24 143.22500000000002 Td
-/F3.0 11 Tf
-<3b20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
-
-BT
-411.24 143.22500000000002 Td
-/F4.0 11 Tf
-<646f6e65> 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
-433.24 143.22500000000002 Td
-/F3.0 11 Tf
-<20> 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
-438.74 143.22500000000002 Td
-/F3.0 11 Tf
-<7c7c> 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
-449.74 143.22500000000002 Td
-/F3.0 11 Tf
-<20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
-
-BT
-455.24 143.22500000000002 Td
-/F3.0 11 Tf
-<5c> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
-
-BT
 59.24000000000001 128.485 Td
-/F4.0 11 Tf
-<666f7220> 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
-81.24000000000001 128.485 Td
-/F3.0 11 Tf
-<6120> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
-
-BT
-92.24000000000001 128.485 Td
-/F4.0 11 Tf
-<696e> 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
-103.24000000000001 128.485 Td
-/F3.0 11 Tf
-<20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-108.74000000000001 128.485 Td
-/F3.0 11 Tf
-<60> 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
-114.24000000000001 128.485 Td
-/F3.0 11 Tf
-<2f62696e2f66696e64202e202d6e616d65207261742e747874202d7072696e74> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-290.24 128.485 Td
-/F3.0 11 Tf
-<60> 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
-295.74 128.485 Td
-/F3.0 11 Tf
-<3b20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
-
-BT
-306.74 128.485 Td
-/F4.0 11 Tf
-<646f20> 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
-323.24 128.485 Td
-/F3.0 11 Tf
-<6772657020> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-350.74 128.485 Td
 /F3.0 11 Tf
-<2721414c27> 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
-378.24 128.485 Td
-/F3.0 11 Tf
-<20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-383.74 128.485 Td
-/F3.0 11 Tf
-<2461> 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
-394.74 128.485 Td
-/F3.0 11 Tf
-<3b20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
-
-BT
-405.74 128.485 Td
-/F4.0 11 Tf
-<646f6e65> Tj
+<666f72206120696e20602f62696e2f66696e64202e202d6e616d65207261742e747874202d7072696e74603b20646f2067726570202721414c272024613b20646f6e65> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9045,34 +7988,33 @@ Q
 
 endstream
 endobj
-75 0 obj
+74 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 74 0 R
+/Contents 73 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F4.0 47 0 R
-/F3.0 38 0 R
+/Font << /F3.0 38 0 R
 /F1.0 8 0 R
-/F5.1 72 0 R
+/F4.1 71 0 R
 /F2.0 18 0 R
 >>
-/XObject << /Stamp1 619 0 R
+/XObject << /Stamp1 618 0 R
 >>
 >>
-/Annots [79 0 R]
+/Annots [78 0 R]
 >>
 endobj
+75 0 obj
+[74 0 R /XYZ 0 571.8100000000001 null]
+endobj
 76 0 obj
-[75 0 R /XYZ 0 571.8100000000001 null]
+[74 0 R /XYZ 0 455.21000000000015 null]
 endobj
 77 0 obj
-[75 0 R /XYZ 0 455.21000000000015 null]
+[74 0 R /XYZ 0 301.19000000000005 null]
 endobj
 78 0 obj
-[75 0 R /XYZ 0 301.19000000000005 null]
-endobj
-79 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -9083,8 +8025,8 @@ endobj
 /Type /Annot
 >>
 endobj
-80 0 obj
-<< /Length 21251
+79 0 obj
+<< /Length 18066
 >>
 stream
 q
@@ -9637,40 +8579,7 @@ Q
 BT
 59.24000000000001 473.7150000000001 Td
 /F3.0 11 Tf
-<6d766e206f72672e6170616368652e7261743a6170616368652d7261742d706c7567696e3a636865636b202d44207261742e6e756d556e617070726f7665644c6963656e736573> 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
-449.74 473.7150000000001 Td
-/F3.0 11 Tf
-<3d> 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
-455.24 473.7150000000001 Td
-/F3.0 11 Tf
-<30202d6f20> 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
-482.74 473.7150000000001 Td
-/F3.0 11 Tf
-<2626> Tj
+<6d766e206f72672e6170616368652e7261743a6170616368652d7261742d706c7567696e3a636865636b202d44207261742e6e756d556e617070726f7665644c6963656e7365733d30202d6f202626205c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9679,185 +8588,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-493.74 473.7150000000001 Td
-/F3.0 11 Tf
-<20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
-
-BT
-499.24 473.7150000000001 Td
-/F3.0 11 Tf
-<5c> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
-
-BT
 59.24000000000001 458.9750000000001 Td
-/F4.0 11 Tf
-<666f7220> 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
-81.24000000000001 458.9750000000001 Td
-/F3.0 11 Tf
-<6120> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
-
-BT
-92.24000000000001 458.9750000000001 Td
-/F4.0 11 Tf
-<696e> 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
-103.24000000000001 458.9750000000001 Td
-/F3.0 11 Tf
-<20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-108.74000000000001 458.9750000000001 Td
-/F3.0 11 Tf
-<60> 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
-114.24000000000001 458.9750000000001 Td
-/F3.0 11 Tf
-<66696e64202e202d6e616d65207261742e747874202d7072696e74> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-262.74 458.9750000000001 Td
-/F3.0 11 Tf
-<60> 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
-268.24 458.9750000000001 Td
-/F3.0 11 Tf
-<3b20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
-
-BT
-279.24 458.9750000000001 Td
-/F4.0 11 Tf
-<646f20> 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
-295.74 458.9750000000001 Td
-/F3.0 11 Tf
-<6772657020> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-323.24 458.9750000000001 Td
 /F3.0 11 Tf
-<27213f3f3f27> 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
-356.24 458.9750000000001 Td
-/F3.0 11 Tf
-<20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-361.74 458.9750000000001 Td
-/F3.0 11 Tf
-<2461> 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
-372.74 458.9750000000001 Td
-/F3.0 11 Tf
-<3b20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
-
-BT
-383.74 458.9750000000001 Td
-/F4.0 11 Tf
-<646f6e65> Tj
+<666f72206120696e206066696e64202e202d6e616d65207261742e747874202d7072696e74603b20646f20677265702027213f3f3f272024613b20646f6e65> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -10119,40 +8852,7 @@ Q
 BT
 59.24000000000001 198.93499999999995 Td
 /F3.0 11 Tf
-<6d766e206c6963656e73653a646f776e6c6f61642d6c6963656e73657320> 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
-224.24 198.93499999999995 Td
-/F3.0 11 Tf
-<2626> 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
-235.24 198.93499999999995 Td
-/F3.0 11 Tf
-<20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
-
-BT
-240.74 198.93499999999995 Td
-/F3.0 11 Tf
-<5c> Tj
+<6d766e206c6963656e73653a646f776e6c6f61642d6c6963656e736573202626205c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -10356,27 +9056,26 @@ Q
 
 endstream
 endobj
-81 0 obj
+80 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 80 0 R
+/Contents 79 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F3.0 38 0 R
-/F4.0 47 0 R
 /F2.0 18 0 R
 >>
-/XObject << /Stamp1 619 0 R
+/XObject << /Stamp1 618 0 R
 >>
 >>
 >>
 endobj
-82 0 obj
-[81 0 R /XYZ 0 433.06000000000006 null]
+81 0 obj
+[80 0 R /XYZ 0 433.06000000000006 null]
 endobj
-83 0 obj
-<< /Length 15677
+82 0 obj
+<< /Length 11839
 >>
 stream
 q
@@ -10428,18 +9127,7 @@ ET
 BT
 59.24 753.585 Td
 /F3.0 11 Tf
-<5b> 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
-64.74000000000001 753.585 Td
-/F3.0 11 Tf
-<6f72672e736c66346a2c20736c66346a2d6170692c20312e352e375d> Tj
+<5b6f72672e736c66346a2c20736c66346a2d6170692c20312e352e375d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -10450,18 +9138,7 @@ ET
 BT
 59.24 738.845 Td
 /F3.0 11 Tf
-<5b> 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
-64.74000000000001 738.845 Td
-/F3.0 11 Tf
-<6f72672e636f6465686175732e67726f6f76792c2067726f6f76792d616c6c2c20312e372e325d> Tj
+<5b6f72672e636f6465686175732e67726f6f76792c2067726f6f76792d616c6c2c20312e372e325d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -10472,51 +9149,7 @@ ET
 BT
 59.24 709.365 Td
 /F3.0 11 Tf
-<6c6963656e73657320746f2072656d6f76652066726f6d20737570706c656d656e74616c2d6d6f64656c732e786d6c20> 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
-323.24 709.365 Td
-/F3.0 11 Tf
-<28> 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
-328.74 709.365 Td
-/F3.0 11 Tf
-<6172652073707572696f7573> 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
-394.74 709.365 Td
-/F3.0 11 Tf
-<29> 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
-400.24 709.365 Td
-/F3.0 11 Tf
-<3a> Tj
+<6c6963656e73657320746f2072656d6f76652066726f6d20737570706c656d656e74616c2d6d6f64656c732e786d6c20286172652073707572696f7573293a> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -10527,18 +9160,7 @@ ET
 BT
 59.24 679.885 Td
 /F3.0 11 Tf
-<5b> 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
-64.74000000000001 679.885 Td
-/F3.0 11 Tf
-<6f72672e736c66346a2c20736c66346a2d6170692c20312e352e325d> Tj
+<5b6f72672e736c66346a2c20736c66346a2d6170692c20312e352e325d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -10631,40 +9253,7 @@ Q
 BT
 59.24 542.3050000000003 Td
 /F3.0 11 Tf
-<67697420636f6d6d6974202d616d20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-141.74 542.3050000000003 Td
-/F3.0 11 Tf
-<22> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-147.24 542.3050000000003 Td
-/F3.0 11 Tf
-<24495349534a495241> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-196.74 542.3050000000003 Td
-/F3.0 11 Tf
-<3a207570646174657320746f20706f6d2e786d6c2065746320666f722072656c6561736522> Tj
+<67697420636f6d6d6974202d616d202224495349534a4952413a207570646174657320746f20706f6d2e786d6c2065746320666f722072656c6561736522> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -10888,62 +9477,7 @@ Q
 BT
 59.24 248.62500000000014 Td
 /F3.0 11 Tf
-<6d766e2072656c656173653a70726570617265202d50206170616368652d72656c65617365202d4420> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-284.74 248.62500000000014 Td
-/F3.0 11 Tf
-<64727952756e> 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
-317.74 248.62500000000014 Td
-/F3.0 11 Tf
-<3d> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.200 0.533 scn
-0.000 0.200 0.533 SCN
-
-BT
-323.24 248.62500000000014 Td
-/F3.0 11 Tf
-<74727565> 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
-345.24 248.62500000000014 Td
-/F3.0 11 Tf
-<20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
-
-BT
-350.74 248.62500000000014 Td
-/F3.0 11 Tf
-<5c> Tj
+<6d766e2072656c656173653a70726570617265202d50206170616368652d72656c65617365202d442064727952756e3d74727565205c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -10954,51 +9488,7 @@ ET
 BT
 59.24 233.88500000000016 Td
 /F3.0 11 Tf
-<ca2020202d4472656c6561736556657273696f6e> 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
-169.24 233.88500000000016 Td
-/F3.0 11 Tf
-<3d> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-174.74 233.88500000000016 Td
-/F3.0 11 Tf
-<244953495352454c> 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
-218.74 233.88500000000016 Td
-/F3.0 11 Tf
-<20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
-
-BT
-224.24 233.88500000000016 Td
-/F3.0 11 Tf
-<5c> Tj
+<ca2020202d4472656c6561736556657273696f6e3d244953495352454c205c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -11009,73 +9499,7 @@ ET
 BT
 59.24 219.14500000000015 Td
 /F3.0 11 Tf
-<ca2020202d44746167> 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
-108.74000000000001 219.14500000000015 Td
-/F3.0 11 Tf
-<3d> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-114.24000000000001 219.14500000000015 Td
-/F3.0 11 Tf
-<2449534953415254> 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
-158.24 219.14500000000015 Td
-/F3.0 11 Tf
-<2d> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-163.74 219.14500000000015 Td
-/F3.0 11 Tf
-<244953495352454c> 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.74 219.14500000000015 Td
-/F3.0 11 Tf
-<20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
-
-BT
-213.24 219.14500000000015 Td
-/F3.0 11 Tf
-<5c> Tj
+<ca2020202d447461673d24495349534152542d244953495352454c205c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -11086,29 +9510,7 @@ ET
 BT
 59.24 204.40500000000014 Td
 /F3.0 11 Tf
-<ca2020202d44646576656c6f706d656e7456657273696f6e> 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
-191.24 204.40500000000014 Td
-/F3.0 11 Tf
-<3d> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-196.74 204.40500000000014 Td
-/F3.0 11 Tf
-<2449534953444556> Tj
+<ca2020202d44646576656c6f706d656e7456657273696f6e3d2449534953444556> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -11140,7 +9542,7 @@ Q
 
 BT
 76.73933333333333 114.46000000000014 Td
-/F5.1 24 Tf
+/F4.1 24 Tf
 <23> Tj
 ET
 
@@ -11183,7 +9585,7 @@ ET
 
 BT
 403.75533333333334 134.74600000000015 Td
-/F6.0 10.5 Tf
+/F5.0 10.5 Tf
 <c9> Tj
 ET
 
@@ -11331,45 +9733,45 @@ Q
 
 endstream
 endobj
-84 0 obj
+83 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 83 0 R
+/Contents 82 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F3.0 38 0 R
 /F1.0 8 0 R
 /F2.0 18 0 R
-/F5.1 72 0 R
-/F6.0 88 0 R
+/F4.1 71 0 R
+/F5.0 87 0 R
 >>
-/XObject << /Stamp1 619 0 R
+/XObject << /Stamp1 618 0 R
 >>
 >>
-/Annots [89 0 R 90 0 R]
+/Annots [88 0 R 89 0 R]
 >>
 endobj
+84 0 obj
+[83 0 R /XYZ 0 626.19 null]
+endobj
 85 0 obj
-[84 0 R /XYZ 0 626.19 null]
+[83 0 R /XYZ 0 516.3900000000002 null]
 endobj
 86 0 obj
-[84 0 R /XYZ 0 516.3900000000002 null]
+[83 0 R /XYZ 0 376.07000000000016 null]
 endobj
 87 0 obj
-[84 0 R /XYZ 0 376.07000000000016 null]
-endobj
-88 0 obj
 << /Type /Font
-/BaseFont /AAAAAG+mplus-1p-regular
+/BaseFont /AAAAAF+mplus-1p-regular
 /Subtype /TrueType
-/FontDescriptor 722 0 R
+/FontDescriptor 717 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 724 0 R
-/ToUnicode 723 0 R
+/Widths 719 0 R
+/ToUnicode 718 0 R
 >>
 endobj
-89 0 obj
+88 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -11380,7 +9782,7 @@ endobj
 /Type /Annot
 >>
 endobj
-90 0 obj
+89 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -11391,8 +9793,8 @@ endobj
 /Type /Annot
 >>
 endobj
-91 0 obj
-<< /Length 15549
+90 0 obj
+<< /Length 12829
 >>
 stream
 q
@@ -11648,95 +10050,7 @@ Q
 BT
 59.24 679.465 Td
 /F3.0 11 Tf
-<6d766e2072656c656173653a70726570617265202d50206170616368652d72656c65617365202d4420> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-284.74 679.465 Td
-/F3.0 11 Tf
-<726573756d65> 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
-317.74 679.465 Td
-/F3.0 11 Tf
-<3d> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.200 0.533 scn
-0.000 0.200 0.533 SCN
-
-BT
-323.24 679.465 Td
-/F3.0 11 Tf
-<66616c7365> 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
-350.74 679.465 Td
-/F3.0 11 Tf
-<202d44736b69705465737473> 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
-416.74 679.465 Td
-/F3.0 11 Tf
-<3d> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.200 0.533 scn
-0.000 0.200 0.533 SCN
-
-BT
-422.24 679.465 Td
-/F3.0 11 Tf
-<74727565> 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
-444.24 679.465 Td
-/F3.0 11 Tf
-<20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
-
-BT
-449.74 679.465 Td
-/F3.0 11 Tf
-<5c> Tj
+<6d766e2072656c656173653a70726570617265202d50206170616368652d72656c65617365202d4420726573756d653d66616c7365202d44736b697054657374733d74727565205c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -11747,51 +10061,7 @@ ET
 BT
 59.24 664.725 Td
 /F3.0 11 Tf
-<ca202020202020202d4472656c6561736556657273696f6e> 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
-191.24 664.725 Td
-/F3.0 11 Tf
-<3d> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-196.74 664.725 Td
-/F3.0 11 Tf
-<244953495352454c> 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
-240.74 664.725 Td
-/F3.0 11 Tf
-<20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
-
-BT
-246.24 664.725 Td
-/F3.0 11 Tf
-<5c> Tj
+<ca202020202020202d4472656c6561736556657273696f6e3d244953495352454c205c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -11802,73 +10072,7 @@ ET
 BT
 59.24 649.9850000000001 Td
 /F3.0 11 Tf
-<ca202020202020202d44746167> 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
-130.74 649.9850000000001 Td
-/F3.0 11 Tf
-<3d> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-136.24 649.9850000000001 Td
-/F3.0 11 Tf
-<2449534953415254> 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
-180.24 649.9850000000001 Td
-/F3.0 11 Tf
-<2d> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-185.74 649.9850000000001 Td
-/F3.0 11 Tf
-<244953495352454c> 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
-229.74 649.9850000000001 Td
-/F3.0 11 Tf
-<20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
-
-BT
-235.24 649.9850000000001 Td
-/F3.0 11 Tf
-<5c> Tj
+<ca202020202020202d447461673d24495349534152542d244953495352454c205c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -11879,29 +10083,7 @@ ET
 BT
 59.24 635.2450000000001 Td
 /F3.0 11 Tf
-<ca202020202020202d44646576656c6f706d656e7456657273696f6e> 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.24 635.2450000000001 Td
-/F3.0 11 Tf
-<3d> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-218.74 635.2450000000001 Td
-/F3.0 11 Tf
-<2449534953444556> Tj
+<ca202020202020202d44646576656c6f706d656e7456657273696f6e3d2449534953444556> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -11922,7 +10104,7 @@ Q
 
 BT
 80.17133333333334 580.97 Td
-/F5.1 24 Tf
+/F4.1 24 Tf
 <22> Tj
 ET
 
@@ -12344,30 +10526,30 @@ Q
 
 endstream
 endobj
-92 0 obj
+91 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 91 0 R
+/Contents 90 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 18 0 R
 /F1.0 8 0 R
 /F3.0 38 0 R
-/F5.1 72 0 R
+/F4.1 71 0 R
 >>
-/XObject << /Stamp1 619 0 R
+/XObject << /Stamp1 618 0 R
 >>
 >>
 >>
 endobj
+92 0 obj
+[91 0 R /XYZ 0 841.89 null]
+endobj
 93 0 obj
-[92 0 R /XYZ 0 841.89 null]
+[91 0 R /XYZ 0 557.7700000000001 null]
 endobj
 94 0 obj
-[92 0 R /XYZ 0 557.7700000000001 null]
-endobj
-95 0 obj
-<< /Length 34564
+<< /Length 13008
 >>
 stream
 q
@@ -12555,18 +10737,7 @@ Q
 BT
 59.24 592.345 Td
 /F3.0 11 Tf
-<6d766e2072656c656173653a706572666f726d202d50206170616368652d72656c6561736520> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
-
-BT
-268.24 592.345 Td
-/F3.0 11 Tf
-<5c> Tj
+<6d766e2072656c656173653a706572666f726d202d50206170616368652d72656c65617365205c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -12577,84 +10748,7 @@ ET
 BT
 59.24 577.605 Td
 /F3.0 11 Tf
-<ca2020202d44776f726b696e674469726563746f7279> 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
-180.24 577.605 Td
-/F3.0 11 Tf
-<3d> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-185.74 577.605 Td
-/F3.0 11 Tf
-<2449534953544d50> 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
-229.74 577.605 Td
-/F3.0 11 Tf
-<2f> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-235.24 577.605 Td
-/F3.0 11 Tf
-<2449534953415254> 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
-279.24 577.605 Td
-/F3.0 11 Tf
-<2d> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-284.74 577.605 Td
-/F3.0 11 Tf
-<244953495352454c> 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
-328.74 577.605 Td
-/F3.0 11 Tf
-<2f636865636b6f7574> Tj
+<ca2020202d44776f726b696e674469726563746f72793d2449534953544d502f24495349534152542d244953495352454c2f636865636b6f7574> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -12774,7 +10868,7 @@ ET
 BT
 59.24 454.785 Td
 /F3.0 11 Tf
-<5b> Tj
+<5b494e464f5d202d2d2d206d6176656e2d72656c656173652d706c7567696e3a322e332e323a706572666f726d202864656661756c742d636c692920402069736973202d2d2d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -12783,9 +10877,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-64.74000000000001 454.785 Td
+59.24 440.045 Td
 /F3.0 11 Tf
-<494e464f5d202d2d2d206d6176656e2d72656c656173652d706c7567696e3a322e332e323a706572666f726d20> Tj
+<5b494e464f5d20506572666f726d696e672061204c4f43414c20636865636b6f75742066726f6d2073636d3a6769743a66696c653a2f2f2f433a5c4150414348455c697369732d6769742d72775c636f> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -12794,9 +10888,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-312.23999999999995 454.785 Td
+59.24 425.305 Td
 /F3.0 11 Tf
-<28> Tj
+<7265> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -12805,9 +10899,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-317.74 454.785 Td
+59.24 410.565 Td
 /F3.0 11 Tf
-<64656661756c742d636c69> Tj
+<5b494e464f5d20436865636b696e67206f7574207468652070726f6a65637420746f20706572666f726d207468652072656c65617365202e2e2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -12816,9 +10910,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-378.24 454.785 Td
+59.24 395.82500000000005 Td
 /F3.0 11 Tf
-<29> Tj
+<5b494e464f5d20457865637574696e673a20636d642e657865202f58202f43202267697420636c6f6e65202d2d6272616e63682072656c656173652d312e31352e30> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -12827,9 +10921,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-383.74 454.785 Td
+59.24 381.08500000000004 Td
 /F3.0 11 Tf
-<20402069736973202d2d2d> Tj
+<66696c653a2f2f2f433a5c4150414348455c697369732d6769742d72775c636f726520433a5c4150414348455c697369732d6769742d72775c636f72655c7461726765745c636865636b6f757422> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -12838,9 +10932,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24 440.045 Td
+59.24 366.345 Td
 /F3.0 11 Tf
-<5b> Tj
+<5b494e464f5d20576f726b696e67206469726563746f72793a20433a5c4150414348455c697369732d6769742d72775c636f72655c746172676574> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -12849,20 +10943,20 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-64.74000000000001 440.045 Td
+59.24 351.605 Td
 /F3.0 11 Tf
-<494e464f5d20506572666f726d696e672061204c4f43414c20636865636b6f75742066726f6d2073636d3a6769743a66696c653a2f2f2f433a> Tj
+<5b494e464f5d20506572666f726d696e672061204c4f43414c20636865636b6f75742066726f6d2073636d3a6769743a66696c653a2f2f2f433a5c4150414348455c697369732d6769742d7277> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-378.24 440.045 Td
+59.24 336.865 Td
 /F3.0 11 Tf
-<5c41> Tj
+<5b494e464f5d20436865636b696e67206f7574207468652070726f6a65637420746f20706572666f726d207468652072656c65617365202e2e2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -12871,20 +10965,20 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-389.24 440.045 Td
+59.24 322.125 Td
 /F3.0 11 Tf
-<5041434845> Tj
+<5b494e464f5d20457865637574696e673a20636d642e657865202f58202f43202267697420636c6f6e65202d2d6272616e63682072656c656173652d312e31352e30> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-416.74 440.045 Td
+59.24 307.385 Td
 /F3.0 11 Tf
-<5c69> Tj
+<66696c653a2f2f2f433a5c4150414348455c697369732d6769742d727720433a5c4150414348455c697369732d6769742d72775c636f72655c7461726765745c636865636b6f757422> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -12893,20 +10987,20 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-427.74 440.045 Td
+59.24 292.645 Td
 /F3.0 11 Tf
-<7369732d6769742d7277> Tj
+<5b494e464f5d20576f726b696e67206469726563746f72793a20433a5c4150414348455c697369732d6769742d72775c636f72655c746172676574> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-482.74 440.045 Td
+59.24 277.905 Td
 /F3.0 11 Tf
-<5c63> Tj
+<5b494e464f5d20457865637574696e673a20636d642e657865202f58202f432022676974206c732d72656d6f74652066696c653a2f2f2f433a5c4150414348455c697369732d6769742d727722> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -12915,9 +11009,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-493.74 440.045 Td
+59.24 263.16499999999996 Td
 /F3.0 11 Tf
-<6f> Tj
+<5b494e464f5d20576f726b696e67206469726563746f72793a20433a5c55736572735c41444d494e497e315c417070446174615c4c6f63616c5c54656d70> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -12926,9 +11020,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24 425.305 Td
+59.24 248.42499999999998 Td
 /F3.0 11 Tf
-<7265> Tj
+<5b494e464f5d20457865637574696e673a20636d642e657865202f58202f4320226769742066657463682066696c653a2f2f2f433a5c4150414348455c697369732d6769742d727722> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -12937,9 +11031,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24 410.565 Td
+59.24 233.68499999999997 Td
 /F3.0 11 Tf
-<5b> Tj
+<5b494e464f5d20576f726b696e67206469726563746f72793a20433a5c4150414348455c697369732d6769742d72775c636f72655c7461726765745c636865636b6f7574> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -12948,9 +11042,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-64.74000000000001 410.565 Td
+59.24 218.945 Td
 /F3.0 11 Tf
-<494e464f5d20436865636b696e67206f7574207468652070726f6a65637420746f20706572666f726d207468652072656c65617365202e2e2e> Tj
+<5b494e464f5d20457865637574696e673a20636d642e657865202f58202f43202267697420636865636b6f75742072656c656173652d312e31352e3022> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -12959,9 +11053,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24 395.82500000000005 Td
+59.24 204.20499999999998 Td
 /F3.0 11 Tf
-<5b> Tj
+<5b494e464f5d20576f726b696e67206469726563746f72793a20433a5c4150414348455c697369732d6769742d72775c636f72655c7461726765745c636865636b6f7574> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -12970,339 +11064,491 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-64.74000000000001 395.82500000000005 Td
+59.24 189.46499999999997 Td
 /F3.0 11 Tf
-<494e464f5d20457865637574696e673a20636d642e657865202f58202f4320> Tj
+<5b494e464f5d20457865637574696e673a20636d642e657865202f58202f432022676974206c732d66696c657322> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-235.24 395.82500000000005 Td
+59.24 174.72499999999997 Td
 /F3.0 11 Tf
-<2267697420636c6f6e65202d2d6272616e63682072656c656173652d312e31352e302066696c653a2f2f2f433a> Tj
+<5b494e464f5d20576f726b696e67206469726563746f72793a20433a5c4150414348455c697369732d6769742d72775c636f72655c7461726765745c636865636b6f7574> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-482.74 395.82500000000005 Td
+59.24 159.98499999999996 Td
 /F3.0 11 Tf
-<5c41> Tj
+<5b494e464f5d20496e766f6b696e6720706572666f726d20676f616c7320696e206469726563746f727920433a5c4150414348455c697369732d6769742d> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-493.74 395.82500000000005 Td
+59.24 145.24499999999995 Td
 /F3.0 11 Tf
-<5041434845> Tj
+<72775c636f72655c7461726765745c636865636b6f75745c636f7265> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-59.24 381.08500000000004 Td
+59.24 130.50499999999994 Td
 /F3.0 11 Tf
-<5c69> Tj
+<5b494e464f5d20457865637574696e6720676f616c7320276465706c6f79272e2e2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-70.24000000000001 381.08500000000004 Td
+59.24 115.76499999999993 Td
 /F3.0 11 Tf
-<7369732d6769742d7277> Tj
+<2e2e2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+2.281 Tw
 
 BT
-125.24000000000001 381.08500000000004 Td
-/F3.0 11 Tf
-<5c63> Tj
+48.24 77.88599999999991 Td
+/F1.0 10.5 Tf
+[<59> 69.82421875 <6f75206d61> 20.01953125 <792028616761696e292062652070726f6d7074656420666f72206770672070617373706872> 20.01953125 <6173652e2020416c6c206265696e672077656c6c207468697320636f6d6d616e642077696c6c20636f6d706c657465>] TJ
 ET
 
+
+0.000 Tw
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-136.24 381.08500000000004 Td
-/F3.0 11 Tf
-<6f726520433a> Tj
+48.24 62.10599999999991 Td
+/F1.0 10.5 Tf
+[<7375636365737366756c6c79> 89.84375 <2e20476976656e20746861742069742069732075706c6f6164696e6720636f6465206172746966616374732c20697420636f756c642074616b> 20.01953125 <652061207768696c6520746f20636f6d706c6574652e>] TJ
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-169.24 381.08500000000004 Td
-/F3.0 11 Tf
-<5c41> Tj
+535.978 14.388 Td
+/F1.0 9 Tf
+<3131> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+Q
+Q
+
+endstream
+endobj
+95 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 595.28 841.89]
+/Contents 94 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 18 0 R
+/F1.0 8 0 R
+/F3.0 38 0 R
+>>
+/XObject << /Stamp1 618 0 R
+>>
+>>
+/Annots [99 0 R]
+>>
+endobj
+96 0 obj
+[95 0 R /XYZ 0 841.89 null]
+endobj
+97 0 obj
+<< /Limits [(_cgcom) (_cgcom_cutting-a-release_releasing-core_release-perform-upload)]
+/Names [(_cgcom) 15 0 R (_cgcom_cutting-a-release) 53 0 R (_cgcom_cutting-a-release_check-close-staging-repo) 117 0 R (_cgcom_cutting-a-release_obtain-consensus) 62 0 R (_cgcom_cutting-a-release_pull-down-code-to-release) 72 0 R (_cgcom_cutting-a-release_push-branches) 144 0 R (_cgcom_cutting-a-release_releasing-core) 75 0 R (_cgcom_cutting-a-release_releasing-core_commit-changes) 84 0 R (_cgcom_cutting-a-release_releasing-core_license-headers) 77 0 R (_cgcom_cutting-a-release_releasing-core_missing-license-check) 81 0 R (_cgcom_cutting-a-release_releasing-core_post-prepare-sanity-check) 93 0 R (_cgcom_cutting-a-release_releasing-core_release-perform-upload) 96 0 R]
+>>
+endobj
+98 0 obj
+<< /Limits [(_cgcom_cutting-a-release_releasing-core_release-prepare-dry-run) (_cgcom_cutting-a-release_releasing-the-archetype_release-prepare)]
+/Names [(_cgcom_cutting-a-release_releasing-core_release-prepare-dry-run) 86 0 R (_cgcom_cutting-a-release_releasing-core_release-prepare-proper) 92 0 R (_cgcom_cutting-a-release_releasing-core_sanity-check) 85 0 R (_cgcom_cutting-a-release_releasing-core_set-environment-variables) 76 0 R (_cgcom_cutting-a-release_releasing-the-archetype) 102 0 R (_cgcom_cutting-a-release_releasing-the-archetype_check-the-example-app) 104 0 R (_cgcom_cutting-a-release_releasing-the-archetype_create-the-archetype) 111 0 R (_cgcom_cutting-a-release_releasing-the-archetype_post-prepare-sanity-check) 113 0 R (_cgcom_cutting-a-release_releasing-the-archetype_release-perform-upload) 116 0 R (_cgcom_cutting-a-release_releasing-the-archetype_release-prepare) 112 0 R]
+>>
+endobj
+99 0 obj
+<< /Border [0 0 0]
+/A << /Type /Action
+/S /URI
+/URI (https://repository.apache.org)
+>>
+/Subtype /Link
+/Rect [372.3522994791667 703.04 480.7559401041667 717.32]
+/Type /Annot
+>>
+endobj
+100 0 obj
+<< /Length 14966
+>>
+stream
+q
+/DeviceRGB cs
+0.200 0.200 0.200 scn
+/DeviceRGB CS
+0.200 0.200 0.200 SCN
 
 BT
-180.24 381.08500000000004 Td
-/F3.0 11 Tf
-<5041434845> Tj
+48.24 786.6659999999999 Td
+/F2.0 18 Tf
+<332e352e2052656c656173696e672074686520417263686574797065> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+5.845 Tw
 
 BT
-207.74 381.08500000000004 Td
-/F3.0 11 Tf
-<5c69> Tj
+48.24 758.646 Td
+/F1.0 10.5 Tf
+<4170616368652049736973206172636865747970657320617265207265766572736520656e67696e65657265642066726f6d206578616d706c65206170706c69636174696f6e732e204f6e63652072657665727365> Tj
 ET
 
+
+0.000 Tw
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+2.315 Tw
 
 BT
-218.74 381.08500000000004 Td
-/F3.0 11 Tf
-<7369732d6769742d7277> Tj
+48.24 742.866 Td
+/F1.0 10.5 Tf
+[<656e67696e65657265642c2074686520736f7572636520697320636865636b> 20.01953125 <656420696e746f2067697420287265706c6163696e6720616e> 20.01953125 <79206561726c6965722076657273696f6e206f6620746865206172636865747970652920616e64>] TJ
 ET
 
+
+0.000 Tw
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-273.74 381.08500000000004 Td
-/F3.0 11 Tf
-<5c63> Tj
+48.24 727.086 Td
+/F1.0 10.5 Tf
+<72656c65617365642e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+q
+0.5 w
+0.933 0.933 0.933 SCN
+113.807 596.590 m
+113.807 711.270 l
+S
+Q
+0.098 0.251 0.486 scn
+0.098 0.251 0.486 SCN
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.098 0.251 0.486 scn
+0.098 0.251 0.486 SCN
 
 BT
-284.74 381.08500000000004 Td
-/F3.0 11 Tf
-<6f7265> Tj
+76.73933333333333 645.35 Td
+/F4.1 24 Tf
+<23> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+3.088 Tw
 
 BT
-301.24 381.08500000000004 Td
-/F3.0 11 Tf
-<5c74> Tj
+125.80666666666667 695.3059999999999 Td
+/F1.0 10.5 Tf
+<49662072656c656173696e67207573696e672057696e646f777320616e64204d6176656e203e3d20332e332e332c207468656e20746865726520697320616e2069737375652074686174> Tj
 ET
 
+
+0.000 Tw
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-312.24 381.08500000000004 Td
-/F3.0 11 Tf
-<6172676574> Tj
+125.80666666666667 679.526 Td
+/F1.0 10.5 Tf
+<7265717569726573206120736d616c6c20776f726b61726f756e642e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+3.076 Tw
 
 BT
-339.74 381.08500000000004 Td
-/F3.0 11 Tf
-<5c63> Tj
+125.80666666666667 651.746 Td
+/F1.0 10.5 Tf
+<496e204d6176656e20332e332e332074686520> Tj
 ET
 
+
+0.000 Tw
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+3.076 Tw
 
 BT
-350.74 381.08500000000004 Td
-/F3.0 11 Tf
-<6865636b6f757422> Tj
+232.6531515151515 651.746 Td
+/F3.0 10.5 Tf
+<6d766e2e626174> 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.076 Tw
+
 BT
-59.24 366.345 Td
-/F3.0 11 Tf
-<5b> Tj
+269.40315151515154 651.746 Td
+/F1.0 10.5 Tf
+<2066696c65207761732072656d6f7665642c207265706c6163656420696e7374656164207769746820> 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
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+3.076 Tw
 
 BT
-64.74000000000001 366.345 Td
-/F3.0 11 Tf
-<494e464f5d20576f726b696e67206469726563746f72793a20433a> Tj
+495.66499999999996 651.746 Td
+/F3.0 10.5 Tf
+<6d766e2e636d64> Tj
 ET
 
+
+0.000 Tw
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+3.076 Tw
 
 BT
-213.24 366.345 Td
-/F3.0 11 Tf
-<5c41> Tj
+532.415 651.746 Td
+/F1.0 10.5 Tf
+<2e> 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
 
+7.810 Tw
+
 BT
-224.24 366.345 Td
-/F3.0 11 Tf
-<5041434845> Tj
+125.80666666666667 635.966 Td
+/F1.0 10.5 Tf
+<486f77657665722c20> Tj
 ET
 
+
+0.000 Tw
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+7.810 Tw
 
 BT
-251.74 366.345 Td
-/F3.0 11 Tf
-<5c69> Tj
+184.63607142857143 635.966 Td
+/F3.0 10.5 Tf
+<6d6176656e2d6172636865747970652d706c7567696e3a322e34> 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
 
+7.810 Tw
+
 BT
-262.74 366.345 Td
-/F3.0 11 Tf
-<7369732d6769742d7277> Tj
+321.1360714285714 635.966 Td
+/F1.0 10.5 Tf
+<206f6e6c79207573657320> Tj
 ET
 
+
+0.000 Tw
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+7.810 Tw
 
 BT
-317.74 366.345 Td
-/F3.0 11 Tf
-<5c63> Tj
+396.4777857142857 635.966 Td
+/F3.0 10.5 Tf
+<6d766e2e626174> 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
 
+7.810 Tw
+
 BT
-328.74 366.345 Td
-/F3.0 11 Tf
-<6f7265> Tj
+433.2277857142857 635.966 Td
+/F1.0 10.5 Tf
+<3b20746869732063617573657320746865> Tj
 ET
 
+
+0.000 Tw
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+0.040 Tw
 
 BT
-345.24 366.345 Td
-/F3.0 11 Tf
-<5c74> Tj
+125.80666666666667 620.186 Td
+/F3.0 10.5 Tf
+<6172636865747970653a6372656174652d66726f6d2d70726f6a656374> 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
 
+0.040 Tw
+
 BT
-356.24 366.345 Td
-/F3.0 11 Tf
-<6172676574> Tj
+278.0566666666667 620.186 Td
+/F1.0 10.5 Tf
+[<20676f616c20746f206661696c2e205468652066697820697320746f2073696d706c653a206a75737420636f70> 20.01953125 <7920>] TJ
+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
+
+0.040 Tw
+
+BT
+485.77608013237847 620.186 Td
+/F3.0 10.5 Tf
+<6d766e2e636d64> 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
 
+0.040 Tw
+
 BT
-59.24 351.605 Td
-/F3.0 11 Tf
-<5b> Tj
+522.5260801323784 620.186 Td
+/F1.0 10.5 Tf
+<20746f> 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
-64.74000000000001 351.605 Td
-/F3.0 11 Tf
-<494e464f5d20506572666f726d696e672061204c4f43414c20636865636b6f75742066726f6d2073636d3a6769743a66696c653a2f2f2f433a> Tj
+125.80666666666667 604.4060000000001 Td
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
 
 BT
-378.24 351.605 Td
-/F3.0 11 Tf
-<5c41> Tj
+125.80666666666667 604.4060000000001 Td
+/F3.0 10.5 Tf
+<6d766e2e626174> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -13311,31 +11557,31 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-389.24 351.605 Td
-/F3.0 11 Tf
-<5041434845> Tj
+162.55666666666667 604.4060000000001 Td
+/F1.0 10.5 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-416.74 351.605 Td
-/F3.0 11 Tf
-<5c69> Tj
+48.24000000000001 572.626 Td
+/F1.0 10.5 Tf
+[<53> 9.765625 <776974636820746f20746865206469726563746f727920636f6e7461696e696e672074686520>] 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
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
 
 BT
-427.74 351.605 Td
-/F3.0 11 Tf
-<7369732d6769742d7277> Tj
+239.38446093750002 572.626 Td
+/F3.0 10.5 Tf
+<73696d706c65617070> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -13344,20 +11590,47 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24 336.865 Td
-/F3.0 11 Tf
-<5b> Tj
+286.6344609375 572.626 Td
+/F1.0 10.5 Tf
+<206578616d706c653a> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
+q
+0.961 0.961 0.961 scn
+52.240 556.810 m
+543.040 556.810 l
+545.249 556.810 547.040 555.019 547.040 552.810 c
+547.040 524.070 l
+547.040 521.861 545.249 520.070 543.040 520.070 c
+52.240 520.070 l
+50.031 520.070 48.240 521.861 48.240 524.070 c
+48.240 552.810 l
+48.240 555.019 50.031 556.810 52.240 556.810 c
+h
+f
+0.800 0.800 0.800 SCN
+0.75 w
+52.240 556.810 m
+543.040 556.810 l
+545.249 556.810 547.040 555.019 547.040 552.810 c
+547.040 524.070 l
+547.040 521.861 545.249 520.070 543.040 520.070 c
+52.240 520.070 l
+50.031 520.070 48.240 521.861 48.240 524.070 c
+48.240 552.810 l
+48.240 555.019 50.031 556.810 52.240 556.810 c
+h
+S
+Q
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-64.74000000000001 336.865 Td
+59.24000000000001 533.9850000000001 Td
 /F3.0 11 Tf
-<494e464f5d20436865636b696e67206f7574207468652070726f6a65637420746f20706572666f726d207468652072656c65617365202e2e2e> Tj
+<6364202e2e2f6578616d706c652f6170706c69636174696f6e2f73696d706c65617070> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -13366,9 +11639,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24 322.125 Td
-/F3.0 11 Tf
-<5b> Tj
+48.24000000000001 489.386 Td
+/F2.0 13 Tf
+<332e352e312e20536574757020656e7669726f6e6d656e74207661726961626c6573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -13377,174 +11650,198 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-64.74000000000001 322.125 Td
-/F3.0 11 Tf
-<494e464f5d20457865637574696e673a20636d642e657865202f58202f4320> Tj
+48.24000000000001 462.826 Td
+/F1.0 10.5 Tf
+<536574206164646974696f6e616c20656e7669726f6e6d656e74207661726961626c657320666f722074686520> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
 
 BT
-235.24 322.125 Td
-/F3.0 11 Tf
-<2267697420636c6f6e65202d2d6272616e63682072656c656173652d312e31352e302066696c653a2f2f2f433a> Tj
+273.39150000000006 462.826 Td
+/F3.0 10.5 Tf
+<73696d706c656170702d617263686574797065> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-482.74 322.125 Td
-/F3.0 11 Tf
-<5c41> Tj
+373.14150000000006 462.826 Td
+/F1.0 10.5 Tf
+<2061727469666163743a> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+q
+0.961 0.961 0.961 scn
+52.240 447.010 m
+543.040 447.010 l
+545.249 447.010 547.040 445.219 547.040 443.010 c
+547.040 325.830 l
+547.040 323.621 545.249 321.830 543.040 321.830 c
+52.240 321.830 l
+50.031 321.830 48.240 323.621 48.240 325.830 c
+48.240 443.010 l
+48.240 445.219 50.031 447.010 52.240 447.010 c
+h
+f
+0.800 0.800 0.800 SCN
+0.75 w
+52.240 447.010 m
+543.040 447.010 l
+545.249 447.010 547.040 445.219 547.040 443.010 c
+547.040 325.830 l
+547.040 323.621 545.249 321.830 543.040 321.830 c
+52.240 321.830 l
+50.031 321.830 48.240 323.621 48.240 325.830 c
+48.240 443.010 l
+48.240 445.219 50.031 447.010 52.240 447.010 c
+h
+S
+Q
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-493.74 322.125 Td
+59.24000000000001 424.185 Td
 /F3.0 11 Tf
-<5041434845> Tj
+<6578706f727420495349534152543d73696d706c656170702d617263686574797065> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-59.24 307.385 Td
+59.24000000000001 409.445 Td
 /F3.0 11 Tf
-<5c69> Tj
+<6578706f727420495349535041523d244953495352454c2020202020202020202020202020202020> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
 
 BT
-70.24000000000001 307.385 Td
-/F3.0 11 Tf
-<7369732d6769742d727720433a> Tj
+279.24 409.445 Td
+/F3.1 11 Tf
+<21> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-141.74 307.385 Td
+59.24000000000001 379.965 Td
 /F3.0 11 Tf
-<5c41> Tj
+<6578706f727420495349534350543d24286563686f202449534953415254207c20637574202d642d202d663229> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-152.74 307.385 Td
+59.24000000000001 365.22499999999997 Td
 /F3.0 11 Tf
-<5041434845> Tj
+<6578706f7274204953495343504e3d24286563686f202449534953415254207c20637574202d642d202d663129> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-180.24 307.385 Td
+59.24000000000001 335.745 Td
 /F3.0 11 Tf
-<5c69> Tj
+<656e76207c20677265702049534953207c20736f7274> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
 
 BT
-191.24 307.385 Td
-/F3.0 11 Tf
-<7369732d6769742d7277> Tj
+51.27450000000001 304.105 Td
+/F3.1 10.5 Tf
+<21> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
-
-BT
-246.24 307.385 Td
-/F3.0 11 Tf
-<5c63> Tj
-ET
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
 
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.096 Tw
 
 BT
-257.24 307.385 Td
-/F3.0 11 Tf
-<6f7265> Tj
+64.80900000000001 303.866 Td
+/F3.0 10.5 Tf
+<2449534953504152> Tj
 ET
 
+
+0.000 Tw
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+0.096 Tw
 
 BT
-273.74 307.385 Td
-/F3.0 11 Tf
-<5c74> Tj
+106.80900000000001 303.866 Td
+/F1.0 10.5 Tf
+<206973207468652076657273696f6e206f662074686520417061636865204973697320636f726520746861742077696c6c206163742061732074686520617263686574797065d57320706172656e742e20557375616c6c792074686973> Tj
 ET
 
+
+0.000 Tw
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-284.74 307.385 Td
-/F3.0 11 Tf
-<6172676574> Tj
+64.80900000000001 288.086 Td
+/F1.0 10.5 Tf
+<6973207468652073616d6520617320> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
 
 BT
-312.24 307.385 Td
-/F3.0 11 Tf
-<5c63> Tj
+136.54500000000002 288.086 Td
+/F3.0 10.5 Tf
+<244953495352454c> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-323.24 307.385 Td
-/F3.0 11 Tf
-<6865636b6f757422> Tj
+178.54500000000002 288.086 Td
+/F1.0 10.5 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -13553,9 +11850,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24 292.645 Td
-/F3.0 11 Tf
-<5b> Tj
+48.24000000000001 253.58599999999996 Td
+/F2.0 13 Tf
+<332e352e322e20436865636b20746865206578616d706c6520617070> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -13564,20 +11861,20 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-64.74000000000001 292.645 Td
-/F3.0 11 Tf
-<494e464f5d20576f726b696e67206469726563746f72793a20433a> Tj
+48.24000000000001 227.02599999999995 Td
+/F1.0 10.5 Tf
+<5570646174652074686520706172656e7420> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
 
 BT
-213.24 292.645 Td
-/F3.0 11 Tf
-<5c41> Tj
+141.3435 227.02599999999995 Td
+/F3.0 10.5 Tf
+<706f6d2e786d6c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -13586,20 +11883,20 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-224.24 292.645 Td
-/F3.0 11 Tf
-<5041434845> Tj
+178.0935 227.02599999999995 Td
+/F1.0 10.5 Tf
+<20746f207265666572656e63652074686520> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-251.74 292.645 Td
-/F3.0 11 Tf
-<5c69> Tj
+262.8705 227.02599999999995 Td
+/F6.0 10.5 Tf
+<72656c6561736564> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -13608,20 +11905,47 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-262.74 292.645 Td
-/F3.0 11 Tf
-<7369732d6769742d7277> Tj
+303.51599999999996 227.02599999999995 Td
+/F1.0 10.5 Tf
+<2076657273696f6e206f6620417061636865204973697320636f72652c2065673a> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
+q
+0.961 0.961 0.961 scn
+52.240 211.210 m
+543.040 211.210 l
+545.249 211.210 547.040 209.419 547.040 207.210 c
+547.040 134.250 l
+547.040 132.041 545.249 130.250 543.040 130.250 c
+52.240 130.250 l
+50.031 130.250 48.240 132.041 48.240 134.250 c
+48.240 207.210 l
+48.240 209.419 50.031 211.210 52.240 211.210 c
+h
+f
+0.800 0.800 0.800 SCN
+0.75 w
+52.240 211.210 m
+543.040 211.210 l
+545.249 211.210 547.040 209.419 547.040 207.210 c
+547.040 134.250 l
+547.040 132.041 545.249 130.250 543.040 130.250 c
+52.240 130.250 l
+50.031 130.250 48.240 132.041 48.240 134.250 c
+48.240 207.210 l
+48.240 209.419 50.031 211.210 52.240 211.210 c
+h
+S
+Q
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
-317.74 292.645 Td
+59.24000000000001 188.38499999999993 Td
 /F3.0 11 Tf
-<5c63> Tj
+<3c70726f706572746965733e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -13630,20 +11954,20 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-328.74 292.645 Td
+59.24000000000001 173.64499999999992 Td
 /F3.0 11 Tf
-<6f7265> Tj
+<ca202020> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
-345.24 292.645 Td
+81.24000000000001 173.64499999999992 Td
 /F3.0 11 Tf
-<5c74> Tj
+<3c697369732e76657273696f6e3e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -13652,20 +11976,20 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-356.24 292.645 Td
+158.24 173.64499999999992 Td
 /F3.0 11 Tf
-<6172676574> Tj
+<312e31352e30> 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
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
-59.24 277.905 Td
+191.24 173.64499999999992 Td
 /F3.0 11 Tf
-<5b> Tj
+<3c2f697369732e76657273696f6e3e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -13674,394 +11998,600 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-64.74000000000001 277.905 Td
+59.24000000000001 158.90499999999994 Td
 /F3.0 11 Tf
-<494e464f5d20457865637574696e673a20636d642e657865202f58202f4320> Tj
+<ca202020> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-235.24 277.905 Td
+81.24000000000001 158.90499999999994 Td
 /F3.0 11 Tf
-<22676974206c732d72656d6f74652066696c653a2f2f2f433a> Tj
+<2e2e2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
-372.74 277.905 Td
+59.24000000000001 144.16499999999994 Td
 /F3.0 11 Tf
-<5c41> Tj
+<3c2f70726f706572746965733e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-383.74 277.905 Td
-/F3.0 11 Tf
-<5041434845> Tj
-ET
-
+q
+0.5 w
+0.933 0.933 0.933 SCN
+113.807 62.910 m
+113.807 118.250 l
+S
+Q
+0.098 0.251 0.486 scn
+0.098 0.251 0.486 SCN
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
+0.098 0.251 0.486 scn
+0.098 0.251 0.486 SCN
 
 BT
-411.24 277.905 Td
-/F3.0 11 Tf
-<5c69> Tj
+76.73933333333335 81.99999999999993 Td
+/F4.1 24 Tf
+<23> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+0.957 Tw
 
 BT
-422.24 277.905 Td
-/F3.0 11 Tf
-<7369732d6769742d727722> Tj
+125.80666666666667 102.28599999999994 Td
+/F1.0 10.5 Tf
+[<50726576696f75736c79206174207468697320706f696e74207765207573656420746f20636865636b20666f7220616e642066697820616e> 20.01953125 <79206d697373696e67206c6963656e736520686561646572>] 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.283 Tw
+
 BT
-59.24 263.16499999999996 Td
-/F3.0 11 Tf
-<5b> Tj
+125.80666666666667 86.50599999999994 Td
+/F1.0 10.5 Tf
+[<6e6f74696365733b20686f776576657220697420646f65736ed574206d616b> 20.01953125 <652073656e736520666f72207468652061726368657479706520746f20696e636c7564652074686520417061636865>] 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
-64.74000000000001 263.16499999999996 Td
-/F3.0 11 Tf
-<494e464f5d20576f726b696e67206469726563746f72793a20433a> Tj
+125.80666666666667 70.72599999999994 Td
+/F1.0 10.5 Tf
+[<72> 20.01953125 <61742d706c7567696e2c20736f207468697320686173206265656e2072656d6f7665642e>] TJ
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-213.24 263.16499999999996 Td
-/F3.0 11 Tf
-<5c55> Tj
+49.24 14.388 Td
+/F1.0 9 Tf
+<3132> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+101 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 595.28 841.89]
+/Contents 100 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 18 0 R
+/F1.0 8 0 R
+/F4.1 71 0 R
+/F3.0 38 0 R
+/F3.1 68 0 R
+/F6.0 105 0 R
+>>
+/XObject << /Stamp1 618 0 R
+>>
+>>
+>>
+endobj
+102 0 obj
+[101 0 R /XYZ 0 841.89 null]
+endobj
+103 0 obj
+[101 0 R /XYZ 0 508.07000000000005 null]
+endobj
+104 0 obj
+[101 0 R /XYZ 0 272.27 null]
+endobj
+105 0 ob

<TRUNCATED>

[08/44] isis-site git commit: ISIS-1594: provide an 'edit' button

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/isis-in-pictures.html
----------------------------------------------------------------------
diff --git a/content/isis-in-pictures.html b/content/isis-in-pictures.html
index 2fc1367..e429b80 100644
--- a/content/isis-in-pictures.html
+++ b/content/isis-in-pictures.html
@@ -1,12 +1,10 @@
 <!doctype html>
 <html class="no-js" lang="en">
-<head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-
-    <title>Apache Isis in Pictures</title>
-
-    <!--
+ <head> 
+  <meta charset="utf-8"> 
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"> 
+  <title>Apache Isis in Pictures</title> 
+  <!--
         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
@@ -23,31 +21,21 @@
         KIND, either express or implied.  See the License for the
         specific language governing permissions and limitations
         under the License.
-    -->
-
-    <!-- No caching headers -->
-    <meta http-equiv="cache-control" content="no-cache" />
-    <meta http-equiv="pragma" content="no-cache" />
-    <meta http-equiv="expires" content="-1" />
-
-
-    <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
-    <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet" />
-    <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script>
-    <link href="../css/asciidoctor/colony.css" rel="stylesheet">
-    <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-
-
-
-    <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
-    <!--[if lt IE 9]>
+    --> 
+  <!-- No caching headers --> 
+  <meta http-equiv="cache-control" content="no-cache"> 
+  <meta http-equiv="pragma" content="no-cache"> 
+  <meta http-equiv="expires" content="-1"> 
+  <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line --> 
+  <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet"> 
+  <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script> 
+  <link href="../css/asciidoctor/colony.css" rel="stylesheet"> 
+  <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet"> 
+  <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet"> 
+  <!--[if lt IE 9]>
       <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
-    <![endif]-->
-
-
-
-    <style type="text/css">
+    <![endif]--> 
+  <style type="text/css">
         pre code {
             background-color: inherit;
             border-style: none;
@@ -192,9 +180,8 @@ table.CodeRay td.code>pre{padding:0}
         color:#fff;
         font-size: 1.1em;
     }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         @media only screen and (min-width: 40.063em) {
           .top-bar {
             .contain-to-grid .top-bar {
@@ -205,9 +192,8 @@ table.CodeRay td.code>pre{padding:0}
         .row {
             max-width: 80rem;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .extended-quote,
         .extended-quote-first {
             margin-left: 40px;
@@ -231,9 +217,8 @@ table.CodeRay td.code>pre{padding:0}
             text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
         }
         
-    </style>
-
-    <style>
+    </style> 
+  <style>
         body {
           position: relative;
         }
@@ -255,6 +240,7 @@ table.CodeRay td.code>pre{padding:0}
 
         div#doc-content {
             margin-top: 30px;
+            padding-top: 30px;
         }
 
         div.documentation-page table.frame-all {
@@ -286,9 +272,8 @@ table.CodeRay td.code>pre{padding:0}
             min-height: 2000px;
         }
 
-    </style>
-
-    <style>
+    </style> 
+  <style>
 
         @media only screen and (min-width: 768px) {
           #toc.toc2 ul ul { margin-left: -10px; }
@@ -316,15 +301,13 @@ table.CodeRay td.code>pre{padding:0}
         body div#toc2 li.tocify-item.active a {
             color: red;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         footer {
             margin-top: 1000px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* overriding colony.css stylesheet */
         .literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
            /*padding: 1.25em 1.5625em 1.125em 1.5625em;*/
@@ -372,9 +355,8 @@ table.CodeRay td.code>pre{padding:0}
         .imageblock img {
             margin-bottom: 10px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* from http://ben.balter.com/2014/03/13/pages-anchor-links/ */
         .header-link {
           position: absolute;
@@ -395,9 +377,8 @@ table.CodeRay td.code>pre{padding:0}
         h6:hover .header-link {
           opacity: 1;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .top-bar
         {
             -webkit-transition-duration: .5s;
@@ -425,515 +406,473 @@ table.CodeRay td.code>pre{padding:0}
             -webkit-transition-property: -webkit-transform;
             transition-property: transform;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         #doc-content a.guide {
             color: white;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
+        .tocify {
+            margin-top: 80px;
+        }
+    </style> 
+  <style>
         .tocify {
             margin-top: 80px;
         }
-    </style>
-
-
-</script>
-
-</head>
-<body>
-
-<<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
-    <div class="github-fork-ribbon">
-        <a href="https://github.com/apache/isis#fork-destination-box">Fork me on GitHub</a>
-    </div>
-</div>
-
-
-<div class="row">
-
-    <div class="fixed contain-to-grid header">
-        <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
-            <ul class="title-area">
-                <li class="name">
-                    <h1>
-                        <a href="/index.html">Apache Isis&trade;</a>
-                    </h1>
-                </li>
-                <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
-                <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
-            </ul>
-
-            <section class="top-bar-section">
-                <ul class="right">
-
-                    <li class="has-form">
-                       <FORM class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
-                        <div class="row collapse">
-                            <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
-                            <INPUT type="hidden" name="cof" value="FORID:0">
-                            <INPUT class="form-control" name="q" type="text" placeholder="Search">
-                        </div>
-                    </FORM>
-                     </li>
-
-                </ul>
-
-                <!-- Left Nav Section -->
-                <ul class="left">
-
-                    <li><a href="/documentation.html">Documentation</a></li>
-                    <li><a href="/downloads.html">Downloads</a></li>
-                    <li><a href="/help.html">Help</a></li>
-                    <li><a href="/asf.html">@ASF</a></li>
-
-                </ul>
-
-            </section>
-        </nav>
-    </div>
-</div>
-
-<div class="row">
-
-    <div id="doc-content-left" class="large-9 medium-9 columns">
-
-
-        <div id="doc-content">
-          <div id="preamble">
-<div class="sectionbody">
-<div class="paragraph">
-<p><br/><br/><br/></p>
-</div>
-<div class="paragraph">
-<p>On this page we want to show you what a modern Apache Isis application looks like.</p>
-</div>
-<div class="paragraph">
-<p>The screenshots below are taken from the Isis Addons' <a href="http://github.com/isisaddons/isis-app-todoapp">todoapp example</a> (non ASF), which you are free to fork and use as you will. The corresponding domain classes from which this UI was built can be found <a href="https://github.com/isisaddons/isis-app-todoapp/tree/master/dom/src/main/java/todoapp/dom/todoitem">here</a>.</p>
-</div>
-<div class="paragraph">
-<p>The todoapp also integrates with a number of other <a href="http://www.isisaddons.org">Isis Addons</a> modules.  Because we expect that most apps will end up using one or more of these addons, we&#8217;ve chosen to include screenshots of those too.</p>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_basics">Basics</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Let&#8217;s start with the basics&#8230;&#8203;</p>
-</div>
-<div class="sect2">
-<h3 id="_sign_in">Sign-in</h3>
-<div class="paragraph">
-<p>Apache Isis integrates with <a href="http://shiro.apache.org">Apache Shiro</a>. The core framework supports file-based realms, while the Isis Addons <a href="http://github.com/isisaddons/isis-module-security">security module</a> (non ASF) provides a well-features subdomain of users, roles and permissions against features derived from the Apache Isis metamodel. The example todoapp integrates with the security module.</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images//isis-in-pictures/010-login.png"><img src="images//isis-in-pictures/010-login.png" alt="010 login" width="800px"></a>
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_install_fixtures">Install Fixtures</h3>
-<div class="paragraph">
-<p>Apache Isis has lots of features to help you prototype and then fully test your application. One such are fixture scripts, which allow pre-canned data to be installed in the running application. This is great to act as the starting point for identifying new stories; later on when the feature is being implemented, the same fixture script can be re-used within that feature&#8217;s integration tests. (More on tests later).</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images//isis-in-pictures/020-install-fixtures.png"><img src="images//isis-in-pictures/020-install-fixtures.png" alt="020 install fixtures" width="800px"></a>
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_dashboard_and_view_models">Dashboard and View Models</h3>
-<div class="paragraph">
-<p>Most of the time the end-user interacts with representations of persistent domain entities, but Apache Isis also supports view models which can aggregate data from multiple sources. The todoapp example uses a "dashboard" view model to list todo items not yet done vs those completed.</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images//isis-in-pictures/030-dashboard-view-model.png"><img src="images//isis-in-pictures/030-dashboard-view-model.png" alt="030 dashboard view model" width="800px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>In general we recommend to initially focus only on domain entities; this will help drive out a good domain model. Later on view models can be introduced in support of specific use cases.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_domain_entity">Domain Entity</h3>
-<div class="paragraph">
-<p>The screenshot below is of the todoapp&#8217;s <code>ToDoItem</code> domain entity. Like all web pages, this UI is generated at runtime, directly from the domain object itself. There are no controllers or HTML to write.</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images//isis-in-pictures/040-domain-entity.png"><img src="images//isis-in-pictures/040-domain-entity.png" alt="040 domain entity" width="800px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>In addition to the domain entity, Apache Isis allows layout metadata hints to be provided, for example to specify the grouping of properties, the positioning of those groups into columns, the association of actions (the buttons) with properties or collections, the icons on the buttons, and so on. This metadata can be specified either as annotations or in JSON form; the benefit of the latter is that it can be updated (and the UI redrawn) without restarting the app.</p>
-</div>
-<div class="paragraph">
-<p>Any production-ready app will require this metadata but (like the view models discussed above) this metadata can be added gradually on top of the core domain model.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_edit_properties">Edit properties</h3>
-<div class="paragraph">
-<p>By default properties on domain entities are editable, meaning they can be changed directly. In the todoapp example, the `ToDoItem&#8217;s description is one such editable property:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images//isis-in-pictures/050-edit-property.png"><img src="images//isis-in-pictures/050-edit-property.png" alt="050 edit property" width="800px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>Note that some of the properties are read-only even in edit mode; individual properties can be made non-editable. It is also possible to make all properties disabled and thus enforce changes only through actions (below).</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_actions">Actions</h3>
-<div class="paragraph">
-<p>The other way to modify an entity is to an invoke an action. In the screenshot below the <code>ToDoItem</code>'s category and subcategory can be updated together using an action:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images//isis-in-pictures/060-invoke-action.png"><img src="images//isis-in-pictures/060-invoke-action.png" alt="060 invoke action" width="800px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>There are no limitations on what an action can do; it might just update a single object, it could update multiple objects. Or, it might not update any objects at all, but could instead perform some other activity, such as sending out email or printing a document.</p>
-</div>
-<div class="paragraph">
-<p>In general though, all actions are associated with some object, and are (at least initially) also implemented by that object: good old-fashioned encapsulation. We sometimes use the term "behaviourally complete" for such domain objects.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_mixins">Mixins</h3>
-<div class="paragraph">
-<p>As an alternative to placing actions (business logic) on a domain object, it can instead be placed inside a mixin object.  When an object is rendered by Apache Isis, the mixin "contributes" its behaviour to the domain object (similar to aspect-oriented traits).</p>
-</div>
-<div class="paragraph">
-<p>In the screenshot below the highlighted "export as xml" action, the "relative priority" property (and "previous" and "next" actions) the "similar to" collection and the two "as DTO" actions are all contributed by mixins:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images//isis-in-pictures/065-contributions.png"><img src="images//isis-in-pictures/065-contributions.png" alt="065 contributions" width="800px"></a>
-</div>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_extensible_views">Extensible Views</h2>
-<div class="sectionbody">
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>The remaining screenshots on this page are for v1.10.0 of the framework, which precedes the more recent support
-for tabbed views introduced in v1.12.0.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>The Apache Isis viewer is implemented using <a href="http://wicket.apache.org">Apache Wicket</a>, and has been designed to be extensible. For example, when a collection of objects is rendered, this is just one of several views, as shown in the selector drop-down:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images//isis-in-pictures/070-pluggable-views.png"><img src="images//isis-in-pictures/070-pluggable-views.png" alt="070 pluggable views" width="800px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>The (non-ASF) <a href="http://isisaddons.org">Isis Addons</a> library provides a number of such extensions.  For example, the <a href="https://github.com/isisaddons/isis-wicket-gmap3">gmap3 component</a> will render any domain entity (such as <code>ToDoItem</code>) that implements its <code>Locatable</code> interface:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images//isis-in-pictures/080-gmap3-view.png"><img src="images//isis-in-pictures/080-gmap3-view.png" alt="080 gmap3 view" width="800px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>Similarly the Isis Addons' <a href="https://github.com/isisaddons/isis-wicket-fullcalendar2">fullcalendar2 component</a> (non ASF) will render any domain entity (such as <code>ToDoItem</code>) that implements its <code>Calendarable</code> interface:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images//isis-in-pictures/090-fullcalendar2-view.png"><img src="images//isis-in-pictures/090-fullcalendar2-view.png" alt="090 fullcalendar2 view" width="800px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>Yet another "view" (though this one is rather simpler) is that provided by the Isis Addons <a href="https://github.com/isisaddons/isis-wicket-excel">excel component</a> (non ASF). This provides a download button to the table as a spreadsheet:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images//isis-in-pictures/100-excel-view-and-docx.png"><img src="images//isis-in-pictures/100-excel-view-and-docx.png" alt="100 excel view and docx" width="800px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>The screenshot above also shows an "export to Word" action. This is <em>not</em> a view but instead is a (contributed) action that uses the Isis Addons <a href="https://github.com/isisaddons/isis-module-docx">docx module</a> (non ASF) to perform a "mail-merge":</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images//isis-in-pictures/110-docx.png"><img src="images//isis-in-pictures/110-docx.png" alt="110 docx" width="800px"></a>
-</div>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>Please note that the Isis Addons are not part of ASF, but they <em>are</em> all licensed under Apache License 2.0 and are maintained by the Apache Isis committers.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_security_auditing_and_more">Security, Auditing and more&#8230;&#8203;</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>As well as providing extensions to the UI, the Isis Addons provide a rich set of modules to support various cross-cutting concerns.</p>
-</div>
-<div class="paragraph">
-<p>Under the activity menu are four sets of services which provide support for <a href="https://github.com/isisaddons/isis-module-sessionlogger">user session logging/auditing</a> (non ASF), <a href="https://github.com/isisaddons/isis-module-command">command profiling</a> (non ASF), <a href="https://github.com/isisaddons/isis-module-audit">(object change) auditing</a> (shown, non-ASF) and (inter-system) <a href="https://github.com/isisaddons/isis-module-publishing">event publishing</a> (non ASF):</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images//isis-in-pictures/120-auditing.png"><img src="images//isis-in-pictures/120-auditing.png" alt="120 auditing" width="800px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>In the security menu is access to the rich set of functionality provided by the Isis Addons <a href="https://github.com/isisaddons/isis-module-security">security module</a> (non ASF):</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images//isis-in-pictures/130-security.png"><img src="images//isis-in-pictures/130-security.png" alt="130 security" width="800px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>In the prototyping menu is the ability to download a GNU gettext <code>.po</code> file for translation. This file can then be translated into multiple languages so that your app can support different locales. Note that this feature is part of Apache Isis core (it is not in Isis Addons):</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images//isis-in-pictures/140-i18n.png"><img src="images//isis-in-pictures/140-i18n.png" alt="140 i18n" width="800px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>The Isis Addons also provides a module for managing application and user <a href="https://github.com/isisaddons/isis-module-settings">settings</a> (non ASF). Most apps (the todoapp example included) won&#8217;t expose these services directly, but will usually wrap them in their own app-specific settings service that trivially delegates to the settings module&#8217;s services:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images//isis-in-pictures/150-appsettings.png"><img src="images//isis-in-pictures/150-appsettings.png" alt="150 appsettings" width="800px"></a>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_multi_tenancy_support">Multi-tenancy support</h3>
-<div class="paragraph">
-<p>Of the various Isis Addons, the <a href="https://github.com/isisaddons/isis-module-security">security module</a> has the most features. One significant feature is the ability to associate users and objects with a "tenancy". The todoapp uses this feature so that different users' list of todo items are kept separate from one another. A user with administrator is able to switch their own "tenancy" to the tenancy of some other user, in order to access the objects in that tenancy:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images//isis-in-pictures/160-switch-tenancy.png"><img src="images//isis-in-pictures/160-switch-tenancy.png" alt="160 switch tenancy" width="800px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>For more details, see the <a href="https://github.com/isisaddons/isis-module-security">security module</a> README.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_me">Me</h3>
-<div class="paragraph">
-<p>Most of the <a href="https://github.com/isisaddons/isis-module-security">security module</a>'s services are on the security module, which would normally be provided only to administrators. Kept separate is the "me" action:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images//isis-in-pictures/170-me.png"><img src="images//isis-in-pictures/170-me.png" alt="170 me" width="800px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>Assuming they have been granted permissions, this allows a user to access an entity representing their own user account:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images//isis-in-pictures/180-app-user-entity.png"><img src="images//isis-in-pictures/180-app-user-entity.png" alt="180 app user entity" width="800px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>If not all of these properties are required, then they can be hidden either using security or though Apache Isis' internal event bus (described below). Conversely, additional properties can be "grafted onto" the user using the contributed properties/collections discussed previously.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_themes">Themes</h3>
-<div class="paragraph">
-<p>Apache Isis' Wicket viewer uses <a href="http://getbootstrap.com">Twitter Bootstrap</a>, which means that it can be themed. If more than one theme has been configured for the app, then the viewer allows the end-user to switch their theme:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images//isis-in-pictures/190-switch-theme.png"><img src="images//isis-in-pictures/190-switch-theme.png" alt="190 switch theme" width="800px"></a>
-</div>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_rest_api">REST API</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>In addition to Apache Isis' Wicket viewer, it also provides a rich REST API with a full set of hypermedia controls, generated automatically from the domain objects (entities and view models).  The framework provides two default representations, one an implementation of the <a href="http://restfulobjects.org">Restful Objects</a> spec, the other a simplified representation suitable for custom Javascript apps.  Other representations can be plugged in.</p>
-</div>
-<div class="paragraph">
-<p>The screenshot below shows accessing the Restful Objects representation API accessed through a Chrome plugin:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images//isis-in-pictures/200-rest-api.png"><img src="images//isis-in-pictures/200-rest-api.png" alt="200 rest api" width="800px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>The framework also automatically integrates with Swagger, generating a Swagger spec from the underlying domain object model.  From this spec REST clients can be code-generated; it also allows developers to play with the REST API through the Swagger UI:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images//isis-in-pictures/205-swagger-ui.png"><img src="images//isis-in-pictures/205-swagger-ui.png" alt="205 swagger ui" width="800px"></a>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_integration_testing_support">Integration Testing Support</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Earlier on we noted that Apache Isis allows fixtures to be installed through the UI. These same fixture scripts can be reused within integration tests. For example, the code snippet below shows how the <code>FixtureScripts</code> service injected into an integration test can then be used to set up data:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images//isis-in-pictures/210-fixture-scripts.png"><img src="images//isis-in-pictures/210-fixture-scripts.png" alt="210 fixture scripts" width="500px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>The tests themselves are run in junit. While these are integration tests (so talking to a real database), they are no more complex than a regular unit test:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images//isis-in-pictures/220-testing-happy-case.png"><img src="images//isis-in-pictures/220-testing-happy-case.png" alt="220 testing happy case" width="400px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>To simulate the business rules enforced by Apache Isis, the domain object can be "wrapped" in a proxy. For example, if using the Wicket viewer then Apache Isis will enforce the rule (implemented in the <code>ToDoItem</code> class itself) that a completed item cannot have the "completed" action invoked upon it. The wrapper simulates this by throwing an appropriate exception:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images//isis-in-pictures/230-testing-wrapper-factory.png"><img src="images//isis-in-pictures/230-testing-wrapper-factory.png" alt="230 testing wrapper factory" width="550px"></a>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_internal_event_bus">Internal Event Bus</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Contributions, discussed earlier, are an important tool in ensuring that the packages within your Apache Isis application are decoupled; by extracting out actions the order of dependency between packages can effectively be reversed.</p>
-</div>
-<div class="paragraph">
-<p>Another important tool to ensure your codebase remains maintainable is Apache Isis' internal event bus. It is probably best explained by example; the code below says that the "complete" action should emit a <code>ToDoItem.Completed</code> event:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images//isis-in-pictures/240-domain-events.png"><img src="images//isis-in-pictures/240-domain-events.png" alt="240 domain events" width="400px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>Domain service (application-scoped, stateless) can then subscribe to this event:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images//isis-in-pictures/250-domain-event-subscriber.png"><img src="images//isis-in-pictures/250-domain-event-subscriber.png" alt="250 domain event subscriber" width="450px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>And this test verifies that completing an action causes the subscriber to be called:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images//isis-in-pictures/260-domain-event-test.png"><img src="images//isis-in-pictures/260-domain-event-test.png" alt="260 domain event test" width="850px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>In fact, the domain event is fired not once, but (up to) 5 times. It is called 3 times prior to execution, to check that the action is visible, enabled and that arguments are valid. It is then additionally called prior to execution, and also called after execution. What this means is that a subscriber can in either veto access to an action of some publishing object, and/or it can perform cascading updates if the action is allowed to proceed.</p>
-</div>
-<div class="paragraph">
-<p>Moreover, domain events are fired for all properties and collections, not just actions. Thus, subscribers can therefore switch on or switch off different parts of an application. Indeed, the example todoapp demonstrates this.</p>
-</div>
-</div>
-</div>
-        </div>
-
-        <footer>
-          <hr>
-          <p class="small">
-          Copyright &copy; 2010~2016 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0.
-          <br/>
-          Apache, the Apache feather logo, Apache&nbsp;Isis, and the Apache&nbsp;Isis project logo are all trademarks of The&nbsp;Apache&nbsp;Software&nbsp;Foundation.
-          </p>
-        </footer>
-
-    </div>
-
-    <div id="doc-content-right" class="large-3 medium-3 xcolumns">
-        <div id="toc" class="toc2">
-            <div class="fallback-toc">
-                <ul class="sectlevel1">
-<li><a href="#_basics">Basics</a>
-<ul class="sectlevel2">
-<li><a href="#_sign_in">Sign-in</a></li>
-<li><a href="#_install_fixtures">Install Fixtures</a></li>
-<li><a href="#_dashboard_and_view_models">Dashboard and View Models</a></li>
-<li><a href="#_domain_entity">Domain Entity</a></li>
-<li><a href="#_edit_properties">Edit properties</a></li>
-<li><a href="#_actions">Actions</a></li>
-<li><a href="#_mixins">Mixins</a></li>
-</ul>
-</li>
-<li><a href="#_extensible_views">Extensible Views</a></li>
-<li><a href="#_security_auditing_and_more">Security, Auditing and more&#8230;&#8203;</a>
-<ul class="sectlevel2">
-<li><a href="#_multi_tenancy_support">Multi-tenancy support</a></li>
-<li><a href="#_me">Me</a></li>
-<li><a href="#_themes">Themes</a></li>
-</ul>
-</li>
-<li><a href="#_rest_api">REST API</a></li>
-<li><a href="#_integration_testing_support">Integration Testing Support</a></li>
-<li><a href="#_internal_event_bus">Internal Event Bus</a></li>
-</ul>
-            </div>
-        </div>
-    </div>
-
-</div>
-
-
-<script src="../js/foundation/5.5.1/vendor/jquery.js"></script>
-<script src="../js/foundation/5.5.1/foundation.min.js"></script>
-
-
-<link href="../css/jquery.tocify/1.9.0/jquery.tocify.css" rel="stylesheet">
-<script src="../js/jqueryui/1.11.4/jquery-ui.min.js"></script>
-<script src="../js/jquery.tocify/1.9.0/jquery.tocify.js"></script>
-
-
-
-<script type="text/javascript">
+    </style>  
+ </head> 
+ <body> 
+  <div class="row"> 
+   <div class="fixed contain-to-grid header"> 
+    <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem"> 
+     <ul class="title-area"> 
+      <li class="name"> <h1> <a href="/index.html">Apache Isis\u2122</a> </h1> </li> 
+      <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone --> 
+      <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li> 
+     </ul> 
+     <section class="top-bar-section"> 
+      <ul class="right"> 
+       <li class="has-form"> 
+        <form class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse"> 
+         <div class="row collapse"> 
+          <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya"> 
+          <input type="hidden" name="cof" value="FORID:0"> 
+          <input class="form-control" name="q" type="text" placeholder="Search"> 
+         </div> 
+        </form> </li> 
+      </ul> 
+      <!-- Left Nav Section --> 
+      <ul class="left"> 
+       <li><a href="/documentation.html">Documentation</a></li> 
+       <li><a href="/downloads.html">Downloads</a></li> 
+       <li><a href="/help.html">Help</a></li> 
+       <li><a href="/asf.html">@ASF</a></li> 
+      </ul> 
+     </section> 
+    </nav> 
+   </div> 
+  </div> 
+  <div class="row"> 
+   <div id="doc-content-left" class="large-9 medium-9 columns"> 
+    <div id="doc-content">
+     <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/isis-in-pictures.adoc&quot;" style="float: right; font-size: small; padding: 6px;  "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+     <div id="preamble"> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>On this page we want to show you what a modern Apache Isis application looks like.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>The screenshots below are taken from the Isis Addons' <a href="http://github.com/isisaddons/isis-app-todoapp">todoapp example</a> (non ASF), which you are free to fork and use as you will. The corresponding domain classes from which this UI was built can be found <a href="https://github.com/isisaddons/isis-app-todoapp/tree/master/dom/src/main/java/todoapp/dom/todoitem">here</a>.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>The todoapp also integrates with a number of other <a href="http://www.isisaddons.org">Isis Addons</a> modules. Because we expect that most apps will end up using one or more of these addons, we\u2019ve chosen to include screenshots of those too.</p> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_basics">Basics</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_basics.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>Let\u2019s start with the basics\u2026\u200b</p> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_sign_in">Sign-in</h3> 
+        <div class="paragraph"> 
+         <p>Apache Isis integrates with <a href="http://shiro.apache.org">Apache Shiro</a>. The core framework supports file-based realms, while the Isis Addons <a href="http://github.com/isisaddons/isis-module-security">security module</a> (non ASF) provides a well-features subdomain of users, roles and permissions against features derived from the Apache Isis metamodel. The example todoapp integrates with the security module.</p> 
+        </div> 
+        <div class="imageblock"> 
+         <div class="content"> 
+          <a class="image" href="images//isis-in-pictures/010-login.png"><img src="images//isis-in-pictures/010-login.png" alt="010 login" width="800px"></a> 
+         </div> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_install_fixtures">Install Fixtures</h3> 
+        <div class="paragraph"> 
+         <p>Apache Isis has lots of features to help you prototype and then fully test your application. One such are fixture scripts, which allow pre-canned data to be installed in the running application. This is great to act as the starting point for identifying new stories; later on when the feature is being implemented, the same fixture script can be re-used within that feature\u2019s integration tests. (More on tests later).</p> 
+        </div> 
+        <div class="imageblock"> 
+         <div class="content"> 
+          <a class="image" href="images//isis-in-pictures/020-install-fixtures.png"><img src="images//isis-in-pictures/020-install-fixtures.png" alt="020 install fixtures" width="800px"></a> 
+         </div> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_dashboard_and_view_models">Dashboard and View Models</h3> 
+        <div class="paragraph"> 
+         <p>Most of the time the end-user interacts with representations of persistent domain entities, but Apache Isis also supports view models which can aggregate data from multiple sources. The todoapp example uses a "dashboard" view model to list todo items not yet done vs those completed.</p> 
+        </div> 
+        <div class="imageblock"> 
+         <div class="content"> 
+          <a class="image" href="images//isis-in-pictures/030-dashboard-view-model.png"><img src="images//isis-in-pictures/030-dashboard-view-model.png" alt="030 dashboard view model" width="800px"></a> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>In general we recommend to initially focus only on domain entities; this will help drive out a good domain model. Later on view models can be introduced in support of specific use cases.</p> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_domain_entity">Domain Entity</h3> 
+        <div class="paragraph"> 
+         <p>The screenshot below is of the todoapp\u2019s <code>ToDoItem</code> domain entity. Like all web pages, this UI is generated at runtime, directly from the domain object itself. There are no controllers or HTML to write.</p> 
+        </div> 
+        <div class="imageblock"> 
+         <div class="content"> 
+          <a class="image" href="images//isis-in-pictures/040-domain-entity.png"><img src="images//isis-in-pictures/040-domain-entity.png" alt="040 domain entity" width="800px"></a> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>In addition to the domain entity, Apache Isis allows layout metadata hints to be provided, for example to specify the grouping of properties, the positioning of those groups into columns, the association of actions (the buttons) with properties or collections, the icons on the buttons, and so on. This metadata can be specified either as annotations or in XML form. The benefit of the latter is that it can be updated (and the UI redrawn) without restarting the app.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Any production-ready app will require this metadata but (like the view models discussed above) this metadata can be added gradually on top of the core domain model.</p> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_edit_properties">Edit properties</h3> 
+        <div class="paragraph"> 
+         <p>By default properties on domain entities are editable, meaning they can be changed directly. In the todoapp example, the `ToDoItem\u2019s description is one such editable property:</p> 
+        </div> 
+        <div class="imageblock"> 
+         <div class="content"> 
+          <a class="image" href="images//isis-in-pictures/050-edit-property.png"><img src="images//isis-in-pictures/050-edit-property.png" alt="050 edit property" width="800px"></a> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Note that some of the properties are read-only even in edit mode; individual properties can be made non-editable. It is also possible to make all properties disabled and thus enforce changes only through actions (below).</p> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_actions">Actions</h3> 
+        <div class="paragraph"> 
+         <p>The other way to modify an entity is to an invoke an action. In the screenshot below the <code>ToDoItem</code>'s category and subcategory can be updated together using an action:</p> 
+        </div> 
+        <div class="imageblock"> 
+         <div class="content"> 
+          <a class="image" href="images//isis-in-pictures/060-invoke-action.png"><img src="images//isis-in-pictures/060-invoke-action.png" alt="060 invoke action" width="800px"></a> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>There are no limitations on what an action can do; it might just update a single object, it could update multiple objects. Or, it might not update any objects at all, but could instead perform some other activity, such as sending out email or printing a document.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>In general though, all actions are associated with some object, and are (at least initially) also implemented by that object: good old-fashioned encapsulation. We sometimes use the term "behaviourally complete" for such domain objects.</p> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_mixins">Mixins</h3> 
+        <div class="paragraph"> 
+         <p>As an alternative to placing actions (business logic) on a domain object, it can instead be placed inside a mixin object. When an object is rendered by Apache Isis, the mixin "contributes" its behaviour to the domain object (similar to aspect-oriented traits).</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>In the screenshot below the highlighted "export as xml" action, the "relative priority" property (and "previous" and "next" actions) the "similar to" collection and the two "as DTO" actions are all contributed by mixins:</p> 
+        </div> 
+        <div class="imageblock"> 
+         <div class="content"> 
+          <a class="image" href="images//isis-in-pictures/065-contributions.png"><img src="images//isis-in-pictures/065-contributions.png" alt="065 contributions" width="800px"></a> 
+         </div> 
+        </div> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_extensible_views">Extensible Views</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_extensible_views.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="admonitionblock note"> 
+        <table> 
+         <tbody>
+          <tr> 
+           <td class="icon"> <i class="fa icon-note" title="Note"></i> </td> 
+           <td class="content"> 
+            <div class="paragraph"> 
+             <p>The remaining screenshots on this page are for v1.10.0 of the framework, which precedes the support for tabbed views introduced in v1.12.0.</p> 
+            </div> </td> 
+          </tr> 
+         </tbody>
+        </table> 
+       </div> 
+       <div class="paragraph"> 
+        <p>The Apache Isis viewer is implemented using <a href="http://wicket.apache.org">Apache Wicket</a>, and has been designed to be extensible. For example, when a collection of objects is rendered, this is just one of several views, as shown in the selector drop-down:</p> 
+       </div> 
+       <div class="imageblock"> 
+        <div class="content"> 
+         <a class="image" href="images//isis-in-pictures/070-pluggable-views.png"><img src="images//isis-in-pictures/070-pluggable-views.png" alt="070 pluggable views" width="800px"></a> 
+        </div> 
+       </div> 
+       <div class="paragraph"> 
+        <p>The (non-ASF) <a href="http://isisaddons.org">Isis Addons</a> library provides a number of such extensions. For example, the <a href="https://github.com/isisaddons/isis-wicket-gmap3">gmap3 component</a> will render any domain entity (such as <code>ToDoItem</code>) that implements its <code>Locatable</code> interface:</p> 
+       </div> 
+       <div class="imageblock"> 
+        <div class="content"> 
+         <a class="image" href="images//isis-in-pictures/080-gmap3-view.png"><img src="images//isis-in-pictures/080-gmap3-view.png" alt="080 gmap3 view" width="800px"></a> 
+        </div> 
+       </div> 
+       <div class="paragraph"> 
+        <p>Similarly the Isis Addons' <a href="https://github.com/isisaddons/isis-wicket-fullcalendar2">fullcalendar2 component</a> (non ASF) will render any domain entity (such as <code>ToDoItem</code>) that implements its <code>Calendarable</code> interface:</p> 
+       </div> 
+       <div class="imageblock"> 
+        <div class="content"> 
+         <a class="image" href="images//isis-in-pictures/090-fullcalendar2-view.png"><img src="images//isis-in-pictures/090-fullcalendar2-view.png" alt="090 fullcalendar2 view" width="800px"></a> 
+        </div> 
+       </div> 
+       <div class="paragraph"> 
+        <p>Yet another "view" (though this one is rather simpler) is that provided by the Isis Addons <a href="https://github.com/isisaddons/isis-wicket-excel">excel component</a> (non ASF). This provides a download button to the table as a spreadsheet:</p> 
+       </div> 
+       <div class="imageblock"> 
+        <div class="content"> 
+         <a class="image" href="images//isis-in-pictures/100-excel-view-and-docx.png"><img src="images//isis-in-pictures/100-excel-view-and-docx.png" alt="100 excel view and docx" width="800px"></a> 
+        </div> 
+       </div> 
+       <div class="paragraph"> 
+        <p>The screenshot above also shows an "export to Word" action. This is <em>not</em> a view but instead is a (contributed) action that uses the Isis Addons <a href="https://github.com/isisaddons/isis-module-docx">docx module</a> (non ASF) to perform a "mail-merge":</p> 
+       </div> 
+       <div class="imageblock"> 
+        <div class="content"> 
+         <a class="image" href="images//isis-in-pictures/110-docx.png"><img src="images//isis-in-pictures/110-docx.png" alt="110 docx" width="800px"></a> 
+        </div> 
+       </div> 
+       <div class="admonitionblock note"> 
+        <table> 
+         <tbody>
+          <tr> 
+           <td class="icon"> <i class="fa icon-note" title="Note"></i> </td> 
+           <td class="content"> 
+            <div class="paragraph"> 
+             <p>Please note that the Isis Addons are not part of ASF, but they <em>are</em> all licensed under Apache License 2.0 and are maintained by the Apache Isis committers.</p> 
+            </div> </td> 
+          </tr> 
+         </tbody>
+        </table> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_security_auditing_and_more">Security, Auditing and more\u2026\u200b</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_security_auditing_and_more.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>As well as providing extensions to the UI, the (non ASF) Isis Addons provide a rich set of modules to support various cross-cutting concerns.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>Under the activity menu are four sets of services which provide support for <a href="https://github.com/isisaddons/isis-module-sessionlogger">user session logging/auditing</a> , <a href="https://github.com/isisaddons/isis-module-command">command profiling</a>, <a href="https://github.com/isisaddons/isis-module-audit">(object change) auditing</a> (shown) and (inter-system) <a href="https://github.com/isisaddons/isis-module-publishmq">event publishmq</a>:</p> 
+       </div> 
+       <div class="imageblock"> 
+        <div class="content"> 
+         <a class="image" href="images//isis-in-pictures/120-auditing.png"><img src="images//isis-in-pictures/120-auditing.png" alt="120 auditing" width="800px"></a> 
+        </div> 
+       </div> 
+       <div class="paragraph"> 
+        <p>In the security menu is access to the rich set of functionality provided by the Isis Addons <a href="https://github.com/isisaddons/isis-module-security">security module</a>:</p> 
+       </div> 
+       <div class="imageblock"> 
+        <div class="content"> 
+         <a class="image" href="images//isis-in-pictures/130-security.png"><img src="images//isis-in-pictures/130-security.png" alt="130 security" width="800px"></a> 
+        </div> 
+       </div> 
+       <div class="paragraph"> 
+        <p>In the prototyping menu is the ability to download a GNU gettext <code>.po</code> file for translation. This file can then be translated into multiple languages so that your app can support different locales. Note that this feature is part of Apache Isis core (it is not in Isis Addons):</p> 
+       </div> 
+       <div class="imageblock"> 
+        <div class="content"> 
+         <a class="image" href="images//isis-in-pictures/140-i18n.png"><img src="images//isis-in-pictures/140-i18n.png" alt="140 i18n" width="800px"></a> 
+        </div> 
+       </div> 
+       <div class="paragraph"> 
+        <p>The Isis Addons also provides a module for managing application and user <a href="https://github.com/isisaddons/isis-module-settings">settings</a>. Most apps (the todoapp example included) won\u2019t expose these services directly, but will usually wrap them in their own app-specific settings service that trivially delegates to the settings module\u2019s services:</p> 
+       </div> 
+       <div class="imageblock"> 
+        <div class="content"> 
+         <a class="image" href="images//isis-in-pictures/150-appsettings.png"><img src="images//isis-in-pictures/150-appsettings.png" alt="150 appsettings" width="800px"></a> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_multi_tenancy_support">Multi-tenancy support</h3> 
+        <div class="paragraph"> 
+         <p>Of the various Isis Addons, the <a href="https://github.com/isisaddons/isis-module-security">security module</a> has the most features. One significant feature is the ability to associate users and objects with a "tenancy". The todoapp uses this feature so that different users' list of todo items are kept separate from one another. A user with administrator is able to switch their own "tenancy" to the tenancy of some other user, in order to access the objects in that tenancy:</p> 
+        </div> 
+        <div class="imageblock"> 
+         <div class="content"> 
+          <a class="image" href="images//isis-in-pictures/160-switch-tenancy.png"><img src="images//isis-in-pictures/160-switch-tenancy.png" alt="160 switch tenancy" width="800px"></a> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>For more details, see the <a href="https://github.com/isisaddons/isis-module-security">security module</a> README.</p> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_me">Me</h3> 
+        <div class="paragraph"> 
+         <p>Most of the <a href="https://github.com/isisaddons/isis-module-security">security module</a>'s services are on the security module, which would normally be provided only to administrators. Kept separate is the "me" action:</p> 
+        </div> 
+        <div class="imageblock"> 
+         <div class="content"> 
+          <a class="image" href="images//isis-in-pictures/170-me.png"><img src="images//isis-in-pictures/170-me.png" alt="170 me" width="800px"></a> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Assuming they have been granted permissions, this allows a user to access an entity representing their own user account:</p> 
+        </div> 
+        <div class="imageblock"> 
+         <div class="content"> 
+          <a class="image" href="images//isis-in-pictures/180-app-user-entity.png"><img src="images//isis-in-pictures/180-app-user-entity.png" alt="180 app user entity" width="800px"></a> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>If not all of these properties are required, then they can be hidden either using security or though Apache Isis' internal event bus (described below). Conversely, additional properties can be "grafted onto" the user using the contributed properties/collections discussed previously.</p> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_themes">Themes</h3> 
+        <div class="paragraph"> 
+         <p>Apache Isis' Wicket viewer uses <a href="http://getbootstrap.com">Twitter Bootstrap</a>, which means that it can be themed. If more than one theme has been configured for the app, then the viewer allows the end-user to switch their theme:</p> 
+        </div> 
+        <div class="imageblock"> 
+         <div class="content"> 
+          <a class="image" href="images//isis-in-pictures/190-switch-theme.png"><img src="images//isis-in-pictures/190-switch-theme.png" alt="190 switch theme" width="800px"></a> 
+         </div> 
+        </div> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_rest_api">REST API</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_rest_api.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>In addition to Apache Isis' Wicket viewer, it also provides a rich REST API with a full set of hypermedia controls, generated automatically from the domain objects (entities and view models). The framework provides two default representations, one an implementation of the <a href="http://restfulobjects.org">Restful Objects</a> spec, the other a simplified representation suitable for custom Javascript apps. Other representations can be plugged in.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>The screenshot below shows accessing the Restful Objects representation API accessed through a Chrome plugin:</p> 
+       </div> 
+       <div class="imageblock"> 
+        <div class="content"> 
+         <a class="image" href="images//isis-in-pictures/200-rest-api.png"><img src="images//isis-in-pictures/200-rest-api.png" alt="200 rest api" width="800px"></a> 
+        </div> 
+       </div> 
+       <div class="paragraph"> 
+        <p>The framework also automatically integrates with Swagger, generating a Swagger spec from the underlying domain object model. From this spec REST clients can be code-generated; it also allows developers to play with the REST API through the Swagger UI:</p> 
+       </div> 
+       <div class="imageblock"> 
+        <div class="content"> 
+         <a class="image" href="images//isis-in-pictures/205-swagger-ui.png"><img src="images//isis-in-pictures/205-swagger-ui.png" alt="205 swagger ui" width="800px"></a> 
+        </div> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_integration_testing_support">Integration Testing Support</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_integration_testing_support.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>Earlier on we noted that Apache Isis allows fixtures to be installed through the UI. These same fixture scripts can be reused within integration tests. For example, the code snippet below shows how the <code>FixtureScripts</code> service injected into an integration test can then be used to set up data:</p> 
+       </div> 
+       <div class="imageblock"> 
+        <div class="content"> 
+         <a class="image" href="images//isis-in-pictures/210-fixture-scripts.png"><img src="images//isis-in-pictures/210-fixture-scripts.png" alt="210 fixture scripts" width="500px"></a> 
+        </div> 
+       </div> 
+       <div class="paragraph"> 
+        <p>The tests themselves are run in junit. While these are integration tests (so talking to a real database), they are no more complex than a regular unit test:</p> 
+       </div> 
+       <div class="imageblock"> 
+        <div class="content"> 
+         <a class="image" href="images//isis-in-pictures/220-testing-happy-case.png"><img src="images//isis-in-pictures/220-testing-happy-case.png" alt="220 testing happy case" width="400px"></a> 
+        </div> 
+       </div> 
+       <div class="paragraph"> 
+        <p>To simulate the business rules enforced by Apache Isis, the domain object can be "wrapped" in a proxy. For example, if using the Wicket viewer then Apache Isis will enforce the rule (implemented in the <code>ToDoItem</code> class itself) that a completed item cannot have the "completed" action invoked upon it. The wrapper simulates this by throwing an appropriate exception:</p> 
+       </div> 
+       <div class="imageblock"> 
+        <div class="content"> 
+         <a class="image" href="images//isis-in-pictures/230-testing-wrapper-factory.png"><img src="images//isis-in-pictures/230-testing-wrapper-factory.png" alt="230 testing wrapper factory" width="550px"></a> 
+        </div> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_internal_event_bus">Internal Event Bus</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/_internal_event_bus.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>Contributions, discussed earlier, are an important tool in ensuring that the packages within your Apache Isis application are decoupled; by extracting out actions the order of dependency between packages can effectively be reversed.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>Another important tool to ensure your codebase remains maintainable is Apache Isis' internal event bus. It is probably best explained by example; the code below says that the "complete" action should emit a <code>ToDoItem.Completed</code> event:</p> 
+       </div> 
+       <div class="imageblock"> 
+        <div class="content"> 
+         <a class="image" href="images//isis-in-pictures/240-domain-events.png"><img src="images//isis-in-pictures/240-domain-events.png" alt="240 domain events" width="400px"></a> 
+        </div> 
+       </div> 
+       <div class="paragraph"> 
+        <p>Domain service (application-scoped, stateless) can then subscribe to this event:</p> 
+       </div> 
+       <div class="imageblock"> 
+        <div class="content"> 
+         <a class="image" href="images//isis-in-pictures/250-domain-event-subscriber.png"><img src="images//isis-in-pictures/250-domain-event-subscriber.png" alt="250 domain event subscriber" width="450px"></a> 
+        </div> 
+       </div> 
+       <div class="paragraph"> 
+        <p>And this test verifies that completing an action causes the subscriber to be called:</p> 
+       </div> 
+       <div class="imageblock"> 
+        <div class="content"> 
+         <a class="image" href="images//isis-in-pictures/260-domain-event-test.png"><img src="images//isis-in-pictures/260-domain-event-test.png" alt="260 domain event test" width="850px"></a> 
+        </div> 
+       </div> 
+       <div class="paragraph"> 
+        <p>In fact, the domain event is fired not once, but (up to) 5 times. It is called 3 times prior to execution, to check that the action is visible, enabled and that arguments are valid. It is then additionally called prior to execution, and also called after execution. What this means is that a subscriber can in either veto access to an action of some publishing object, and/or it can perform cascading updates if the action is allowed to proceed.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>Moreover, domain events are fired for all properties and collections, not just actions. Thus, subscribers can therefore switch on or switch off different parts of an application. Indeed, the example todoapp demonstrates this.</p> 
+       </div> 
+      </div> 
+     </div> 
+    </div> 
+    <footer> 
+     <hr> 
+     <p class="small"> Copyright � 2010~2016 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0. <br> Apache, the Apache feather logo, Apache&nbsp;Isis, and the Apache&nbsp;Isis project logo are all trademarks of The&nbsp;Apache&nbsp;Software&nbsp;Foundation. </p> 
+    </footer> 
+   </div> 
+   <div id="doc-content-right" class="large-3 medium-3 xcolumns"> 
+    <div id="toc" class="toc2"> 
+     <div class="fallback-toc"> 
+      <ul class="sectlevel1"> 
+       <li><a href="#_basics">Basics</a> 
+        <ul class="sectlevel2"> 
+         <li><a href="#_sign_in">Sign-in</a></li> 
+         <li><a href="#_install_fixtures">Install Fixtures</a></li> 
+         <li><a href="#_dashboard_and_view_models">Dashboard and View Models</a></li> 
+         <li><a href="#_domain_entity">Domain Entity</a></li> 
+         <li><a href="#_edit_properties">Edit properties</a></li> 
+         <li><a href="#_actions">Actions</a></li> 
+         <li><a href="#_mixins">Mixins</a></li> 
+        </ul> </li> 
+       <li><a href="#_extensible_views">Extensible Views</a></li> 
+       <li><a href="#_security_auditing_and_more">Security, Auditing and more\u2026\u200b</a> 
+        <ul class="sectlevel2"> 
+         <li><a href="#_multi_tenancy_support">Multi-tenancy support</a></li> 
+         <li><a href="#_me">Me</a></li> 
+         <li><a href="#_themes">Themes</a></li> 
+        </ul> </li> 
+       <li><a href="#_rest_api">REST API</a></li> 
+       <li><a href="#_integration_testing_support">Integration Testing Support</a></li> 
+       <li><a href="#_internal_event_bus">Internal Event Bus</a></li> 
+      </ul> 
+     </div> 
+    </div> 
+   </div> 
+  </div> 
+  <script src="../js/foundation/5.5.1/vendor/jquery.js"></script> 
+  <script src="../js/foundation/5.5.1/foundation.min.js"></script> 
+  <link href="../css/jquery.tocify/1.9.0/jquery.tocify.css" rel="stylesheet"> 
+  <script src="../js/jqueryui/1.11.4/jquery-ui.min.js"></script> 
+  <script src="../js/jquery.tocify/1.9.0/jquery.tocify.js"></script> 
+  <script type="text/javascript">
     $(function () {
         $("#toc").tocify({
             scrollTo: 50,
@@ -946,9 +885,8 @@ for tabbed views introduced in v1.12.0.</p>
         });
         $(".fallback-toc").hide();
     });
-</script>
-
-<script type="text/javascript">
+</script> 
+  <script type="text/javascript">
 
   /****
 
@@ -1058,9 +996,8 @@ for tabbed views introduced in v1.12.0.</p>
 
     ***/
 
-</script>
-
-<script type="text/javascript">
+</script> 
+  <script type="text/javascript">
 
 $(document).ready(function(){
     if("Documentation" === "Apache Isis in Pictures") {
@@ -1072,10 +1009,8 @@ $(document).ready(function(){
 
 });
 
-</script>
-
-
-<script>
+</script> 
+  <script>
 
 $( document ).ready(function() {
 
@@ -1166,7 +1101,6 @@ $( document ).ready(function() {
 
 
 });
-</script>
-
-</body>
+</script>  
+ </body>
 </html>


[26/44] isis-site git commit: ISIS-1594: provide an 'edit' button

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/guides/rgsvc.pdf
----------------------------------------------------------------------
diff --git a/content/guides/rgsvc.pdf b/content/guides/rgsvc.pdf
index d616312..4e295f0 100644
--- a/content/guides/rgsvc.pdf
+++ b/content/guides/rgsvc.pdf
@@ -4,16 +4,16 @@
 << /Title (Domain Services)
 /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:20170219155050+00'00')
-/ModDate (D:20170219155050+00'00')
+/CreationDate (D:20170307234048+00'00')
+/ModDate (D:20170307234048+00'00')
 >>
 endobj
 2 0 obj
 << /Type /Catalog
 /Pages 3 0 R
 /Names 18 0 R
-/Outlines 2194 0 R
-/PageLabels 2278 0 R
+/Outlines 2193 0 R
+/PageLabels 2277 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 173
-/Kids [7 0 R 10 0 R 12 0 R 14 0 R 16 0 R 38 0 R 50 0 R 62 0 R 71 0 R 77 0 R 106 0 R 111 0 R 132 0 R 167 0 R 198 0 R 216 0 R 222 0 R 232 0 R 238 0 R 253 0 R 257 0 R 263 0 R 267 0 R 273 0 R 281 0 R 296 0 R 311 0 R 326 0 R 347 0 R 360 0 R 378 0 R 388 0 R 400 0 R 408 0 R 425 0 R 439 0 R 449 0 R 455 0 R 482 0 R 520 0 R 541 0 R 549 0 R 561 0 R 571 0 R 581 0 R 593 0 R 606 0 R 618 0 R 620 0 R 622 0 R 632 0 R 645 0 R 647 0 R 658 0 R 665 0 R 686 0 R 693 0 R 700 0 R 716 0 R 727 0 R 736 0 R 747 0 R 757 0 R 762 0 R 773 0 R 780 0 R 794 0 R 802 0 R 825 0 R 833 0 R 846 0 R 865 0 R 876 0 R 894 0 R 899 0 R 927 0 R 952 0 R 959 0 R 964 0 R 971 0 R 982 0 R 998 0 R 1009 0 R 1011 0 R 1022 0 R 1032 0 R 1036 0 R 1044 0 R 1052 0 R 1059 0 R 1075 0 R 1087 0 R 1094 0 R 1098 0 R 1101 0 R 1107 0 R 1116 0 R 1128 0 R 1142 0 R 1156 0 R 1162 0 R 1175 0 R 1184 0 R 1188 0 R 1217 0 R 1234 0 R 1239 0 R 1254 0 R 1271 0 R 1277 0 R 1284 0 R 1299 0 R 1304 0 R 1314 0 R 1326 0 R 1333 0 R 1344 0 R 1348 0 R 1351 0 R 1355 0 R 136
 7 0 R 1395 0 R 1411 0 R 1423 0 R 1433 0 R 1444 0 R 1452 0 R 1464 0 R 1481 0 R 1490 0 R 1534 0 R 1546 0 R 1556 0 R 1565 0 R 1573 0 R 1584 0 R 1595 0 R 1625 0 R 1635 0 R 1641 0 R 1648 0 R 1652 0 R 1662 0 R 1674 0 R 1678 0 R 1684 0 R 1695 0 R 1698 0 R 1704 0 R 1708 0 R 1712 0 R 1717 0 R 1725 0 R 1752 0 R 1770 0 R 1773 0 R 1786 0 R 1796 0 R 1812 0 R 1822 0 R 1834 0 R 1846 0 R 1856 0 R 1874 0 R 1883 0 R 1889 0 R 1896 0 R 1913 0 R 1918 0 R 1926 0 R 1932 0 R 1948 0 R 1956 0 R]
+/Kids [7 0 R 10 0 R 12 0 R 14 0 R 16 0 R 38 0 R 50 0 R 61 0 R 70 0 R 76 0 R 105 0 R 110 0 R 131 0 R 166 0 R 197 0 R 215 0 R 221 0 R 231 0 R 237 0 R 252 0 R 256 0 R 262 0 R 266 0 R 272 0 R 280 0 R 295 0 R 310 0 R 325 0 R 346 0 R 359 0 R 377 0 R 387 0 R 399 0 R 407 0 R 424 0 R 438 0 R 448 0 R 454 0 R 481 0 R 519 0 R 540 0 R 548 0 R 560 0 R 570 0 R 580 0 R 592 0 R 605 0 R 617 0 R 619 0 R 621 0 R 631 0 R 644 0 R 646 0 R 657 0 R 664 0 R 685 0 R 692 0 R 699 0 R 715 0 R 726 0 R 735 0 R 746 0 R 756 0 R 761 0 R 772 0 R 779 0 R 793 0 R 801 0 R 824 0 R 832 0 R 845 0 R 864 0 R 875 0 R 893 0 R 898 0 R 926 0 R 951 0 R 958 0 R 963 0 R 970 0 R 981 0 R 997 0 R 1008 0 R 1010 0 R 1021 0 R 1031 0 R 1035 0 R 1043 0 R 1051 0 R 1058 0 R 1074 0 R 1086 0 R 1093 0 R 1097 0 R 1100 0 R 1106 0 R 1115 0 R 1127 0 R 1141 0 R 1155 0 R 1161 0 R 1174 0 R 1183 0 R 1187 0 R 1216 0 R 1233 0 R 1238 0 R 1253 0 R 1270 0 R 1276 0 R 1283 0 R 1298 0 R 1303 0 R 1313 0 R 1325 0 R 1332 0 R 1343 0 R 1347 0 R 1350 0 R 1354 0 R 136
 6 0 R 1394 0 R 1410 0 R 1422 0 R 1432 0 R 1443 0 R 1451 0 R 1463 0 R 1480 0 R 1489 0 R 1533 0 R 1545 0 R 1555 0 R 1564 0 R 1572 0 R 1583 0 R 1594 0 R 1624 0 R 1634 0 R 1640 0 R 1647 0 R 1651 0 R 1661 0 R 1673 0 R 1677 0 R 1683 0 R 1694 0 R 1697 0 R 1703 0 R 1707 0 R 1711 0 R 1716 0 R 1724 0 R 1751 0 R 1769 0 R 1772 0 R 1785 0 R 1795 0 R 1811 0 R 1821 0 R 1833 0 R 1845 0 R 1855 0 R 1873 0 R 1882 0 R 1888 0 R 1895 0 R 1912 0 R 1917 0 R 1925 0 R 1931 0 R 1947 0 R 1955 0 R]
 >>
 endobj
 4 0 obj
@@ -78,13 +78,13 @@ endobj
 endobj
 8 0 obj
 << /Type /Font
-/BaseFont /AAAACG+NotoSerif
+/BaseFont /AAAABZ+NotoSerif
 /Subtype /TrueType
-/FontDescriptor 2280 0 R
+/FontDescriptor 2279 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 2282 0 R
-/ToUnicode 2281 0 R
+/Widths 2281 0 R
+/ToUnicode 2280 0 R
 >>
 endobj
 9 0 obj
@@ -1937,7 +1937,7 @@ endobj
 /F3.0 43 0 R
 >>
 >>
-/Annots [1961 0 R 1962 0 R 1963 0 R 1964 0 R 1965 0 R 1966 0 R 1967 0 R 1968 0 R 1969 0 R 1970 0 R 1971 0 R 1972 0 R 1973 0 R 1974 0 R 1975 0 R 1976 0 R 1977 0 R 1978 0 R 1979 0 R 1980 0 R 1981 0 R 1982 0 R 1983 0 R 1984 0 R 1985 0 R 1986 0 R 1987 0 R 1988 0 R 1989 0 R 1990 0 R 1991 0 R 1992 0 R 1993 0 R 1994 0 R 1995 0 R 1996 0 R 1997 0 R 1998 0 R 1999 0 R 2000 0 R 2001 0 R 2002 0 R 2003 0 R 2004 0 R 2005 0 R 2006 0 R 2007 0 R 2008 0 R 2009 0 R 2010 0 R 2011 0 R 2012 0 R 2013 0 R 2014 0 R 2015 0 R 2016 0 R 2017 0 R 2018 0 R 2019 0 R 2020 0 R 2021 0 R 2022 0 R 2023 0 R 2024 0 R 2025 0 R 2026 0 R 2027 0 R 2028 0 R 2029 0 R 2030 0 R 2031 0 R 2032 0 R 2033 0 R 2034 0 R 2035 0 R 2036 0 R 2037 0 R 2038 0 R 2039 0 R 2040 0 R 2041 0 R 2042 0 R 2043 0 R 2044 0 R 2045 0 R 2046 0 R 2047 0 R 2048 0 R 2049 0 R 2050 0 R 2051 0 R 2052 0 R 2053 0 R 2054 0 R 2055 0 R 2056 0 R 2057 0 R 2058 0 R 2059 0 R 2060 0 R 2061 0 R 2062 0 R 2063 0 R]
+/Annots [1960 0 R 1961 0 R 1962 0 R 1963 0 R 1964 0 R 1965 0 R 1966 0 R 1967 0 R 1968 0 R 1969 0 R 1970 0 R 1971 0 R 1972 0 R 1973 0 R 1974 0 R 1975 0 R 1976 0 R 1977 0 R 1978 0 R 1979 0 R 1980 0 R 1981 0 R 1982 0 R 1983 0 R 1984 0 R 1985 0 R 1986 0 R 1987 0 R 1988 0 R 1989 0 R 1990 0 R 1991 0 R 1992 0 R 1993 0 R 1994 0 R 1995 0 R 1996 0 R 1997 0 R 1998 0 R 1999 0 R 2000 0 R 2001 0 R 2002 0 R 2003 0 R 2004 0 R 2005 0 R 2006 0 R 2007 0 R 2008 0 R 2009 0 R 2010 0 R 2011 0 R 2012 0 R 2013 0 R 2014 0 R 2015 0 R 2016 0 R 2017 0 R 2018 0 R 2019 0 R 2020 0 R 2021 0 R 2022 0 R 2023 0 R 2024 0 R 2025 0 R 2026 0 R 2027 0 R 2028 0 R 2029 0 R 2030 0 R 2031 0 R 2032 0 R 2033 0 R 2034 0 R 2035 0 R 2036 0 R 2037 0 R 2038 0 R 2039 0 R 2040 0 R 2041 0 R 2042 0 R 2043 0 R 2044 0 R 2045 0 R 2046 0 R 2047 0 R 2048 0 R 2049 0 R 2050 0 R 2051 0 R 2052 0 R 2053 0 R 2054 0 R 2055 0 R 2056 0 R 2057 0 R 2058 0 R 2059 0 R 2060 0 R 2061 0 R 2062 0 R]
 >>
 endobj
 11 0 obj
@@ -3267,7 +3267,7 @@ ET
 
 BT
 174.4485 314.1959999999995 Td
-/F5.0 10.5 Tf
+/F4.0 10.5 Tf
 <d5> Tj
 ET
 
@@ -4061,10 +4061,10 @@ endobj
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F3.0 43 0 R
-/F5.0 59 0 R
+/F4.0 58 0 R
 >>
 >>
-/Annots [2064 0 R 2065 0 R 2066 0 R 2067 0 R 2068 0 R 2069 0 R 2070 0 R 2071 0 R 2072 0 R 2073 0 R 2074 0 R 2075 0 R 2076 0 R 2077 0 R 2078 0 R 2079 0 R 2080 0 R 2081 0 R 2082 0 R 2083 0 R 2084 0 R 2085 0 R 2086 0 R 2087 0 R 2088 0 R 2089 0 R 2090 0 R 2091 0 R 2092 0 R 2093 0 R 2094 0 R 2095 0 R 2096 0 R 2097 0 R 2098 0 R 2099 0 R 2100 0 R 2101 0 R 2102 0 R 2103 0 R 2104 0 R 2105 0 R 2106 0 R 2107 0 R 2108 0 R 2109 0 R 2110 0 R 2111 0 R 2112 0 R 2113 0 R 2114 0 R 2115 0 R 2116 0 R 2117 0 R 2118 0 R 2119 0 R 2120 0 R 2121 0 R 2122 0 R 2123 0 R 2124 0 R 2125 0 R 2126 0 R 2127 0 R 2128 0 R 2129 0 R 2130 0 R 2131 0 R 2132 0 R 2133 0 R 2134 0 R 2135 0 R 2136 0 R 2137 0 R 2138 0 R 2139 0 R 2140 0 R 2141 0 R 2142 0 R 2143 0 R 2144 0 R 2145 0 R 2146 0 R 2147 0 R 2148 0 R 2149 0 R 2150 0 R 2151 0 R 2152 0 R 2153 0 R 2154 0 R 2155 0 R 2156 0 R 2157 0 R 2158 0 R 2159 0 R 2160 0 R 2161 0 R 2162 0 R 2163 0 R 2164 0 R 2165 0 R 2166 0 R 2167 0 R 2168 0 R 2169 0 R 2170 0 R 2171 0 R 2172 0 R 2173 0 
 R 2174 0 R 2175 0 R 2176 0 R 2177 0 R 2178 0 R 2179 0 R 2180 0 R 2181 0 R 2182 0 R 2183 0 R 2184 0 R 2185 0 R 2186 0 R 2187 0 R]
+/Annots [2063 0 R 2064 0 R 2065 0 R 2066 0 R 2067 0 R 2068 0 R 2069 0 R 2070 0 R 2071 0 R 2072 0 R 2073 0 R 2074 0 R 2075 0 R 2076 0 R 2077 0 R 2078 0 R 2079 0 R 2080 0 R 2081 0 R 2082 0 R 2083 0 R 2084 0 R 2085 0 R 2086 0 R 2087 0 R 2088 0 R 2089 0 R 2090 0 R 2091 0 R 2092 0 R 2093 0 R 2094 0 R 2095 0 R 2096 0 R 2097 0 R 2098 0 R 2099 0 R 2100 0 R 2101 0 R 2102 0 R 2103 0 R 2104 0 R 2105 0 R 2106 0 R 2107 0 R 2108 0 R 2109 0 R 2110 0 R 2111 0 R 2112 0 R 2113 0 R 2114 0 R 2115 0 R 2116 0 R 2117 0 R 2118 0 R 2119 0 R 2120 0 R 2121 0 R 2122 0 R 2123 0 R 2124 0 R 2125 0 R 2126 0 R 2127 0 R 2128 0 R 2129 0 R 2130 0 R 2131 0 R 2132 0 R 2133 0 R 2134 0 R 2135 0 R 2136 0 R 2137 0 R 2138 0 R 2139 0 R 2140 0 R 2141 0 R 2142 0 R 2143 0 R 2144 0 R 2145 0 R 2146 0 R 2147 0 R 2148 0 R 2149 0 R 2150 0 R 2151 0 R 2152 0 R 2153 0 R 2154 0 R 2155 0 R 2156 0 R 2157 0 R 2158 0 R 2159 0 R 2160 0 R 2161 0 R 2162 0 R 2163 0 R 2164 0 R 2165 0 R 2166 0 R 2167 0 R 2168 0 R 2169 0 R 2170 0 R 2171 0 R 2172 0 
 R 2173 0 R 2174 0 R 2175 0 R 2176 0 R 2177 0 R 2178 0 R 2179 0 R 2180 0 R 2181 0 R 2182 0 R 2183 0 R 2184 0 R 2185 0 R 2186 0 R]
 >>
 endobj
 13 0 obj
@@ -4179,7 +4179,7 @@ endobj
 /F3.0 43 0 R
 >>
 >>
-/Annots [2188 0 R 2189 0 R 2190 0 R 2191 0 R 2192 0 R]
+/Annots [2187 0 R 2188 0 R 2189 0 R 2190 0 R 2191 0 R]
 >>
 endobj
 15 0 obj
@@ -4786,7 +4786,7 @@ endobj
 /Font << /F2.0 20 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 2193 0 R
+/XObject << /Stamp1 2192 0 R
 >>
 >>
 /Annots [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 33 0 R 34 0 R 35 0 R 36 0 R]
@@ -4801,18 +4801,18 @@ endobj
 >>
 endobj
 19 0 obj
-<< /Kids [1456 0 R 1457 0 R]
+<< /Kids [1455 0 R 1456 0 R]
 >>
 endobj
 20 0 obj
 << /Type /Font
-/BaseFont /AAAACH+NotoSerif-Bold
+/BaseFont /AAAACA+NotoSerif-Bold
 /Subtype /TrueType
-/FontDescriptor 2284 0 R
+/FontDescriptor 2283 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 2286 0 R
-/ToUnicode 2285 0 R
+/Widths 2285 0 R
+/ToUnicode 2284 0 R
 >>
 endobj
 21 0 obj
@@ -5376,7 +5376,7 @@ endobj
 /F3.0 43 0 R
 >>
 /XObject << /I1 41 0 R
-/Stamp1 2193 0 R
+/Stamp1 2192 0 R
 >>
 >>
 /Annots [42 0 R 44 0 R 45 0 R 46 0 R 47 0 R 48 0 R]
@@ -5515,13 +5515,13 @@ endobj
 endobj
 43 0 obj
 << /Type /Font
-/BaseFont /AAAACI+mplus1mn-regular
+/BaseFont /AAAACB+mplus1mn-regular
 /Subtype /TrueType
-/FontDescriptor 2288 0 R
+/FontDescriptor 2287 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 2290 0 R
-/ToUnicode 2289 0 R
+/Widths 2289 0 R
+/ToUnicode 2288 0 R
 >>
 endobj
 44 0 obj
@@ -5574,7 +5574,7 @@ endobj
 >>
 endobj
 49 0 obj
-<< /Length 27848
+<< /Length 28700
 >>
 stream
 q
@@ -5849,12 +5849,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24 454.5650000000001 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -5871,12 +5871,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 454.5650000000001 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -5893,12 +5893,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 454.5650000000001 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <437573746f6d6572> Tj
 ET
 
@@ -5937,12 +5937,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 425.0850000000001 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -5959,12 +5959,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 425.0850000000001 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <766f6964> Tj
 ET
 
@@ -6014,8 +6014,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 207.74 425.0850000000001 Td
@@ -6069,8 +6069,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 295.74 425.0850000000001 Td
@@ -6146,8 +6146,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 103.24000000000001 410.3450000000001 Td
@@ -6168,8 +6168,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 130.74 410.3450000000001 Td
@@ -6245,8 +6245,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 202.24 410.3450000000001 Td
@@ -6267,8 +6267,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 268.24 410.3450000000001 Td
@@ -6300,8 +6300,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 103.24000000000001 395.6050000000001 Td
@@ -6322,8 +6322,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 130.74 395.6050000000001 Td
@@ -6399,8 +6399,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 207.74 395.6050000000001 Td
@@ -6421,8 +6421,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 273.74 395.6050000000001 Td
@@ -6476,8 +6476,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 174.74 380.8650000000001 Td
@@ -6515,7 +6515,29 @@ ET
 BT
 284.74 380.8650000000001 Td
 /F3.0 11 Tf
-<28292c> Tj
+<28> 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
+290.24 380.8650000000001 Td
+/F3.0 11 Tf
+<29> 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
+295.74 380.8650000000001 Td
+/F3.0 11 Tf
+<2c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6647,7 +6669,18 @@ ET
 BT
 427.74 380.8650000000001 Td
 /F3.0 11 Tf
-<293b> Tj
+<29> 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
+433.24 380.8650000000001 Td
+/F3.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6685,12 +6718,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 351.3850000000001 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -6707,12 +6740,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 351.3850000000001 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <626f6f6c65616e> Tj
 ET
 
@@ -6746,7 +6779,18 @@ ET
 BT
 235.24 351.3850000000001 Td
 /F3.0 11 Tf
-<2829> Tj
+<28> 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
+240.74 351.3850000000001 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6784,12 +6828,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 103.24000000000001 336.6450000000001 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <72657475726e> Tj
 ET
 
@@ -6839,8 +6883,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 218.74 336.6450000000001 Td
@@ -6856,7 +6900,29 @@ ET
 BT
 284.74 336.6450000000001 Td
 /F3.0 11 Tf
-<28293b> Tj
+<28> 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
+290.24 336.6450000000001 Td
+/F3.0 11 Tf
+<29> 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
+295.74 336.6450000000001 Td
+/F3.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6894,8 +6960,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 292.42500000000007 Td
@@ -7299,7 +7365,7 @@ ET
 
 BT
 243.01108333333332 84.60600000000008 Td
-/F5.0 10.5 Tf
+/F4.0 10.5 Tf
 <c9> Tj
 ET
 
@@ -7383,7 +7449,7 @@ ET
 
 BT
 147.99 68.82600000000008 Td
-/F5.0 10.5 Tf
+/F4.0 10.5 Tf
 <c9> Tj
 ET
 
@@ -7444,14 +7510,13 @@ endobj
 /Font << /F2.0 20 0 R
 /F1.0 8 0 R
 /F3.0 43 0 R
-/F4.0 54 0 R
-/F3.1 55 0 R
-/F5.0 59 0 R
+/F3.1 54 0 R
+/F4.0 58 0 R
 >>
-/XObject << /Stamp1 2193 0 R
+/XObject << /Stamp1 2192 0 R
 >>
 >>
-/Annots [52 0 R 56 0 R 57 0 R 58 0 R 60 0 R]
+/Annots [52 0 R 55 0 R 56 0 R 57 0 R 59 0 R]
 >>
 endobj
 51 0 obj
@@ -7473,27 +7538,16 @@ endobj
 endobj
 54 0 obj
 << /Type /Font
-/BaseFont /AAAACJ+mplus1mn-bold
+/BaseFont /AAAACC+mplus1mn-regular
 /Subtype /TrueType
-/FontDescriptor 2292 0 R
+/FontDescriptor 2291 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 2294 0 R
-/ToUnicode 2293 0 R
+/Widths 2293 0 R
+/ToUnicode 2292 0 R
 >>
 endobj
 55 0 obj
-<< /Type /Font
-/BaseFont /AAAACK+mplus1mn-regular
-/Subtype /TrueType
-/FontDescriptor 2296 0 R
-/FirstChar 32
-/LastChar 255
-/Widths 2298 0 R
-/ToUnicode 2297 0 R
->>
-endobj
-56 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_api_FactoryService)
 /Subtype /Link
@@ -7501,7 +7555,7 @@ endobj
 /Type /Annot
 >>
 endobj
-57 0 obj
+56 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_api_DomainObjectContainer)
 /Subtype /Link
@@ -7509,7 +7563,7 @@ endobj
 /Type /Annot
 >>
 endobj
-58 0 obj
+57 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_api_ServiceRegistry)
 /Subtype /Link
@@ -7517,18 +7571,18 @@ endobj
 /Type /Annot
 >>
 endobj
-59 0 obj
+58 0 obj
 << /Type /Font
-/BaseFont /AAAACL+mplus-1p-regular
+/BaseFont /AAAACD+mplus-1p-regular
 /Subtype /TrueType
-/FontDescriptor 2300 0 R
+/FontDescriptor 2295 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 2302 0 R
-/ToUnicode 2301 0 R
+/Widths 2297 0 R
+/ToUnicode 2296 0 R
 >>
 endobj
-60 0 obj
+59 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_api_DomainObjectContainer)
 /Subtype /Link
@@ -7536,8 +7590,8 @@ endobj
 /Type /Annot
 >>
 endobj
-61 0 obj
-<< /Length 16247
+60 0 obj
+<< /Length 16962
 >>
 stream
 q
@@ -7689,7 +7743,7 @@ Q
 
 BT
 76.73933333333333 631.46 Td
-/F6.1 24 Tf
+/F5.1 24 Tf
 <21> Tj
 ET
 
@@ -7885,8 +7939,8 @@ f
 h
 S
 Q
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 59.24000000000001 533.9850000000001 Td
@@ -7984,8 +8038,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 240.74 519.2450000000001 Td
@@ -8006,8 +8060,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 59.24000000000001 489.76500000000004 Td
@@ -8083,13 +8137,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 169.24 475.02500000000003 Td
 /F3.0 11 Tf
-<223122> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+174.74 475.02500000000003 Td
+/F3.0 11 Tf
+<31> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+180.24 475.02500000000003 Td
+/F3.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -8127,12 +8203,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24000000000001 445.5450000000001 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -8149,12 +8225,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 445.5450000000001 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -8171,12 +8247,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 445.5450000000001 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <4d794c6f63616c6550726f7669646572> Tj
 ET
 
@@ -8193,12 +8269,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 224.24 445.5450000000001 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <696d706c656d656e7473> Tj
 ET
 
@@ -8259,8 +8335,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 430.80500000000006 Td
@@ -8281,12 +8357,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 416.06500000000005 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -8303,8 +8379,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 416.06500000000005 Td
@@ -8342,7 +8418,18 @@ ET
 BT
 207.74 416.06500000000005 Td
 /F3.0 11 Tf
-<2829> Tj
+<28> 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.24 416.06500000000005 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -8380,12 +8467,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 103.24000000000001 401.32500000000005 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <72657475726e> Tj
 ET
 
@@ -8408,7 +8495,29 @@ ET
 BT
 141.74 401.32500000000005 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+147.24 401.32500000000005 Td
+/F3.0 11 Tf
+<2e> 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
+152.74 401.32500000000005 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -8578,29 +8687,28 @@ Q
 
 endstream
 endobj
-62 0 obj
+61 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 61 0 R
+/Contents 60 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 20 0 R
 /F1.0 8 0 R
 /F3.0 43 0 R
-/F6.1 65 0 R
-/F3.1 55 0 R
-/F4.0 54 0 R
+/F5.1 64 0 R
+/F3.1 54 0 R
 >>
-/XObject << /Stamp1 2193 0 R
+/XObject << /Stamp1 2192 0 R
 >>
 >>
-/Annots [64 0 R 66 0 R 67 0 R 68 0 R 69 0 R]
+/Annots [63 0 R 65 0 R 66 0 R 67 0 R 68 0 R]
 >>
 endobj
-63 0 obj
-[62 0 R /XYZ 0 841.89 null]
+62 0 obj
+[61 0 R /XYZ 0 841.89 null]
 endobj
-64 0 obj
+63 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -8611,18 +8719,18 @@ endobj
 /Type /Annot
 >>
 endobj
-65 0 obj
+64 0 obj
 << /Type /Font
-/BaseFont /AAAACM+FontAwesome
+/BaseFont /AAAACE+FontAwesome
 /Subtype /TrueType
-/FontDescriptor 2304 0 R
+/FontDescriptor 2299 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 2306 0 R
-/ToUnicode 2305 0 R
+/Widths 2301 0 R
+/ToUnicode 2300 0 R
 >>
 endobj
-66 0 obj
+65 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_ContentMappingService)
 /Subtype /Link
@@ -8630,7 +8738,7 @@ endobj
 /Type /Annot
 >>
 endobj
-67 0 obj
+66 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_GridSystemService)
 /Subtype /Link
@@ -8638,7 +8746,7 @@ endobj
 /Type /Annot
 >>
 endobj
-68 0 obj
+67 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_RoutingService)
 /Subtype /Link
@@ -8646,7 +8754,7 @@ endobj
 /Type /Annot
 >>
 endobj
-69 0 obj
+68 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_api_LocaleProvider)
 /Subtype /Link
@@ -8654,8 +8762,8 @@ endobj
 /Type /Annot
 >>
 endobj
-70 0 obj
-<< /Length 24045
+69 0 obj
+<< /Length 25629
 >>
 stream
 q
@@ -8689,9 +8797,9 @@ h
 S
 Q
 /DeviceRGB cs
-0.333 0.333 0.333 scn
+0.600 0.600 1.000 scn
 /DeviceRGB CS
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 SCN
 
 BT
 59.24 783.0649999999999 Td
@@ -8756,8 +8864,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 268.24 783.0649999999999 Td
@@ -8778,8 +8886,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 59.24 768.3249999999999 Td
@@ -8855,13 +8963,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 169.24 753.585 Td
 /F3.0 11 Tf
-<223122> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+174.74 753.585 Td
+/F3.0 11 Tf
+<31> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+180.24 753.585 Td
+/F3.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -8897,12 +9027,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24 709.365 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -8919,12 +9049,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 709.365 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -8941,12 +9071,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 709.365 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <4d794c6f63616c6550726f7669646572> Tj
 ET
 
@@ -8963,12 +9093,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 224.24 709.365 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <696d706c656d656e7473> Tj
 ET
 
@@ -9029,8 +9159,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 694.625 Td
@@ -9051,12 +9181,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 679.885 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -9073,8 +9203,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 679.885 Td
@@ -9112,7 +9242,18 @@ ET
 BT
 207.74 679.885 Td
 /F3.0 11 Tf
-<2829> Tj
+<28> 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.24 679.885 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9150,12 +9291,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 103.24000000000001 665.145 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <72657475726e> Tj
 ET
 
@@ -9189,13 +9330,35 @@ ET
 BT
 279.24 665.145 Td
 /F3.0 11 Tf
-<28292e> Tj
+<28> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+284.74 665.145 Td
+/F3.0 11 Tf
+<29> 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
+290.24 665.145 Td
+/F3.0 11 Tf
+<2e> 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
 295.74 665.145 Td
@@ -9211,7 +9374,29 @@ ET
 BT
 345.24 665.145 Td
 /F3.0 11 Tf
-<28293b> Tj
+<28> 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
+350.74 665.145 Td
+/F3.0 11 Tf
+<29> 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
+356.24 665.145 Td
+/F3.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9269,12 +9454,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 620.925 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <70726976617465> Tj
 ET
 
@@ -9330,7 +9515,18 @@ ET
 BT
 345.24 620.925 Td
 /F3.0 11 Tf
-<2829> Tj
+<28> 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
+350.74 620.925 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9368,12 +9564,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 103.24000000000001 606.185 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <72657475726e> Tj
 ET
 
@@ -9412,8 +9608,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 196.74 606.185 Td
@@ -9495,7 +9691,18 @@ ET
 BT
 367.24 606.185 Td
 /F3.0 11 Tf
-<2d3e> Tj
+<2d> 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
+372.74 606.185 Td
+/F3.0 11 Tf
+<3e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9555,12 +9762,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 433.24 606.185 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <74686973> Tj
 ET
 
@@ -9572,13 +9779,24 @@ ET
 BT
 455.24 606.185 Td
 /F3.0 11 Tf
-<292e> Tj
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+460.74 606.185 Td
+/F3.0 11 Tf
+<2e> 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
 466.24 606.185 Td
@@ -9594,7 +9812,29 @@ ET
 BT
 499.24 606.185 Td
 /F3.0 11 Tf
-<28293b> Tj
+<28> 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
+504.74 606.185 Td
+/F3.0 11 Tf
+<29> 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
+510.24 606.185 Td
+/F3.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9652,8 +9892,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 561.9649999999999 Td
@@ -9674,8 +9914,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 81.24000000000001 547.2249999999999 Td
@@ -9853,7 +10093,7 @@ ET
 
 BT
 259.605 442.306 Td
-/F7.0 10.5 Tf
+/F6.0 10.5 Tf
 <74686973> Tj
 ET
 
@@ -10270,40 +10510,39 @@ Q
 
 endstream
 endobj
-71 0 obj
+70 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 70 0 R
+/Contents 69 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F3.0 43 0 R
-/F3.1 55 0 R
-/F4.0 54 0 R
+/F3.1 54 0 R
 /F1.0 8 0 R
-/F7.0 72 0 R
+/F6.0 71 0 R
 /F2.0 20 0 R
 >>
-/XObject << /Stamp1 2193 0 R
+/XObject << /Stamp1 2192 0 R
 >>
 >>
-/Annots [74 0 R 75 0 R]
+/Annots [73 0 R 74 0 R]
 >>
 endobj
-72 0 obj
+71 0 obj
 << /Type /Font
-/BaseFont /AAAACN+NotoSerif-Italic
+/BaseFont /AAAACF+NotoSerif-Italic
 /Subtype /TrueType
-/FontDescriptor 2308 0 R
+/FontDescriptor 2303 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 2310 0 R
-/ToUnicode 2309 0 R
+/Widths 2305 0 R
+/ToUnicode 2304 0 R
 >>
 endobj
-73 0 obj
-[71 0 R /XYZ 0 361.15000000000003 null]
+72 0 obj
+[70 0 R /XYZ 0 361.15000000000003 null]
 endobj
-74 0 obj
+73 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_api_CommandContext)
 /Subtype /Link
@@ -10311,7 +10550,7 @@ endobj
 /Type /Annot
 >>
 endobj
-75 0 obj
+74 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_CommandService)
 /Subtype /Link
@@ -10319,7 +10558,7 @@ endobj
 /Type /Annot
 >>
 endobj
-76 0 obj
+75 0 obj
 << /Length 27055
 >>
 stream
@@ -10363,7 +10602,7 @@ ET
 
 BT
 66.24000000000001 778.896 Td
-/F5.0 10.5 Tf
+/F4.0 10.5 Tf
 <c9> Tj
 ET
 
@@ -10423,7 +10662,7 @@ ET
 
 BT
 194.19086666666666 778.896 Td
-/F5.0 10.5 Tf
+/F4.0 10.5 Tf
 <c9> Tj
 ET
 
@@ -11304,7 +11543,7 @@ Q
 
 BT
 93.98933333333333 299.78 Td
-/F6.1 24 Tf
+/F5.1 24 Tf
 <21> Tj
 ET
 
@@ -12015,24 +12254,24 @@ Q
 
 endstream
 endobj
-77 0 obj
+76 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 76 0 R
+/Contents 75 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F3.0 43 0 R
-/F5.0 59 0 R
-/F6.1 65 0 R
+/F4.0 58 0 R
+/F5.1 64 0 R
 >>
-/XObject << /Stamp1 2193 0 R
+/XObject << /Stamp1 2192 0 R
 >>
 >>
-/Annots [78 0 R 79 0 R 80 0 R 81 0 R 82 0 R 83 0 R 84 0 R 85 0 R 86 0 R 87 0 R 88 0 R 89 0 R 90 0 R 91 0 R 92 0 R 93 0 R 94 0 R 95 0 R 96 0 R 97 0 R 98 0 R 99 0 R 100 0 R 101 0 R 102 0 R 103 0 R 104 0 R]
+/Annots [77 0 R 78 0 R 79 0 R 80 0 R 81 0 R 82 0 R 83 0 R 84 0 R 85 0 R 86 0 R 87 0 R 88 0 R 89 0 R 90 0 R 91 0 R 92 0 R 93 0 R 94 0 R 95 0 R 96 0 R 97 0 R 98 0 R 99 0 R 100 0 R 101 0 R 102 0 R 103 0 R]
 >>
 endobj
-78 0 obj
+77 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -12043,7 +12282,7 @@ endobj
 /Type /Annot
 >>
 endobj
-79 0 obj
+78 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -12054,7 +12293,7 @@ endobj
 /Type /Annot
 >>
 endobj
-80 0 obj
+79 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -12065,7 +12304,7 @@ endobj
 /Type /Annot
 >>
 endobj
-81 0 obj
+80 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -12076,7 +12315,7 @@ endobj
 /Type /Annot
 >>
 endobj
-82 0 obj
+81 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -12087,7 +12326,7 @@ endobj
 /Type /Annot
 >>
 endobj
-83 0 obj
+82 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -12098,7 +12337,7 @@ endobj
 /Type /Annot
 >>
 endobj
-84 0 obj
+83 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_api_InteractionContext)
 /Subtype /Link
@@ -12106,7 +12345,7 @@ endobj
 /Type /Annot
 >>
 endobj
-85 0 obj
+84 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_api_WrapperFactory)
 /Subtype /Link
@@ -12114,7 +12353,7 @@ endobj
 /Type /Annot
 >>
 endobj
-86 0 obj
+85 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -12125,7 +12364,7 @@ endobj
 /Type /Annot
 >>
 endobj
-87 0 obj
+86 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -12136,7 +12375,7 @@ endobj
 /Type /Annot
 >>
 endobj
-88 0 obj
+87 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -12147,7 +12386,7 @@ endobj
 /Type /Annot
 >>
 endobj
-89 0 obj
+88 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -12158,7 +12397,7 @@ endobj
 /Type /Annot
 >>
 endobj
-90 0 obj
+89 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_api_MetricsService)
 /Subtype /Link
@@ -12166,7 +12405,7 @@ endobj
 /Type /Annot
 >>
 endobj
-91 0 obj
+90 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -12177,7 +12416,7 @@ endobj
 /Type /Annot
 >>
 endobj
-92 0 obj
+91 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -12188,7 +12427,7 @@ endobj
 /Type /Annot
 >>
 endobj
-93 0 obj
+92 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -12199,7 +12438,7 @@ endobj
 /Type /Annot
 >>
 endobj
-94 0 obj
+93 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_PublishingService)
 /Subtype /Link
@@ -12207,7 +12446,7 @@ endobj
 /Type /Annot
 >>
 endobj
-95 0 obj
+94 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_PublisherService)
 /Subtype /Link
@@ -12215,7 +12454,7 @@ endobj
 /Type /Annot
 >>
 endobj
-96 0 obj
+95 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -12226,7 +12465,7 @@ endobj
 /Type /Annot
 >>
 endobj
-97 0 obj
+96 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -12237,7 +12476,7 @@ endobj
 /Type /Annot
 >>
 endobj
-98 0 obj
+97 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_api_TransactionService)
 /Subtype /Link
@@ -12245,7 +12484,7 @@ endobj
 /Type /Annot
 >>
 endobj
-99 0 obj
+98 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_AuditerService)
 /Subtype /Link
@@ -12253,7 +12492,7 @@ endobj
 /Type /Annot
 >>
 endobj
-100 0 obj
+99 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_AuditingService)
 /Subtype /Link
@@ -12261,7 +12500,7 @@ endobj
 /Type /Annot
 >>
 endobj
-101 0 obj
+100 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -12272,7 +12511,7 @@ endobj
 /Type /Annot
 >>
 endobj
-102 0 obj
+101 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_CommandService)
 /Subtype /Link
@@ -12280,7 +12519,7 @@ endobj
 /Type /Annot
 >>
 endobj
-103 0 obj
+102 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -12291,7 +12530,7 @@ endobj
 /Type /Annot
 >>
 endobj
-104 0 obj
+103 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_PublisherService)
 /Subtype /Link
@@ -12299,7 +12538,7 @@ endobj
 /Type /Annot
 >>
 endobj
-105 0 obj
+104 0 obj
 << /Length 3454
 >>
 stream
@@ -12502,22 +12741,22 @@ Q
 
 endstream
 endobj
-106 0 obj
+105 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 105 0 R
+/Contents 104 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F3.0 43 0 R
 >>
-/XObject << /Stamp1 2193 0 R
+/XObject << /Stamp1 2192 0 R
 >>
 >>
-/Annots [107 0 R 108 0 R 109 0 R]
+/Annots [106 0 R 107 0 R 108 0 R]
 >>
 endobj
-107 0 obj
+106 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_PublisherService)
 /Subtype /Link
@@ -12525,7 +12764,7 @@ endobj
 /Type /Annot
 >>
 endobj
-108 0 obj
+107 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -12536,7 +12775,7 @@ endobj
 /Type /Annot
 >>
 endobj
-109 0 obj
+108 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -12547,7 +12786,7 @@ endobj
 /Type /Annot
 >>
 endobj
-110 0 obj
+109 0 obj
 << /Length 17766
 >>
 stream
@@ -12644,7 +12883,7 @@ ET
 
 BT
 48.24 666.086 Td
-/F7.0 10.5 Tf
+/F6.0 10.5 Tf
 [<54> 29.78515625 <61626c6520312e2050726573656e746174696f6e204c61> 20.01953125 <79657220535049>] TJ
 ET
 
@@ -13789,27 +14028,27 @@ Q
 
 endstream
 endobj
-111 0 obj
+110 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 110 0 R
+/Contents 109 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 20 0 R
 /F1.0 8 0 R
-/F7.0 72 0 R
+/F6.0 71 0 R
 /F3.0 43 0 R
 >>
-/XObject << /Stamp1 2193 0 R
+/XObject << /Stamp1 2192 0 R
 >>
 >>
-/Annots [113 0 R 114 0 R 115 0 R 116 0 R 117 0 R 118 0 R 119 0 R 120 0 R 121 0 R 122 0 R 123 0 R 124 0 R 125 0 R 126 0 R 127 0 R 128 0 R 129 0 R 130 0 R]
+/Annots [112 0 R 113 0 R 114 0 R 115 0 R 116 0 R 117 0 R 118 0 R 119 0 R 120 0 R 121 0 R 122 0 R 123 0 R 124 0 R 125 0 R 126 0 R 127 0 R 128 0 R 129 0 R]
 >>
 endobj
-112 0 obj
-[111 0 R /XYZ 0 841.89 null]
+111 0 obj
+[110 0 R /XYZ 0 841.89 null]
 endobj
-113 0 obj
+112 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -13820,7 +14059,7 @@ endobj
 /Type /Annot
 >>
 endobj
-114 0 obj
+113 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_ContentMappingService)
 /Subtype /Link
@@ -13828,7 +14067,7 @@ endobj
 /Type /Annot
 >>
 endobj
-115 0 obj
+114 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_ContentMappingService)
 /Subtype /Link
@@ -13836,7 +14075,7 @@ endobj
 /Type /Annot
 >>
 endobj
-116 0 obj
+115 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_ContentMappingService)
 /Subtype /Link
@@ -13844,7 +14083,7 @@ endobj
 /Type /Annot
 >>
 endobj
-117 0 obj
+116 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_ContentMappingService)
 /Subtype /Link
@@ -13852,7 +14091,7 @@ endobj
 /Type /Annot
 >>
 endobj
-118 0 obj
+117 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_ContentMappingService)
 /Subtype /Link
@@ -13860,7 +14099,7 @@ endobj
 /Type /Annot
 >>
 endobj
-119 0 obj
+118 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_EmailNotificationService)
 /Subtype /Link
@@ -13868,7 +14107,7 @@ endobj
 /Type /Annot
 >>
 endobj
-120 0 obj
+119 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_EmailNotificationService)
 /Subtype /Link
@@ -13876,7 +14115,7 @@ endobj
 /Type /Annot
 >>
 endobj
-121 0 obj
+120 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_EmailNotificationService)
 /Subtype /Link
@@ -13884,7 +14123,7 @@ endobj
 /Type /Annot
 >>
 endobj
-122 0 obj
+121 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_EmailNotificationService)
 /Subtype /Link
@@ -13892,7 +14131,7 @@ endobj
 /Type /Annot
 >>
 endobj
-123 0 obj
+122 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_EmailNotificationService)
 /Subtype /Link
@@ -13900,7 +14139,7 @@ endobj
 /Type /Annot
 >>
 endobj
-124 0 obj
+123 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_EmailNotificationService)
 /Subtype /Link
@@ -13908,7 +14147,7 @@ endobj
 /Type /Annot
 >>
 endobj
-125 0 obj
+124 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_UserRegistrationService)
 /Subtype /Link
@@ -13916,7 +14155,7 @@ endobj
 /Type /Annot
 >>
 endobj
-126 0 obj
+125 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_ErrorReportingService)
 /Subtype /Link
@@ -13924,7 +14163,7 @@ endobj
 /Type /Annot
 >>
 endobj
-127 0 obj
+126 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_ErrorReportingService)
 /Subtype /Link
@@ -13932,7 +14171,7 @@ endobj
 /Type /Annot
 >>
 endobj
-128 0 obj
+127 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_ErrorReportingService)
 /Subtype /Link
@@ -13940,7 +14179,7 @@ endobj
 /Type /Annot
 >>
 endobj
-129 0 obj
+128 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_ErrorReportingService)
 /Subtype /Link
@@ -13948,7 +14187,7 @@ endobj
 /Type /Annot
 >>
 endobj
-130 0 obj
+129 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_ErrorReportingService)
 /Subtype /Link
@@ -13956,7 +14195,7 @@ endobj
 /Type /Annot
 >>
 endobj
-131 0 obj
+130 0 obj
 << /Length 28878
 >>
 stream
@@ -16017,23 +16256,23 @@ Q
 
 endstream
 endobj
-132 0 obj
+131 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 131 0 R
+/Contents 130 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 20 0 R
 /F3.0 43 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 2193 0 R
+/XObject << /Stamp1 2192 0 R
 >>
 >>
-/Annots [133 0 R 134 0 R 135 0 R 136 0 R 137 0 R 138 0 R 139 0 R 140 0 R 141 0 R 142 0 R 143 0 R 144 0 R 145 0 R 146 0 R 147 0 R 148 0 R 149 0 R 150 0 R 151 0 R 152 0 R 153 0 R 154 0 R 155 0 R 156 0 R 157 0 R 158 0 R 159 0 R 160 0 R 161 0 R 162 0 R 163 0 R 164 0 R 165 0 R]
+/Annots [132 0 R 133 0 R 134 0 R 135 0 R 136 0 R 137 0 R 138 0 R 139 0 R 140 0 R 141 0 R 142 0 R 143 0 R 144 0 R 145 0 R 146 0 R 147 0 R 148 0 R 149 0 R 150 0 R 151 0 R 152 0 R 153 0 R 154 0 R 155 0 R 156 0 R 157 0 R 158 0 R 159 0 R 160 0 R 161 0 R 162 0 R 163 0 R 164 0 R]
 >>
 endobj
-133 0 obj
+132 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_ExceptionRecognizer)
 /Subtype /Link
@@ -16041,7 +16280,7 @@ endobj
 /Type /Annot
 >>
 endobj
-134 0 obj
+133 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_ExceptionRecognizer)
 /Subtype /Link
@@ -16049,7 +16288,7 @@ endobj
 /Type /Annot
 >>
 endobj
-135 0 obj
+134 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_ExceptionRecognizer)
 /Subtype /Link
@@ -16057,7 +16296,7 @@ endobj
 /Type /Annot
 >>
 endobj
-136 0 obj
+135 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_ExceptionRecognizer)
 /Subtype /Link
@@ -16065,7 +16304,7 @@ endobj
 /Type /Annot
 >>
 endobj
-137 0 obj
+136 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_ExceptionRecognizer)
 /Subtype /Link
@@ -16073,7 +16312,7 @@ endobj
 /Type /Annot
 >>
 endobj
-138 0 obj
+137 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_GridSystemService)
 /Subtype /Link
@@ -16081,7 +16320,7 @@ endobj
 /Type /Annot
 >>
 endobj
-139 0 obj
+138 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_GridSystemService)
 /Subtype /Link
@@ -16089,7 +16328,7 @@ endobj
 /Type /Annot
 >>
 endobj
-140 0 obj
+139 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_GridSystemService)
 /Subtype /Link
@@ -16097,7 +16336,7 @@ endobj
 /Type /Annot
 >>
 endobj
-141 0 obj
+140 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_GridSystemService)
 /Subtype /Link
@@ -16105,7 +16344,7 @@ endobj
 /Type /Annot
 >>
 endobj
-142 0 obj
+141 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_GridSystemService)
 /Subtype /Link
@@ -16113,7 +16352,7 @@ endobj
 /Type /Annot
 >>
 endobj
-143 0 obj
+142 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_GridLoaderService)
 /Subtype /Link
@@ -16121,7 +16360,7 @@ endobj
 /Type /Annot
 >>
 endobj
-144 0 obj
+143 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_GridLoaderService)
 /Subtype /Link
@@ -16129,7 +16368,7 @@ endobj
 /Type /Annot
 >>
 endobj
-145 0 obj
+144 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_GridLoaderService)
 /Subtype /Link
@@ -16137,7 +16376,7 @@ endobj
 /Type /Annot
 >>
 endobj
-146 0 obj
+145 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_GridLoaderService)
 /Subtype /Link
@@ -16145,7 +16384,7 @@ endobj
 /Type /Annot
 >>
 endobj
-147 0 obj
+146 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_GridLoaderService)
 /Subtype /Link
@@ -16153,7 +16392,7 @@ endobj
 /Type /Annot
 >>
 endobj
-148 0 obj
+147 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_GridService)
 /Subtype /Link
@@ -16161,7 +16400,7 @@ endobj
 /Type /Annot
 >>
 endobj
-149 0 obj
+148 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_GridService)
 /Subtype /Link
@@ -16169,7 +16408,7 @@ endobj
 /Type /Annot
 >>
 endobj
-150 0 obj
+149 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_GridService)
 /Subtype /Link
@@ -16177,7 +16416,7 @@ endobj
 /Type /Annot
 >>
 endobj
-151 0 obj
+150 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_GridService)
 /Subtype /Link
@@ -16185,7 +16424,7 @@ endobj
 /Type /Annot
 >>
 endobj
-152 0 obj
+151 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_GridService)
 /Subtype /Link
@@ -16193,7 +16432,7 @@ endobj
 /Type /Annot
 >>
 endobj
-153 0 obj
+152 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_GridLoaderService)
 /Subtype /Link
@@ -16201,7 +16440,7 @@ endobj
 /Type /Annot
 >>
 endobj
-154 0 obj
+153 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_GridSystemService)
 /Subtype /Link
@@ -16209,7 +16448,7 @@ endobj
 /Type /Annot
 >>
 endobj
-155 0 obj
+154 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_HintStore)
 /Subtype /Link
@@ -16217,7 +16456,7 @@ endobj
 /Type /Annot
 >>
 endobj
-156 0 obj
+155 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_HintStore)
 /Subtype /Link
@@ -16225,7 +16464,7 @@ endobj
 /Type /Annot
 >>
 endobj
-157 0 obj
+156 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_HintStore)
 /Subtype /Link
@@ -16233,7 +16472,7 @@ endobj
 /Type /Annot
 >>
 endobj
-158 0 obj
+157 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_HintStore)
 /Subtype /Link
@@ -16241,7 +16480,7 @@ endobj
 /Type /Annot
 >>
 endobj
-159 0 obj
+158 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_HintStore)
 /Subtype /Link
@@ -16249,7 +16488,7 @@ endobj
 /Type /Annot
 >>
 endobj
-160 0 obj
+159 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_LocaleProvider)
 /Subtype /Link
@@ -16257,7 +16496,7 @@ endobj
 /Type /Annot
 >>
 endobj
-161 0 obj
+160 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_LocaleProvider)
 /Subtype /Link
@@ -16265,7 +16504,7 @@ endobj
 /Type /Annot
 >>
 endobj
-162 0 obj
+161 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_LocaleProvider)
 /Subtype /Link
@@ -16273,7 +16512,7 @@ endobj
 /Type /Annot
 >>
 endobj
-163 0 obj
+162 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_LocaleProvider)
 /Subtype /Link
@@ -16281,7 +16520,7 @@ endobj
 /Type /Annot
 >>
 endobj
-164 0 obj
+163 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_LocaleProvider)
 /Subtype /Link
@@ -16289,7 +16528,7 @@ endobj
 /Type /Annot
 >>
 endobj
-165 0 obj
+164 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_TranslationService)
 /Subtype /Link
@@ -16297,7 +16536,7 @@ endobj
 /Type /Annot
 >>
 endobj
-166 0 obj
+165 0 obj
 << /Length 23013
 >>
 stream
@@ -17962,23 +18201,23 @@ Q
 
 endstream
 endobj
-167 0 obj
+166 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 166 0 R
+/Contents 165 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 20 0 R
 /F3.0 43 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 2193 0 R
+/XObject << /Stamp1 2192 0 R
 >>
 >>
-/Annots [168 0 R 169 0 R 170 0 R 171 0 R 172 0 R 173 0 R 174 0 R 175 0 R 176 0 R 177 0 R 178 0 R 179 0 R 180 0 R 181 0 R 182 0 R 183 0 R 184 0 R 185 0 R 186 0 R 187 0 R 188 0 R 189 0 R 190 0 R 191 0 R 192 0 R 193 0 R 194 0 R 195 0 R 196 0 R]
+/Annots [167 0 R 168 0 R 169 0 R 170 0 R 171 0 R 172 0 R 173 0 R 174 0 R 175 0 R 176 0 R 177 0 R 178 0 R 179 0 R 180 0 R 181 0 R 182 0 R 183 0 R 184 0 R 185 0 R 186 0 R 187 0 R 188 0 R 189 0 R 190 0 R 191 0 R 192 0 R 193 0 R 194 0 R 195 0 R]
 >>
 endobj
-168 0 obj
+167 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_RoutingService)
 /Subtype /Link
@@ -17986,7 +18225,7 @@ endobj
 /Type /Annot
 >>
 endobj
-169 0 obj
+168 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_RoutingService)
 /Subtype /Link
@@ -17994,7 +18233,7 @@ endobj
 /Type /Annot
 >>
 endobj
-170 0 obj
+169 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_RoutingService)
 /Subtype /Link
@@ -18002,7 +18241,7 @@ endobj
 /Type /Annot
 >>
 endobj
-171 0 obj
+170 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_RoutingService)
 /Subtype /Link
@@ -18010,7 +18249,7 @@ endobj
 /Type /Annot
 >>
 endobj
-172 0 obj
+171 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_RoutingService)
 /Subtype /Link
@@ -18018,7 +18257,7 @@ endobj
 /Type /Annot
 >>
 endobj
-173 0 obj
+172 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_api_HomePageProviderService)
 /Subtype /Link
@@ -18026,7 +18265,7 @@ endobj
 /Type /Annot
 >>
 endobj
-174 0 obj
+173 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_api_HomePageProviderService)
 /Subtype /Link
@@ -18034,7 +18273,7 @@ endobj
 /Type /Annot
 >>
 endobj
-175 0 obj
+174 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_api_HomePageProviderService)
 /Subtype /Link
@@ -18042,7 +18281,7 @@ endobj
 /Type /Annot
 >>
 endobj
-176 0 obj
+175 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -18053,7 +18292,7 @@ endobj
 /Type /Annot
 >>
 endobj
-177 0 obj
+176 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -18064,7 +18303,7 @@ endobj
 /Type /Annot
 >>
 endobj
-178 0 obj
+177 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_TableColumnOrderService)
 /Subtype /Link
@@ -18072,7 +18311,7 @@ endobj
 /Type /Annot
 >>
 endobj
-179 0 obj
+178 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_TableColumnOrderService)
 /Subtype /Link
@@ -18080,7 +18319,7 @@ endobj
 /Type /Annot
 >>
 endobj
-180 0 obj
+179 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_TableColumnOrderService)
 /Subtype /Link
@@ -18088,7 +18327,7 @@ endobj
 /Type /Annot
 >>
 endobj
-181 0 obj
+180 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_TableColumnOrderService)
 /Subtype /Link
@@ -18096,7 +18335,7 @@ endobj
 /Type /Annot
 >>
 endobj
-182 0 obj
+181 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_TableColumnOrderService)
 /Subtype /Link
@@ -18104,7 +18343,7 @@ endobj
 /Type /Annot
 >>
 endobj
-183 0 obj
+182 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_TableColumnOrderService)
 /Subtype /Link
@@ -18112,7 +18351,7 @@ endobj
 /Type /Annot
 >>
 endobj
-184 0 obj
+183 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_TableColumnOrderService)
 /Subtype /Link
@@ -18120,7 +18359,7 @@ endobj
 /Type /Annot
 >>
 endobj
-185 0 obj
+184 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_TranslationService)
 /Subtype /Link
@@ -18128,7 +18367,7 @@ endobj
 /Type /Annot
 >>
 endobj
-186 0 obj
+185 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_TranslationService)
 /Subtype /Link
@@ -18136,7 +18375,7 @@ endobj
 /Type /Annot
 >>
 endobj
-187 0 obj
+186 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_TranslationService)
 /Subtype /Link
@@ -18144,7 +18383,7 @@ endobj
 /Type /Annot
 >>
 endobj
-188 0 obj
+187 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_TranslationService)
 /Subtype /Link
@@ -18152,7 +18391,7 @@ endobj
 /Type /Annot
 >>
 endobj
-189 0 obj
+188 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_TranslationService)
 /Subtype /Link
@@ -18160,7 +18399,7 @@ endobj
 /Type /Annot
 >>
 endobj
-190 0 obj
+189 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_LocaleProvider)
 /Subtype /Link
@@ -18168,7 +18407,7 @@ endobj
 /Type /Annot
 >>
 endobj
-191 0 obj
+190 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_TranslationsResolver)
 /Subtype /Link
@@ -18176,7 +18415,7 @@ endobj
 /Type /Annot
 >>
 endobj
-192 0 obj
+191 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_TranslationsResolver)
 /Subtype /Link
@@ -18184,7 +18423,7 @@ endobj
 /Type /Annot
 >>
 endobj
-193 0 obj
+192 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_TranslationsResolver)
 /Subtype /Link
@@ -18192,7 +18431,7 @@ endobj
 /Type /Annot
 >>
 endobj
-194 0 obj
+193 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_TranslationsResolver)
 /Subtype /Link
@@ -18200,7 +18439,7 @@ endobj
 /Type /Annot
 >>
 endobj
-195 0 obj
+194 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_TranslationsResolver)
 /Subtype /Link
@@ -18208,7 +18447,7 @@ endobj
 /Type /Annot
 >>
 endobj
-196 0 obj
+195 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_TranslationService)
 /Subtype /Link
@@ -18216,8 +18455,8 @@ endobj
 /Type /Annot
 >>
 endobj
-197 0 obj
-<< /Length 25293
+196 0 obj
+<< /Length 25435
 >>
 stream
 q
@@ -19314,7 +19553,7 @@ Q
 
 BT
 76.73933333333335 271.0100000000003 Td
-/F6.1 24 Tf
+/F5.1 24 Tf
 <21> Tj
 ET
 
@@ -19372,7 +19611,7 @@ ET
 
 BT
 345.09708333333333 307.07600000000025 Td
-/F7.0 10.5 Tf
+/F6.0 10.5 Tf
 <616c6c> Tj
 ET
 
@@ -19556,12 +19795,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24000000000001 124.47500000000024 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -19578,12 +19817,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 124.47500000000024 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <696e74657266616365> Tj
 ET
 
@@ -19600,12 +19839,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 152.74 124.47500000000024 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <436f6e74656e744d617070696e6753657276696365> Tj
 ET
 
@@ -19644,8 +19883,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 81.24000000000001 109.73500000000023 Td
@@ -19688,8 +19927,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 141.74 109.73500000000023 Td
@@ -19765,8 +20004,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 141.74 94.99500000000023 Td
@@ -19837,7 +20076,18 @@ ET
 BT
 339.74 94.99500000000023 Td
 /F3.0 11 Tf
-<293b> Tj
+<29> 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
+345.24 94.99500000000023 Td
+/F3.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -19899,27 +20149,26 @@ Q
 
 endstream
 endobj
-198 0 obj
+197 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 197 0 R
+/Contents 196 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 20 0 R
 /F3.0 43 0 R
 /F1.0 8 0 R
-/F6.1 65 0 R
-/F7.0 72 0 R
-/F4.0 54 0 R
-/F3.1 55 0 R
+/F5.1 64 0 R
+/F6.0 71 0 R
+/F3.1 54 0 R
 >>
-/XObject << /Stamp1 2193 0 R
+/XObject << /Stamp1 2192 0 R
 >>
 >>
-/Annots [199 0 R 200 0 R 201 0 R 202 0 R 203 0 R 204 0 R 205 0 R 206 0 R 207 0 R 208 0 R 210 0 R 211 0 R 212 0 R 213 0 R]
+/Annots [198 0 R 199 0 R 200 0 R 201 0 R 202 0 R 203 0 R 204 0 R 205 0 R 206 0 R 207 0 R 209 0 R 210 0 R 211 0 R 212 0 R]
 >>
 endobj
-199 0 obj
+198 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_UrlEncodingService)
 /Subtype /Link
@@ -19927,7 +20176,7 @@ endobj
 /Type /Annot
 >>
 endobj
-200 0 obj
+199 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_UrlEncodingService)
 /Subtype /Link
@@ -19935,7 +20184,7 @@ endobj
 /Type /Annot
 >>
 endobj
-201 0 obj
+200 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_UrlEncodingService)
 /Subtype /Link
@@ -19943,7 +20192,7 @@ endobj
 /Type /Annot
 >>
 endobj
-202 0 obj
+201 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_UrlEncodingService)
 /Subtype /Link
@@ -19951,7 +20200,7 @@ endobj
 /Type /Annot
 >>
 endobj
-203 0 obj
+202 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_UrlEncodingService)
 /Subtype /Link
@@ -19959,7 +20208,7 @@ endobj
 /Type /Annot
 >>
 endobj
-204 0 obj
+203 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_UserProfileService)
 /Subtype /Link
@@ -19967,7 +20216,7 @@ endobj
 /Type /Annot
 >>
 endobj
-205 0 obj
+204 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_UserProfileService)
 /Subtype /Link
@@ -19975,7 +20224,7 @@ endobj
 /Type /Annot
 >>
 endobj
-206 0 obj
+205 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_UserProfileService)
 /Subtype /Link
@@ -19983,7 +20232,7 @@ endobj
 /Type /Annot
 >>
 endobj
-207 0 obj
+206 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_UserProfileService)
 /Subtype /Link
@@ -19991,7 +20240,7 @@ endobj
 /Type /Annot
 >>
 endobj
-208 0 obj
+207 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_UserProfileService)
 /Subtype /Link
@@ -19999,10 +20248,10 @@ endobj
 /Type /Annot
 >>
 endobj
-209 0 obj
-[198 0 R /XYZ 0 466.0200000000003 null]
+208 0 obj
+[197 0 R /XYZ 0 466.0200000000003 null]
 endobj
-210 0 obj
+209 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -20013,7 +20262,7 @@ endobj
 /Type /Annot
 >>
 endobj
-211 0 obj
+210 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -20024,7 +20273,7 @@ endobj
 /Type /Annot
 >>
 endobj
-212 0 obj
+211 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -20035,7 +20284,7 @@ endobj
 /Type /Annot
 >>
 endobj
-213 0 obj
+212 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -20046,11 +20295,11 @@ endobj
 /Type /Annot
 >>
 endobj
-214 0 obj
-[198 0 R /XYZ 0 208.36000000000027 null]
+213 0 obj
+[197 0 R /XYZ 0 208.36000000000027 null]
 endobj
-215 0 obj
-<< /Length 11711
+214 0 obj
+<< /Length 11853
 >>
 stream
 q
@@ -20246,12 +20495,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.239999999999995 674.1650000000001 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -20268,12 +20517,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74 674.1650000000001 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <696e74657266616365> Tj
 ET
 
@@ -20290,12 +20539,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 152.74 674.1650000000001 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <436f6e74656e744d617070696e6753657276696365> Tj
 ET
 
@@ -20334,8 +20583,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 81.24 659.4250000000001 Td
@@ -20378,8 +20627,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 141.74 659.4250000000001 Td
@@ -20433,8 +20682,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 141.74 644.6850000000002 Td
@@ -20560,7 +20809,18 @@ ET
 BT
 345.24 629.9450000000002 Td
 /F3.0 11 Tf
-<293b> Tj
+<29> 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
+350.74 629.9450000000002 Td
+/F3.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -20811,25 +21071,24 @@ Q
 
 endstream
 endobj
-216 0 obj
+215 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 215 0 R
+/Contents 214 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F3.1 55 0 R
+/Font << /F3.1 54 0 R
 /F1.0 8 0 R
 /F3.0 43 0 R
-/F4.0 54 0 R
 /F2.0 20 0 R
 >>
-/XObject << /Stamp1 2193 0 R
+/XObject << /Stamp1 2192 0 R
 >>
 >>
-/Annots [217 0 R 218 0 R 220 0 R]
+/Annots [216 0 R 217 0 R 219 0 R]
 >>
 endobj
-217 0 obj
+216 0 obj
 << /Border [0 0 0]
 /Dest (ugvro.adoc)
 /Subtype /Link
@@ -20837,7 +21096,7 @@ endobj
 /Type /Annot
 >>
 endobj
-218 0 obj
+217 0 obj
 << /Border [0 0 0]
 /Dest (ugvro.adoc)
 /Subtype /Link
@@ -20845,10 +21104,10 @@ endobj
 /Type /Annot
 >>
 endobj
-219 0 obj
-[216 0 R /XYZ 0 536.9900000000001 null]
+218 0 obj
+[215 0 R /XYZ 0 536.9900000000001 null]
 endobj
-220 0 obj
+219 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -20859,8 +21118,8 @@ endobj
 /Type /Annot
 >>
 endobj
-221 0 obj
-<< /Length 37531
+220 0 obj
+<< /Length 40320
 >>
 stream
 q
@@ -20894,9 +21153,9 @@ h
 S
 Q
 /DeviceRGB cs
-0.333 0.333 0.333 scn
+0.600 0.600 1.000 scn
 /DeviceRGB CS
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 SCN
 
 BT
 59.24 783.0649999999999 Td
@@ -20983,8 +21242,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 279.24 783.0649999999999 Td
@@ -21005,12 +21264,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24 768.3249999999999 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -21027,12 +21286,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 768.3249999999999 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -21049,12 +21308,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 768.3249999999999 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <436f6e74656e744d617070696e6753657276696365466f72546f446f4974656d> Tj
 ET
 
@@ -21071,12 +21330,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 312.24 768.3249999999999 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <696d706c656d656e7473> Tj
 ET
 
@@ -21137,8 +21396,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 753.585 Td
@@ -21159,12 +21418,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 738.845 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -21181,8 +21440,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 738.845 Td
@@ -21236,12 +21495,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 125.24000000000001 724.105 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <66696e616c> Tj
 ET
 
@@ -21258,8 +21517,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 158.24 724.105 Td
@@ -21313,12 +21572,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 125.24000000000001 709.365 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <66696e616c> Tj
 ET
 
@@ -21335,8 +21594,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 158.24 709.365 Td
@@ -21445,12 +21704,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 103.24000000000001 694.625 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <6966> Tj
 ET
 
@@ -21489,12 +21748,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 158.24 694.625 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <696e7374616e63656f66> Tj
 ET
 
@@ -21566,12 +21825,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 125.24000000000001 679.885 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <666f72> Tj
 ET
 
@@ -21720,12 +21979,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 147.24 665.145 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <66696e616c> Tj
 ET
 
@@ -21742,8 +22001,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 180.24 665.145 Td
@@ -21764,8 +22023,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 202.24 665.145 Td
@@ -21797,8 +22056,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 246.24 665.145 Td
@@ -21896,8 +22155,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 64.74000000000001 650.405 Td
@@ -21913,7 +22172,29 @@ ET
 BT
 136.24 650.405 Td
 /F3.0 11 Tf
-<28293b> Tj
+<28> 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
+141.74 650.405 Td
+/F3.0 11 Tf
+<29> 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
+147.24 650.405 Td
+/F3.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -21929,12 +22210,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 147.24 635.665 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <66696e616c> Tj
 ET
 
@@ -21951,8 +22232,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 180.24 635.665 Td
@@ -22039,8 +22320,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 345.24 635.665 Td
@@ -22061,13 +22342,35 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
 
 BT
 367.24 635.665 Td
 /F3.0 11 Tf
-<22782d726f2d646f6d61696e2d7479706522> Tj
+<22> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+372.74 635.665 Td
+/F3.0 11 Tf
+<782d726f2d646f6d61696e2d74797065> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.800 0.200 0.000 scn
+0.800 0.200 0.000 SCN
+
+BT
+460.74 635.665 Td
+/F3.0 11 Tf
+<22> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -22078,7 +22381,18 @@ ET
 BT
 466.24 635.665 Td
 /F3.0 11 Tf
-<293b> Tj
+<29> 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
+471.74 635.665 Td
+/F3.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -22094,12 +22408,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 147.24 620.925 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <6966> Tj
 ET
 
@@ -22138,8 +22452,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 218.74 620.925 Td
@@ -22182,8 +22496,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 328.74 620.925 Td
@@ -22204,8 +22518,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 361.74 620.925 Td
@@ -22221,7 +22535,40 @@ ET
 BT
 400.24 620.925 Td
 /F3.0 11 Tf
-<28292929> Tj
+<28> 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
+405.74 620.925 Td
+/F3.0 11 Tf
+<29> 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
+411.24 620.925 Td
+/F3.0 11 Tf
+<29> 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
+416.74 620.925 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -22259,12 +22606,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 169.24 606.185 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <72657475726e> Tj
 ET
 
@@ -22298,7 +22645,18 @@ ET
 BT
 290.24 606.185 Td
 /F3.0 11 Tf
-<2828> Tj
+<28> 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
+295.74 606.185 Td
+/F3.0 11 Tf
+<28> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -22353,7 +22711,18 @@ ET
 BT
 389.24 606.185 Td
 /F3.0 11 Tf
-<293b> Tj
+<29> 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
+394.74 606.185 Td
+/F3.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -22435,12 +22804,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 103.24000000000001 547.2249999999999 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <72657475726e> Tj
 ET
 
@@ -22457,12 +22826,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 141.74 547.2249999999999 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <6e756c6c> Tj
 ET
 
@@ -22512,12 +22881,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 517.7449999999999 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <70726976617465> Tj
 ET
 
@@ -22578,12 +22947,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 284.74 517.7449999999999 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <66696e616c> Tj
 ET
 
@@ -22677,12 +23046,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 103.24000000000001 503.00499999999994 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <66696e616c> Tj
 ET
 
@@ -22765,12 +23134,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 240.74 503.00499999999994 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <6e6577> Tj
 ET
 
@@ -22804,7 +23173,29 @@ ET
 BT
 328.74 503.00499999999994 Td
 /F3.0 11 Tf
-<28293b> Tj
+<28> 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
+334.24 503.00499999999994 Td
+/F3.0 11 Tf
+<29> 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
+339.74 503.00499999999994 Td
+/F3.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -22842,8 +23233,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 125.24000000000001 488.26499999999993 Td
@@ -22881,7 +23272,18 @@ ET
 BT
 235.24 488.26499999999993 Td
 /F3.0 11 Tf
-<293b> Tj
+<29> 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
+240.74 488.26499999999993 Td
+/F3.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -22919,8 +23321,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 125.24000000000001 473.5249999999999 Td
@@ -22963,8 +23365,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 257.24 473.5249999999999 Td
@@ -22980,7 +23382,40 @@ ET
 BT
 334.24 473.5249999999999 Td
 /F3.0 11 Tf
-<2829293b> Tj
+<28> 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
+339.74 473.5249999999999 Td
+/F3.0 11 Tf
+<29> 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
+345.24 473.5249999999999 Td
+/F3.0 11 Tf
+<29> 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
+350.74 473.5249999999999 Td
+/F3.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -23002,7 +23437,29 @@ ET
 BT
 103.24000000000001 458.7849999999999 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+108.74000000000001 458.7849999999999 Td
+/F3.0 11 Tf
+<2e> 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
+114.24000000000001 458.7849999999999 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -23018,12 +23475,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 103.24000000000001 444.0449999999999 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <72657475726e> Tj
 ET
 
@@ -23101,7 +23558,29 @@ ET
 BT
 81.24000000000001 414.5649999999999 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+86.74000000000001 414.5649999999999 Td
+/F3.0 11 Tf
+<2e> 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
+92.24000000000001 414.5649999999999 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -23513,27 +23992,26 @@ Q
 
 endstream
 endobj
-222 0 obj
+221 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 221 0 R
+/Contents 220 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F3.0 43 0 R
-/F4.0 54 0 R
 /F2.0 20 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 2193 0 R
+/XObject << /Stamp1 2192 0 R
 >>
 >>
-/Annots [224 0 R 226 0 R 227 0 R 228 0 R 229 0 R 230 0 R]
+/Annots [223 0 R 225 0 R 226 0 R 227 0 R 228 0 R 229 0 R]
 >>
 endobj
-223 0 obj
-[222 0 R /XYZ 0 373.90999999999985 null]
+222 0 obj
+[221 0 R /XYZ 0 373.90999999999985 null]
 endobj
-224 0 obj
+223 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -23544,10 +24022,10 @@ endobj
 /Type /Annot
 >>
 endobj
-225 0 obj
-[222 0 R /XYZ 0 312.8499999999998 null]
+224 0 obj
+[221 0 R /XYZ 0 312.8499999999998 null]
 endobj
-226 0 obj
+225 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -23558,7 +24036,7 @@ endobj
 /Type /Annot
 >>
 endobj
-227 0 obj
+226 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -23569,7 +24047,7 @@ endobj
 /Type /Annot
 >>
 endobj
-228 0 obj
+227 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -23580,7 +24058,7 @@ endobj
 /Type /Annot
 >>
 endobj
-229 0 obj
+228 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_UserRegistrationService)
 /Subtype /Link
@@ -23588,7 +24066,7 @@ endobj
 /Type /Annot
 >>
 endobj
-230 0 obj
+229 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_api_EmailService)
 /Subtype /Link
@@ -23596,8 +24074,8 @@ endobj
 /Type /Annot
 >>
 endobj
-231 0 obj
-<< /Length 20213
+230 0 obj
+<< /Length 20781
 >>
 stream
 q
@@ -23663,12 +24141,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24 694.9750000000001 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -23685,12 +24163,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 694.9750000000001 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <696e74657266616365> Tj
 ET
 
@@ -23707,12 +24185,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 152.74 694.9750000000001 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <456d61696c4e6f74696669636174696f6e53657276696365> Tj
 ET
 
@@ -23729,12 +24207,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 290.24 694.9750000000001 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <657874656e6473> Tj
 ET
 
@@ -23751,8 +24229,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 334.24 694.9750000000001 Td
@@ -23795,8 +24273,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 680.2350000000001 Td
@@ -23817,12 +24295,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 81.24000000000001 665.4950000000001 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <626f6f6c65616e> Tj
 ET
 
@@ -23900,7 +24378,18 @@ ET
 BT
 290.24 665.4950000000001 Td
 /F3.0 11 Tf
-<293b> Tj
+<29> 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
+295.74 665.4950000000001 Td
+/F3.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -23938,8 +24427,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 650.7550000000002 Td
@@ -23960,12 +24449,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 81.24000000000001 636.0150000000002 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <626f6f6c65616e> Tj
 ET
 
@@ -24043,7 +24532,18 @@ ET
 BT
 268.24 636.0150000000002 Td
 /F3.0 11 Tf
-<293b> Tj
+<29> 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
+273.74 636.0150000000002 Td
+/F3.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -24081,8 +24581,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 621.2750000000002 Td
@@ -24103,12 +24603,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 81.24000000000001 606.5350000000002 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <626f6f6c65616e> Tj
 ET
 
@@ -24142,7 +24642,29 @@ ET
 BT
 191.24 606.5350000000002 Td
 /F3.0 11 Tf
-<28293b> Tj
+<28> 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
+196.74 606.5350000000002 Td
+/F3.0 11 Tf
+<29> 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
+202.24 606.5350000000002 Td
+/F3.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -24298,7 +24820,7 @@ ET
 
 BT
 257.65277777777777 488.5760000000003 Td
-/F7.0 10.5 Tf
+/F6.0 10.5 Tf
 <6e6f74> Tj
 ET
 
@@ -24343,7 +24865,7 @@ ET
 
 BT
 369.3267222222222 488.5760000000003 Td
-/F5.0 10.5 Tf
+/F4.0 10.5 Tf
 <c9> Tj
 ET
 
@@ -24769,7 +25291,7 @@ ET
 
 BT
 256.584 79.1560000000002 Td
-/F5.0 10.5 Tf
+/F4.0 10.5 Tf
 <c9> Tj
 ET
 
@@ -24836,36 +25358,35 @@ Q
 
 endstream
 endobj
-232 0 obj
+231 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 231 0 R
+/Contents 230 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F2.0 20 0 R
-/F4.0 54 0 R
 /F3.0 43 0 R
-/F3.1 55 0 R
-/F7.0 72 0 R
-/F5.0 59 0 R
+/F3.1 54 0 R
+/F6.0 71 0 R
+/F4.0 58 0 R
 >>
-/XObject << /Stamp1 2193 0 R
+/XObject << /Stamp1 2192 0 R
 >>
 >>
-/Annots [236 0 R]
+/Annots [235 0 R]
 >>
 endobj
+232 0 obj
+[231 0 R /XYZ 0 778.86 null]
+endobj
 233 0 obj
-[232 0 R /XYZ 0 778.86 null]
+[231 0 R /XYZ 0 456.9800000000003 null]
 endobj
 234 0 obj
-[232 0 R /XYZ 0 456.9800000000003 null]
+[231 0 R /XYZ 0 364.36000000000024 null]
 endobj
 235 0 obj
-[232 0 R /XYZ 0 364.36000000000024 null]
-endobj
-236 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -24876,8 +25397,8 @@ endobj
 /Type /Annot
 >>
 endobj
-237 0 obj
-<< /Length 26775
+236 0 obj
+<< /Length 28338
 >>
 stream
 q
@@ -25467,12 +25988,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24 323.19500000000045 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -25489,12 +26010,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 323.19500000000045 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <696e74657266616365> Tj
 ET
 
@@ -25511,12 +26032,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 152.74 323.19500000000045 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <4572726f725265706f7274696e6753657276696365> Tj
 ET
 
@@ -25638,7 +26159,18 @@ ET
 BT
 323.24 308.45500000000044 Td
 /F3.0 11 Tf
-<293b> Tj
+<29> 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
+328.74 308.45500000000044 Td
+/F3.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -25714,12 +26246,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24 217.1950000000004 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -25736,12 +26268,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 217.1950000000004 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -25758,12 +26290,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 217.1950000000004 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <4572726f7244657461696c73> Tj
 ET
 
@@ -25802,12 +26334,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 202.4550000000004 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -25824,8 +26356,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 202.4550000000004 Td
@@ -25863,7 +26395,18 @@ ET
 BT
 235.24 202.4550000000004 Td
 /F3.0 11 Tf
-<2829> Tj
+<28> 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
+240.74 202.4550000000004 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -25907,7 +26450,29 @@ ET
 BT
 262.74 202.4550000000004 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+268.24 202.4550000000004 Td
+/F3.0 11 Tf
+<2e> 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
+273.74 202.4550000000004 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -25967,12 +26532,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 187.7150000000004 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -25989,12 +26554,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 187.7150000000004 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <626f6f6c65616e> Tj
 ET
 
@@ -26028,7 +26593,18 @@ ET
 BT
 229.74 187.7150000000004 Td
 /F3.0 11 Tf
-<2829> Tj
+<28> 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
+235.24 187.7150000000004 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -26072,7 +26648,29 @@ ET
 BT
 257.24 187.7150000000004 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+262.74 187.7150000000004 Td
+/F3.0 11 Tf
+<2e> 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
+268.24 187.7150000000004 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -26132,12 +26730,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 172.9750000000004 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -26154,12 +26752,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 172.9750000000004 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <626f6f6c65616e> Tj
 ET
 
@@ -26193,7 +26791,18 @@ ET
 BT
 273.74 172.9750000000004 Td
 /F3.0 11 Tf
-<2829> Tj
+<28> 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
+279.24 172.9750000000004 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -26237,7 +26846,29 @@ ET
 BT
 301.24 172.9750000000004 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+306.74 172.9750000000004 Td
+/F3.0 11 Tf
+<2e> 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
+312.24 172.9750000000004 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -26297,12 +26928,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 158.2350000000004 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -26319,8 +26950,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 158.2350000000004 Td
@@ -26341,8 +26972,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 147.24 158.2350000000004 Td
@@ -26391,7 +27022,18 @@ ET
 BT
 317.74 158.2350000000004 Td
 /F3.0 11 Tf
-<2829> Tj
+<28> 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
+323.24 158.2350000000004 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -26605,28 +27247,27 @@ Q
 
 endstream
 endobj
-238 0 obj
+237 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 237 0 R
+/Contents 236 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F3.0 43 0 R
 /F2.0 20 0 R
-/F4.0 54 0 R
-/F3.1 55 0 R
+/F3.1 54 0 R
 >>
-/XObject << /Stamp1 2193 0 R
+/XObject << /Stamp1 2192 0 R
 >>
 >>
-/Annots [240 0 R 241 0 R 242 0 R 244 0 R 245 0 R 250 0 R 251 0 R]
+/Annots [239 0 R 240 0 R 241 0 R 243 0 R 244 0 R 249 0 R 250 0 R]
 >>
 endobj
-239 0 obj
-[238 0 R /XYZ 0 778.86 null]
+238 0 obj
+[237 0 R /XYZ 0 778.86 null]
 endobj
-240 0 obj
+239 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -26637,7 +27278,7 @@ endobj
 /Type /Annot
 >>
 endobj
-241 0 obj
+240 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -26648,7 +27289,7 @@ endobj
 /Type /Annot
 >>
 endobj
-242 0 obj
+241 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_intro_overriding-the-services)
 /Subtype /Link
@@ -26656,10 +27297,10 @@ endobj
 /Type /Annot
 >>
 endobj
-243 0 obj
-[238 0 R /XYZ 0 626.9000000000002 null]
+242 0 obj
+[237 0 R /XYZ 0 626.9000000000002 null]
 endobj
-244 0 obj
+243 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_api_EmailService)
 /Subtype /Link
@@ -26667,7 +27308,7 @@ endobj
 /Type /Annot
 >>
 endobj
-245 0 obj
+244 0 obj
 << /Border [0 0 0]
 /Dest (_rgsvc_spi_UserRegistrationService)
 /Subtype /Link
@@ -26675,23 +27316,23 @@ endobj
 /Type /Annot
 >>
 endobj
+245 0 obj
+[237 0 R /XYZ 0 522.2800000000004 null]
+endobj
 246 0 obj
-[238 0 R /XYZ 0 522.2800000000004 null]
+[237 0 R /XYZ 0 407.08000000000044 null]
 endobj
 247 0 obj
-[238 0 R /XYZ 0 407.08000000000044 null]
-endobj
-248 0 obj
 << /Limits [(_rgsvc) (_rgsvc_api_ConfigurationService)]
-/Names [(_rgsvc) 17 0 R (_rgsvc_api_AcceptHeaderService) 534 0 R (_rgsvc_api_ActionInvocationContext) 555 0 R (_rgsvc_api_ApplicationFeatureRepository) 1409 0 R (_rgsvc_api_

<TRUNCATED>

[30/44] isis-site git commit: ISIS-1594: provide an 'edit' button

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/guides/rgfis.pdf
----------------------------------------------------------------------
diff --git a/content/guides/rgfis.pdf b/content/guides/rgfis.pdf
index e205d40..6d5ef15 100644
--- a/content/guides/rgfis.pdf
+++ b/content/guides/rgfis.pdf
@@ -4,16 +4,16 @@
 << /Title (Framework Internal Services)
 /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:20161214085534+00'00')
-/ModDate (D:20161214085534+00'00')
+/CreationDate (D:20170307234033+00'00')
+/ModDate (D:20170307234033+00'00')
 >>
 endobj
 2 0 obj
 << /Type /Catalog
 /Pages 3 0 R
 /Names 14 0 R
-/Outlines 333 0 R
-/PageLabels 352 0 R
+/Outlines 332 0 R
+/PageLabels 351 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 24
-/Kids [7 0 R 10 0 R 12 0 R 36 0 R 57 0 R 65 0 R 71 0 R 77 0 R 84 0 R 97 0 R 107 0 R 111 0 R 121 0 R 147 0 R 157 0 R 169 0 R 178 0 R 184 0 R 218 0 R 240 0 R 248 0 R 256 0 R 263 0 R 277 0 R]
+/Kids [7 0 R 10 0 R 12 0 R 36 0 R 57 0 R 65 0 R 70 0 R 76 0 R 83 0 R 96 0 R 106 0 R 110 0 R 120 0 R 146 0 R 156 0 R 168 0 R 177 0 R 183 0 R 217 0 R 239 0 R 247 0 R 255 0 R 262 0 R 276 0 R]
 >>
 endobj
 4 0 obj
@@ -78,13 +78,13 @@ endobj
 endobj
 8 0 obj
 << /Type /Font
-/BaseFont /AAAABR+NotoSerif
+/BaseFont /AAAABM+NotoSerif
 /Subtype /TrueType
-/FontDescriptor 354 0 R
+/FontDescriptor 353 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 356 0 R
-/ToUnicode 355 0 R
+/Widths 355 0 R
+/ToUnicode 354 0 R
 >>
 endobj
 9 0 obj
@@ -881,7 +881,7 @@ endobj
 /F5.0 40 0 R
 >>
 >>
-/Annots [289 0 R 290 0 R 291 0 R 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]
+/Annots [288 0 R 289 0 R 290 0 R 291 0 R 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]
 >>
 endobj
 11 0 obj
@@ -1567,7 +1567,7 @@ endobj
 /F1.0 8 0 R
 /F3.1 17 0 R
 >>
-/XObject << /Stamp1 332 0 R
+/XObject << /Stamp1 331 0 R
 >>
 >>
 /Annots [18 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 31 0 R 32 0 R 33 0 R 34 0 R]
@@ -1582,29 +1582,29 @@ endobj
 >>
 endobj
 15 0 obj
-<< /Kids [162 0 R 163 0 R 250 0 R]
+<< /Kids [161 0 R 162 0 R 249 0 R]
 >>
 endobj
 16 0 obj
 << /Type /Font
-/BaseFont /AAAABS+NotoSerif-Bold
+/BaseFont /AAAABN+NotoSerif-Bold
 /Subtype /TrueType
-/FontDescriptor 358 0 R
+/FontDescriptor 357 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 360 0 R
-/ToUnicode 359 0 R
+/Widths 359 0 R
+/ToUnicode 358 0 R
 >>
 endobj
 17 0 obj
 << /Type /Font
-/BaseFont /AAAABT+FontAwesome
+/BaseFont /AAAABO+FontAwesome
 /Subtype /TrueType
-/FontDescriptor 362 0 R
+/FontDescriptor 361 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 364 0 R
-/ToUnicode 363 0 R
+/Widths 363 0 R
+/ToUnicode 362 0 R
 >>
 endobj
 18 0 obj
@@ -3239,7 +3239,7 @@ endobj
 /F4.0 39 0 R
 /F5.0 40 0 R
 >>
-/XObject << /Stamp1 332 0 R
+/XObject << /Stamp1 331 0 R
 >>
 >>
 /Annots [38 0 R 41 0 R 42 0 R 43 0 R 44 0 R 45 0 R 46 0 R 47 0 R 48 0 R 49 0 R 50 0 R 51 0 R 52 0 R 54 0 R 55 0 R]
@@ -3261,24 +3261,24 @@ endobj
 endobj
 39 0 obj
 << /Type /Font
-/BaseFont /AAAABU+NotoSerif-Italic
+/BaseFont /AAAABP+NotoSerif-Italic
 /Subtype /TrueType
-/FontDescriptor 366 0 R
+/FontDescriptor 365 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 368 0 R
-/ToUnicode 367 0 R
+/Widths 367 0 R
+/ToUnicode 366 0 R
 >>
 endobj
 40 0 obj
 << /Type /Font
-/BaseFont /AAAABV+mplus1mn-regular
+/BaseFont /AAAABQ+mplus1mn-regular
 /Subtype /TrueType
-/FontDescriptor 370 0 R
+/FontDescriptor 369 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 372 0 R
-/ToUnicode 371 0 R
+/Widths 371 0 R
+/ToUnicode 370 0 R
 >>
 endobj
 41 0 obj
@@ -4161,7 +4161,7 @@ endobj
 /F5.0 40 0 R
 >>
 /XObject << /I1 62 0 R
-/Stamp1 332 0 R
+/Stamp1 331 0 R
 >>
 >>
 /Annots [58 0 R 59 0 R 60 0 R 61 0 R 63 0 R]
@@ -4251,7 +4251,7 @@ endobj
 >>
 endobj
 64 0 obj
-<< /Length 26793
+<< /Length 27504
 >>
 stream
 q
@@ -4306,12 +4306,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24 726.8050000000001 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -4328,12 +4328,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 726.8050000000001 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <696e74657266616365> Tj
 ET
 
@@ -4350,12 +4350,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 152.74 726.8050000000001 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <436f6e74656e744e65676f74696174696f6e53657276696365> Tj
 ET
 
@@ -4416,8 +4416,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 130.74 712.065 Td
@@ -4515,8 +4515,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 246.24 697.325 Td
@@ -4609,7 +4609,18 @@ ET
 BT
 273.74 682.5850000000002 Td
 /F5.0 11 Tf
-<293b> Tj
+<29> 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
+279.24 682.5850000000002 Td
+/F5.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4647,8 +4658,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 130.74 667.8450000000001 Td
@@ -4746,8 +4757,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 246.24 653.1050000000001 Td
@@ -4840,7 +4851,18 @@ ET
 BT
 317.74 638.3650000000001 Td
 /F5.0 11 Tf
-<293b> Tj
+<29> 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
+323.24 638.3650000000001 Td
+/F5.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4878,8 +4900,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 130.74 623.6250000000001 Td
@@ -4977,8 +4999,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 246.24 608.8850000000001 Td
@@ -5071,7 +5093,18 @@ ET
 BT
 339.74 594.1450000000001 Td
 /F5.0 11 Tf
-<293b> Tj
+<29> 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
+345.24 594.1450000000001 Td
+/F5.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5109,8 +5142,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 130.74 579.4050000000001 Td
@@ -5208,8 +5241,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 246.24 564.6650000000001 Td
@@ -5302,7 +5335,18 @@ ET
 BT
 295.74 549.9250000000001 Td
 /F5.0 11 Tf
-<293b> Tj
+<29> 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
+301.24 549.9250000000001 Td
+/F5.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5340,8 +5384,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 130.74 535.1850000000001 Td
@@ -5439,8 +5483,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 246.24 520.445 Td
@@ -5533,7 +5577,18 @@ ET
 BT
 405.74 505.70500000000004 Td
 /F5.0 11 Tf
-<293b> Tj
+<29> 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
+411.24 505.70500000000004 Td
+/F5.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6006,11 +6061,10 @@ endobj
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 16 0 R
 /F1.0 8 0 R
-/F6.0 67 0 R
 /F5.0 40 0 R
-/F5.1 68 0 R
+/F5.1 67 0 R
 >>
-/XObject << /Stamp1 332 0 R
+/XObject << /Stamp1 331 0 R
 >>
 >>
 >>
@@ -6020,31 +6074,20 @@ endobj
 endobj
 67 0 obj
 << /Type /Font
-/BaseFont /AAAABW+mplus1mn-bold
+/BaseFont /AAAABR+mplus1mn-regular
 /Subtype /TrueType
-/FontDescriptor 374 0 R
+/FontDescriptor 373 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 376 0 R
-/ToUnicode 375 0 R
+/Widths 375 0 R
+/ToUnicode 374 0 R
 >>
 endobj
 68 0 obj
-<< /Type /Font
-/BaseFont /AAAABX+mplus1mn-regular
-/Subtype /TrueType
-/FontDescriptor 378 0 R
-/FirstChar 32
-/LastChar 255
-/Widths 380 0 R
-/ToUnicode 379 0 R
->>
-endobj
-69 0 obj
 [65 0 R /XYZ 0 185.69000000000023 null]
 endobj
-70 0 obj
-<< /Length 28665
+69 0 obj
+<< /Length 31063
 >>
 stream
 q
@@ -6078,13 +6121,13 @@ h
 S
 Q
 /DeviceRGB cs
-0.000 0.533 0.000 scn
+0.000 0.400 0.600 scn
 /DeviceRGB CS
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 SCN
 
 BT
 59.24 783.0649999999999 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -6101,12 +6144,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 97.74000000000001 783.0649999999999 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <6162737472616374> Tj
 ET
 
@@ -6123,12 +6166,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 147.24 783.0649999999999 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -6145,12 +6188,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 180.24 783.0649999999999 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <436f6e74656e744e65676f74696174696f6e536572766963654162737472616374> Tj
 ET
 
@@ -6167,12 +6210,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 367.24 783.0649999999999 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <696d706c656d656e7473> Tj
 ET
 
@@ -6237,7 +6280,29 @@ ET
 BT
 81.24000000000001 753.585 Td
 /F5.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+86.74000000000001 753.585 Td
+/F5.0 11 Tf
+<2e> 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
+92.24000000000001 753.585 Td
+/F5.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6253,12 +6318,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 81.24000000000001 738.845 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <70726f746563746564> Tj
 ET
 
@@ -6275,8 +6340,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 136.24 738.845 Td
@@ -6319,12 +6384,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 224.24 738.845 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <66696e616c> Tj
 ET
 
@@ -6424,7 +6489,29 @@ ET
 BT
 427.74 738.845 Td
 /F5.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+433.24 738.845 Td
+/F5.0 11 Tf
+<2e> 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
+438.74 738.845 Td
+/F5.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6462,12 +6549,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 724.105 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <70726f746563746564> Tj
 ET
 
@@ -6484,8 +6571,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 136.24 724.105 Td
@@ -6609,7 +6696,29 @@ ET
 BT
 218.74 709.365 Td
 /F5.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+224.24 709.365 Td
+/F5.0 11 Tf
+<2e> 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
+229.74 709.365 Td
+/F5.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6647,12 +6756,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 679.885 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <70726f746563746564> Tj
 ET
 
@@ -6669,8 +6778,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 136.24 679.885 Td
@@ -6686,7 +6795,29 @@ ET
 BT
 163.74 679.885 Td
 /F5.0 11 Tf
-<3c3f3e> Tj
+<3c> 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
+169.24 679.885 Td
+/F5.0 11 Tf
+<3f> 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
+174.74 679.885 Td
+/F5.0 11 Tf
+<3e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6724,8 +6855,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 240.74 679.885 Td
@@ -6807,7 +6938,29 @@ ET
 BT
 317.74 679.885 Td
 /F5.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+323.24 679.885 Td
+/F5.0 11 Tf
+<2e> 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
+328.74 679.885 Td
+/F5.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6845,12 +6998,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 650.405 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <70726f746563746564> Tj
 ET
 
@@ -6867,12 +7020,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 136.24 650.405 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <766f6964> Tj
 ET
 
@@ -6911,8 +7064,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 273.74 650.405 Td
@@ -6928,7 +7081,29 @@ ET
 BT
 301.24 650.405 Td
 /F5.0 11 Tf
-<3c3f3e> Tj
+<3c> 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
+306.74 650.405 Td
+/F5.0 11 Tf
+<3f> 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
+312.24 650.405 Td
+/F5.0 11 Tf
+<3e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7005,7 +7180,29 @@ ET
 BT
 400.24 650.405 Td
 /F5.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+405.74 650.405 Td
+/F5.0 11 Tf
+<2e> 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
+411.24 650.405 Td
+/F5.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7043,12 +7240,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 635.665 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <70726f746563746564> Tj
 ET
 
@@ -7065,12 +7262,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 136.24 635.665 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <766f6964> Tj
 ET
 
@@ -7120,8 +7317,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 103.24000000000001 620.925 Td
@@ -7175,8 +7372,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 224.24 620.925 Td
@@ -7192,7 +7389,29 @@ ET
 BT
 251.74 620.925 Td
 /F5.0 11 Tf
-<3c3f3e> Tj
+<3c> 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
+257.24 620.925 Td
+/F5.0 11 Tf
+<3f> 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
+262.74 620.925 Td
+/F5.0 11 Tf
+<3e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7241,8 +7460,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 339.74 620.925 Td
@@ -7324,7 +7543,29 @@ ET
 BT
 466.24 620.925 Td
 /F5.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+471.74 620.925 Td
+/F5.0 11 Tf
+<2e> 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
+477.24 620.925 Td
+/F5.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7527,7 +7768,7 @@ ET
 
 BT
 519.99 473.59000000000003 Td
-/F7.0 10.5 Tf
+/F6.0 10.5 Tf
 <c9> Tj
 ET
 
@@ -7564,7 +7805,7 @@ ET
 
 BT
 514.74 455.59000000000003 Td
-/F7.0 10.5 Tf
+/F6.0 10.5 Tf
 <c9> Tj
 ET
 
@@ -7683,7 +7924,7 @@ ET
 
 BT
 110.49000000000001 378.25 Td
-/F7.0 10.5 Tf
+/F6.0 10.5 Tf
 <c9> Tj
 ET
 
@@ -7731,7 +7972,7 @@ ET
 
 BT
 110.49000000000001 345.709 Td
-/F7.0 10.5 Tf
+/F6.0 10.5 Tf
 <c9> Tj
 ET
 
@@ -8039,35 +8280,34 @@ Q
 
 endstream
 endobj
-71 0 obj
+70 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 70 0 R
+/Contents 69 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F6.0 67 0 R
-/F5.0 40 0 R
+/Font << /F5.0 40 0 R
 /F1.0 8 0 R
-/F7.0 72 0 R
+/F6.0 71 0 R
 >>
-/XObject << /Stamp1 332 0 R
+/XObject << /Stamp1 331 0 R
 >>
 >>
-/Annots [73 0 R 74 0 R 75 0 R]
+/Annots [72 0 R 73 0 R 74 0 R]
 >>
 endobj
-72 0 obj
+71 0 obj
 << /Type /Font
-/BaseFont /AAAABY+mplus-1p-regular
+/BaseFont /AAAABS+mplus-1p-regular
 /Subtype /TrueType
-/FontDescriptor 382 0 R
+/FontDescriptor 377 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 384 0 R
-/ToUnicode 383 0 R
+/Widths 379 0 R
+/ToUnicode 378 0 R
 >>
 endobj
-73 0 obj
+72 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -8078,7 +8318,7 @@ endobj
 /Type /Annot
 >>
 endobj
-74 0 obj
+73 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -8089,7 +8329,7 @@ endobj
 /Type /Annot
 >>
 endobj
-75 0 obj
+74 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -8100,7 +8340,7 @@ endobj
 /Type /Annot
 >>
 endobj
-76 0 obj
+75 0 obj
 << /Length 8124
 >>
 stream
@@ -8538,27 +8778,27 @@ Q
 
 endstream
 endobj
-77 0 obj
+76 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 76 0 R
+/Contents 75 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 16 0 R
 /F1.0 8 0 R
 /F5.0 40 0 R
 >>
-/XObject << /I2 80 0 R
-/Stamp1 332 0 R
+/XObject << /I2 79 0 R
+/Stamp1 331 0 R
 >>
 >>
-/Annots [79 0 R 81 0 R]
+/Annots [78 0 R 80 0 R]
 >>
 endobj
-78 0 obj
-[77 0 R /XYZ 0 841.89 null]
+77 0 obj
+[76 0 R /XYZ 0 841.89 null]
 endobj
-79 0 obj
+78 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -8569,7 +8809,7 @@ endobj
 /Type /Annot
 >>
 endobj
-80 0 obj
+79 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 753
@@ -8815,7 +9055,7 @@ v
 \ufffdR<\ufffdB\ufffd\ufffd$\ufffdF\ufffd\ufffdh4\ufffdF\ufffd\ufffdh5a\ufffdF\ufffd\ufffdh4\ufffdF\ufffd\ufffdhu7\ufffd$\ufffdF\ufffd\ufffdh4\ufffdF\ufffd\ufffd\ufffdn\ufffdI\ufffdF\ufffd\ufffdh4\ufffdF\ufffd\ufffd\ufffd\ufffd4\ufffdF\ufffd\ufffdh4\ufffdF\ufffd\ufffd\ufffd\ufffd$\ufffdF\ufffd\ufffdh4\ufffdF\ufffd\ufffdhu\ufffd\ufffd\ufffd\ufffdG`
 endstream
 endobj
-81 0 obj
+80 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -8826,7 +9066,7 @@ endobj
 /Type /Annot
 >>
 endobj
-82 0 obj
+81 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 753
@@ -9042,8 +9282,8 @@ WO
 \ufffd\ufffdm{Mn*\ufffd\ufffd|\u02dc]d0\ufffd\ufffdP\ufffdDWa\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd%\ufffdB\ufffddaaaaaaaaaaaa\ufffd&YXXXXXXXXXXXX</\ufffdI\ufffda\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd	\ufffd,,,,,,,,,,,,,,\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd
 endstream
 endobj
-83 0 obj
-<< /Length 10488
+82 0 obj
+<< /Length 10204
 >>
 stream
 q
@@ -9193,35 +9433,13 @@ f
 h
 S
 Q
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-59.24 370.5790983606558 Td
-/F6.0 11 Tf
-<697369732e73657276696365732e436f6e74656e744e65676f74696174696f6e5365727669636558526f446f6d61696e547970652e7072657474795072696e74> 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
-411.24 370.5790983606558 Td
-/F5.0 11 Tf
-<3d> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-416.74 370.5790983606558 Td
+59.24 370.5790983606558 Td
 /F5.0 11 Tf
-<74727565> Tj
+<697369732e73657276696365732e436f6e74656e744e65676f74696174696f6e5365727669636558526f446f6d61696e547970652e7072657474795072696e743d74727565> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9698,25 +9916,24 @@ Q
 
 endstream
 endobj
-84 0 obj
+83 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 83 0 R
+/Contents 82 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/XObject << /I3 82 0 R
-/Stamp1 332 0 R
+/XObject << /I3 81 0 R
+/Stamp1 331 0 R
 >>
 /Font << /F2.0 16 0 R
 /F1.0 8 0 R
 /F5.0 40 0 R
-/F6.0 67 0 R
 >>
 >>
-/Annots [85 0 R 87 0 R 88 0 R 89 0 R 91 0 R 92 0 R 93 0 R 95 0 R]
+/Annots [84 0 R 86 0 R 87 0 R 88 0 R 90 0 R 91 0 R 92 0 R 94 0 R]
 >>
 endobj
-85 0 obj
+84 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -9727,10 +9944,10 @@ endobj
 /Type /Annot
 >>
 endobj
-86 0 obj
-[84 0 R /XYZ 0 486.0240983606558 null]
+85 0 obj
+[83 0 R /XYZ 0 486.0240983606558 null]
 endobj
-87 0 obj
+86 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -9741,7 +9958,7 @@ endobj
 /Type /Annot
 >>
 endobj
-88 0 obj
+87 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -9752,7 +9969,7 @@ endobj
 /Type /Annot
 >>
 endobj
-89 0 obj
+88 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -9763,10 +9980,10 @@ endobj
 /Type /Annot
 >>
 endobj
-90 0 obj
-[84 0 R /XYZ 0 301.10409836065577 null]
+89 0 obj
+[83 0 R /XYZ 0 301.10409836065577 null]
 endobj
-91 0 obj
+90 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -9777,7 +9994,7 @@ endobj
 /Type /Annot
 >>
 endobj
-92 0 obj
+91 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -9788,7 +10005,7 @@ endobj
 /Type /Annot
 >>
 endobj
-93 0 obj
+92 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -9799,10 +10016,10 @@ endobj
 /Type /Annot
 >>
 endobj
-94 0 obj
-[84 0 R /XYZ 0 149.14409836065573 null]
+93 0 obj
+[83 0 R /XYZ 0 149.14409836065573 null]
 endobj
-95 0 obj
+94 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -9813,7 +10030,7 @@ endobj
 /Type /Annot
 >>
 endobj
-96 0 obj
+95 0 obj
 << /Length 10702
 >>
 stream
@@ -10480,24 +10697,24 @@ Q
 
 endstream
 endobj
-97 0 obj
+96 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 96 0 R
+/Contents 95 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F5.0 40 0 R
 /F1.0 8 0 R
 /F2.0 16 0 R
 /F4.0 39 0 R
 >>
-/XObject << /Stamp1 332 0 R
+/XObject << /Stamp1 331 0 R
 >>
 >>
-/Annots [98 0 R 100 0 R 101 0 R 102 0 R 103 0 R 104 0 R]
+/Annots [97 0 R 99 0 R 100 0 R 101 0 R 102 0 R 103 0 R]
 >>
 endobj
-98 0 obj
+97 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_RepresentationService)
 /Subtype /Link
@@ -10505,10 +10722,10 @@ endobj
 /Type /Annot
 >>
 endobj
-99 0 obj
-[97 0 R /XYZ 0 778.86 null]
+98 0 obj
+[96 0 R /XYZ 0 778.86 null]
 endobj
-100 0 obj
+99 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -10519,7 +10736,7 @@ endobj
 /Type /Annot
 >>
 endobj
-101 0 obj
+100 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -10530,7 +10747,7 @@ endobj
 /Type /Annot
 >>
 endobj
-102 0 obj
+101 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_ContentNegotiationService)
 /Subtype /Link
@@ -10538,7 +10755,7 @@ endobj
 /Type /Annot
 >>
 endobj
-103 0 obj
+102 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_ContentNegotiationService)
 /Subtype /Link
@@ -10546,7 +10763,7 @@ endobj
 /Type /Annot
 >>
 endobj
-104 0 obj
+103 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -10557,11 +10774,11 @@ endobj
 /Type /Annot
 >>
 endobj
-105 0 obj
-[97 0 R /XYZ 0 382.74 null]
+104 0 obj
+[96 0 R /XYZ 0 382.74 null]
 endobj
-106 0 obj
-<< /Length 29059
+105 0 obj
+<< /Length 30025
 >>
 stream
 q
@@ -10595,13 +10812,13 @@ h
 S
 Q
 /DeviceRGB cs
-0.000 0.533 0.000 scn
+0.000 0.400 0.600 scn
 /DeviceRGB CS
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 SCN
 
 BT
 59.24 783.0649999999999 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -10618,12 +10835,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 783.0649999999999 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <696e74657266616365> Tj
 ET
 
@@ -10640,12 +10857,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 152.74 783.0649999999999 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <526570726573656e746174696f6e53657276696365> Tj
 ET
 
@@ -10761,8 +10978,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 125.24000000000001 753.585 Td
@@ -10855,7 +11072,18 @@ ET
 BT
 273.74 738.845 Td
 /F5.0 11 Tf
-<293b> Tj
+<29> 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
+279.24 738.845 Td
+/F5.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -10948,8 +11176,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 125.24000000000001 709.365 Td
@@ -11097,7 +11325,18 @@ ET
 BT
 284.74 679.885 Td
 /F5.0 11 Tf
-<293b> Tj
+<29> 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
+290.24 679.885 Td
+/F5.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -11190,8 +11429,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 125.24000000000001 650.405 Td
@@ -11339,7 +11578,18 @@ ET
 BT
 284.74 620.925 Td
 /F5.0 11 Tf
-<293b> Tj
+<29> 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
+290.24 620.925 Td
+/F5.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -11432,8 +11682,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 125.24000000000001 591.4449999999999 Td
@@ -11526,7 +11776,18 @@ ET
 BT
 295.74 576.7049999999999 Td
 /F5.0 11 Tf
-<293b> Tj
+<29> 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
+301.24 576.7049999999999 Td
+/F5.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -11619,8 +11880,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 125.24000000000001 547.2249999999999 Td
@@ -11751,8 +12012,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 262.74 517.7449999999999 Td
@@ -11790,7 +12051,18 @@ ET
 BT
 356.24 517.7449999999999 Td
 /F5.0 11 Tf
-<293b> Tj
+<29> 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
+361.74 517.7449999999999 Td
+/F5.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -11806,12 +12078,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 503.00499999999994 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -11828,12 +12100,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 119.74000000000001 503.00499999999994 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <737461746963> Tj
 ET
 
@@ -11850,12 +12122,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 158.24 503.00499999999994 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <696e74657266616365> Tj
 ET
 
@@ -11872,12 +12144,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 213.24 503.00499999999994 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <436f6e74657874> Tj
 ET
 
@@ -11894,12 +12166,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 257.24 503.00499999999994 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <657874656e6473> Tj
 ET
 
@@ -11999,7 +12271,29 @@ ET
 BT
 301.24 488.26499999999993 Td
 /F5.0 11 Tf
-<28293b> Tj
+<28> 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
+306.74 488.26499999999993 Td
+/F5.0 11 Tf
+<29> 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
+312.24 488.26499999999993 Td
+/F5.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -12490,28 +12784,27 @@ Q
 
 endstream
 endobj
-107 0 obj
+106 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 106 0 R
+/Contents 105 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F6.0 67 0 R
-/F5.0 40 0 R
-/F5.1 68 0 R
+/Font << /F5.0 40 0 R
+/F5.1 67 0 R
 /F1.0 8 0 R
 /F2.0 16 0 R
 >>
-/XObject << /Stamp1 332 0 R
+/XObject << /Stamp1 331 0 R
 >>
 >>
-/Annots [109 0 R]
+/Annots [108 0 R]
 >>
 endobj
-108 0 obj
-[107 0 R /XYZ 0 141.51000000000005 null]
+107 0 obj
+[106 0 R /XYZ 0 141.51000000000005 null]
 endobj
-109 0 obj
+108 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_ContentNegotiationService)
 /Subtype /Link
@@ -12519,7 +12812,7 @@ endobj
 /Type /Annot
 >>
 endobj
-110 0 obj
+109 0 obj
 << /Length 6264
 >>
 stream
@@ -12922,23 +13215,23 @@ Q
 
 endstream
 endobj
-111 0 obj
+110 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 110 0 R
+/Contents 109 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F5.0 40 0 R
 /F2.0 16 0 R
 >>
-/XObject << /Stamp1 332 0 R
+/XObject << /Stamp1 331 0 R
 >>
 >>
-/Annots [112 0 R 113 0 R 114 0 R 116 0 R 118 0 R 119 0 R]
+/Annots [111 0 R 112 0 R 113 0 R 115 0 R 117 0 R 118 0 R]
 >>
 endobj
-112 0 obj
+111 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -12949,7 +13242,7 @@ endobj
 /Type /Annot
 >>
 endobj
-113 0 obj
+112 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -12960,7 +13253,7 @@ endobj
 /Type /Annot
 >>
 endobj
-114 0 obj
+113 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -12971,10 +13264,10 @@ endobj
 /Type /Annot
 >>
 endobj
-115 0 obj
-[111 0 R /XYZ 0 735.3000000000001 null]
+114 0 obj
+[110 0 R /XYZ 0 735.3000000000001 null]
 endobj
-116 0 obj
+115 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -12985,10 +13278,10 @@ endobj
 /Type /Annot
 >>
 endobj
-117 0 obj
-[111 0 R /XYZ 0 626.9000000000002 null]
+116 0 obj
+[110 0 R /XYZ 0 626.9000000000002 null]
 endobj
-118 0 obj
+117 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_ContentNegotiationService)
 /Subtype /Link
@@ -12996,7 +13289,7 @@ endobj
 /Type /Annot
 >>
 endobj
-119 0 obj
+118 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -13007,7 +13300,7 @@ endobj
 /Type /Annot
 >>
 endobj
-120 0 obj
+119 0 obj
 << /Length 22720
 >>
 stream
@@ -14611,27 +14904,27 @@ Q
 
 endstream
 endobj
-121 0 obj
+120 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 120 0 R
+/Contents 119 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 16 0 R
 /F1.0 8 0 R
 /F4.0 39 0 R
 /F5.0 40 0 R
 >>
-/XObject << /Stamp1 332 0 R
+/XObject << /Stamp1 331 0 R
 >>
 >>
-/Annots [123 0 R 124 0 R 125 0 R 126 0 R 127 0 R 128 0 R 129 0 R 130 0 R 131 0 R 132 0 R 133 0 R 134 0 R 135 0 R 136 0 R 137 0 R 138 0 R 139 0 R 140 0 R 141 0 R 142 0 R 143 0 R 144 0 R 145 0 R]
+/Annots [122 0 R 123 0 R 124 0 R 125 0 R 126 0 R 127 0 R 128 0 R 129 0 R 130 0 R 131 0 R 132 0 R 133 0 R 134 0 R 135 0 R 136 0 R 137 0 R 138 0 R 139 0 R 140 0 R 141 0 R 142 0 R 143 0 R 144 0 R]
 >>
 endobj
-122 0 obj
-[121 0 R /XYZ 0 841.89 null]
+121 0 obj
+[120 0 R /XYZ 0 841.89 null]
 endobj
-123 0 obj
+122 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -14642,7 +14935,7 @@ endobj
 /Type /Annot
 >>
 endobj
-124 0 obj
+123 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_AuthenticationSessionProvider)
 /Subtype /Link
@@ -14650,7 +14943,7 @@ endobj
 /Type /Annot
 >>
 endobj
-125 0 obj
+124 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_AuthenticationSessionProvider)
 /Subtype /Link
@@ -14658,7 +14951,7 @@ endobj
 /Type /Annot
 >>
 endobj
-126 0 obj
+125 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_AuthenticationSessionProvider)
 /Subtype /Link
@@ -14666,7 +14959,7 @@ endobj
 /Type /Annot
 >>
 endobj
-127 0 obj
+126 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_AuthenticationSessionProvider)
 /Subtype /Link
@@ -14674,7 +14967,7 @@ endobj
 /Type /Annot
 >>
 endobj
-128 0 obj
+127 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_AuthenticationSessionProvider)
 /Subtype /Link
@@ -14682,7 +14975,7 @@ endobj
 /Type /Annot
 >>
 endobj
-129 0 obj
+128 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_AuthenticationSessionProvider)
 /Subtype /Link
@@ -14690,7 +14983,7 @@ endobj
 /Type /Annot
 >>
 endobj
-130 0 obj
+129 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_CommandDtoServiceInternal)
 /Subtype /Link
@@ -14698,7 +14991,7 @@ endobj
 /Type /Annot
 >>
 endobj
-131 0 obj
+130 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_CommandDtoServiceInternal)
 /Subtype /Link
@@ -14706,7 +14999,7 @@ endobj
 /Type /Annot
 >>
 endobj
-132 0 obj
+131 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_CommandDtoServiceInternal)
 /Subtype /Link
@@ -14714,7 +15007,7 @@ endobj
 /Type /Annot
 >>
 endobj
-133 0 obj
+132 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -14725,7 +15018,7 @@ endobj
 /Type /Annot
 >>
 endobj
-134 0 obj
+133 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -14736,7 +15029,7 @@ endobj
 /Type /Annot
 >>
 endobj
-135 0 obj
+134 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -14747,7 +15040,7 @@ endobj
 /Type /Annot
 >>
 endobj
-136 0 obj
+135 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_MessageBrokerServiceInternal)
 /Subtype /Link
@@ -14755,7 +15048,7 @@ endobj
 /Type /Annot
 >>
 endobj
-137 0 obj
+136 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_MessageBrokerServiceInternal)
 /Subtype /Link
@@ -14763,7 +15056,7 @@ endobj
 /Type /Annot
 >>
 endobj
-138 0 obj
+137 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_MessageBrokerServiceInternal)
 /Subtype /Link
@@ -14771,7 +15064,7 @@ endobj
 /Type /Annot
 >>
 endobj
-139 0 obj
+138 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_MessageBrokerServiceInternal)
 /Subtype /Link
@@ -14779,7 +15072,7 @@ endobj
 /Type /Annot
 >>
 endobj
-140 0 obj
+139 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -14790,7 +15083,7 @@ endobj
 /Type /Annot
 >>
 endobj
-141 0 obj
+140 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_InteractionDtoServiceInternal)
 /Subtype /Link
@@ -14798,7 +15091,7 @@ endobj
 /Type /Annot
 >>
 endobj
-142 0 obj
+141 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_InteractionDtoServiceInternal)
 /Subtype /Link
@@ -14806,7 +15099,7 @@ endobj
 /Type /Annot
 >>
 endobj
-143 0 obj
+142 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_InteractionDtoServiceInternal)
 /Subtype /Link
@@ -14814,7 +15107,7 @@ endobj
 /Type /Annot
 >>
 endobj
-144 0 obj
+143 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_InteractionDtoServiceInternal)
 /Subtype /Link
@@ -14822,7 +15115,7 @@ endobj
 /Type /Annot
 >>
 endobj
-145 0 obj
+144 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -14833,8 +15126,8 @@ endobj
 /Type /Annot
 >>
 endobj
-146 0 obj
-<< /Length 16441
+145 0 obj
+<< /Length 17295
 >>
 stream
 q
@@ -15213,12 +15506,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24000000000001 502.43500000000034 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -15235,12 +15528,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 502.43500000000034 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <696e74657266616365> Tj
 ET
 
@@ -15257,12 +15550,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 152.74 502.43500000000034 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <41757468656e7469636174696f6e53657373696f6e50726f7669646572> Tj
 ET
 
@@ -15340,7 +15633,29 @@ ET
 BT
 334.24 487.69500000000033 Td
 /F5.0 11 Tf
-<28293b> Tj
+<28> 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
+339.74 487.69500000000033 Td
+/F5.0 11 Tf
+<29> 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
+345.24 487.69500000000033 Td
+/F5.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -15502,8 +15817,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 163.74 364.8750000000003 Td
@@ -15519,13 +15834,35 @@ ET
 BT
 257.24 364.8750000000003 Td
 /F5.0 11 Tf
-<28292e> Tj
+<28> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+262.74 364.8750000000003 Td
+/F5.0 11 Tf
+<29> 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
+268.24 364.8750000000003 Td
+/F5.0 11 Tf
+<2e> 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
 273.74 364.8750000000003 Td
@@ -15541,7 +15878,29 @@ ET
 BT
 405.74 364.8750000000003 Td
 /F5.0 11 Tf
-<28293b> Tj
+<28> 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
+411.24 364.8750000000003 Td
+/F5.0 11 Tf
+<29> 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
+416.74 364.8750000000003 Td
+/F5.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -15868,30 +16227,29 @@ Q
 
 endstream
 endobj
-147 0 obj
+146 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 146 0 R
+/Contents 145 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F5.0 40 0 R
 /F2.0 16 0 R
-/F6.0 67 0 R
 >>
-/XObject << /Stamp1 332 0 R
+/XObject << /Stamp1 331 0 R
 >>
 >>
-/Annots [150 0 R 152 0 R 153 0 R 154 0 R]
+/Annots [149 0 R 151 0 R 152 0 R 153 0 R]
 >>
 endobj
+147 0 obj
+[146 0 R /XYZ 0 685.7400000000001 null]
+endobj
 148 0 obj
-[147 0 R /XYZ 0 685.7400000000001 null]
+[146 0 R /XYZ 0 586.3200000000002 null]
 endobj
 149 0 obj
-[147 0 R /XYZ 0 586.3200000000002 null]
-endobj
-150 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -15902,10 +16260,10 @@ endobj
 /Type /Annot
 >>
 endobj
-151 0 obj
-[147 0 R /XYZ 0 295.40000000000026 null]
+150 0 obj
+[146 0 R /XYZ 0 295.40000000000026 null]
 endobj
-152 0 obj
+151 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -15916,7 +16274,7 @@ endobj
 /Type /Annot
 >>
 endobj
-153 0 obj
+152 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -15927,7 +16285,7 @@ endobj
 /Type /Annot
 >>
 endobj
-154 0 obj
+153 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -15938,11 +16296,11 @@ endobj
 /Type /Annot
 >>
 endobj
-155 0 obj
-[147 0 R /XYZ 0 180.20000000000022 null]
+154 0 obj
+[146 0 R /XYZ 0 180.20000000000022 null]
 endobj
-156 0 obj
-<< /Length 34436
+155 0 obj
+<< /Length 35117
 >>
 stream
 q
@@ -15976,13 +16334,13 @@ h
 S
 Q
 /DeviceRGB cs
-0.000 0.533 0.000 scn
+0.000 0.400 0.600 scn
 /DeviceRGB CS
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 SCN
 
 BT
 59.24 783.0649999999999 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -15999,12 +16357,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 783.0649999999999 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <696e74657266616365> Tj
 ET
 
@@ -16021,12 +16379,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 152.74 783.0649999999999 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <436f6d6d616e6444746f53657276696365496e7465726e616c> Tj
 ET
 
@@ -16065,8 +16423,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 768.3249999999999 Td
@@ -16164,8 +16522,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 125.24000000000001 738.845 Td
@@ -16219,8 +16577,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 125.24000000000001 724.105 Td
@@ -16274,8 +16632,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 240.74 724.105 Td
@@ -16285,8 +16643,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 273.74 724.105 Td
@@ -16324,7 +16682,18 @@ ET
 BT
 312.24 724.105 Td
 /F5.0 11 Tf
-<293b> Tj
+<29> 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
+317.74 724.105 Td
+/F5.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16417,8 +16786,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 125.24000000000001 694.625 Td
@@ -16571,8 +16940,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 196.74 665.145 Td
@@ -16610,7 +16979,18 @@ ET
 BT
 273.74 665.145 Td
 /F5.0 11 Tf
-<293b> Tj
+<29> 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
+279.24 665.145 Td
+/F5.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16703,12 +17083,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 125.24000000000001 635.665 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <66696e616c> Tj
 ET
 
@@ -16725,8 +17105,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 158.24 635.665 Td
@@ -16813,12 +17193,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 125.24000000000001 620.925 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <66696e616c> Tj
 ET
 
@@ -16890,12 +17270,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 125.24000000000001 606.185 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <66696e616c> Tj
 ET
 
@@ -16951,7 +17331,18 @@ ET
 BT
 334.24 606.185 Td
 /F5.0 11 Tf
-<293b> Tj
+<29> 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
+339.74 606.185 Td
+/F5.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16967,12 +17358,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 81.24000000000001 591.4449999999999 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <766f6964> Tj
 ET
 
@@ -17044,12 +17435,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 125.24000000000001 576.7049999999999 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <66696e616c> Tj
 ET
 
@@ -17121,12 +17512,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 125.24000000000001 561.9649999999999 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <66696e616c> Tj
 ET
 
@@ -17198,12 +17589,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 125.24000000000001 547.2249999999999 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <66696e616c> Tj
 ET
 
@@ -17231,8 +17622,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 229.74 547.2249999999999 Td
@@ -17270,7 +17661,18 @@ ET
 BT
 306.74 547.2249999999999 Td
 /F5.0 11 Tf
-<293b> Tj
+<29> 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
+312.24 547.2249999999999 Td
+/F5.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17286,12 +17688,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 81.24000000000001 532.4849999999999 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <766f6964> Tj
 ET
 
@@ -17363,12 +17765,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 125.24000000000001 517.7449999999999 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <66696e616c> Tj
 ET
 
@@ -17440,12 +17842,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 125.24000000000001 503.00499999999994 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <66696e616c> Tj
 ET
 
@@ -17517,12 +17919,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 125.24000000000001 488.26499999999993 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <66696e616c> Tj
 ET
 
@@ -17578,7 +17980,18 @@ ET
 BT
 301.24 488.26499999999993 Td
 /F5.0 11 Tf
-<293b> Tj
+<29> 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
+306.74 488.26499999999993 Td
+/F5.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -18289,26 +18702,25 @@ Q
 
 endstream
 endobj
-157 0 obj
+156 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 156 0 R
+/Contents 155 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F6.0 67 0 R
-/F5.0 40 0 R
-/F5.1 68 0 R
+/Font << /F5.0 40 0 R
+/F5.1 67 0 R
 /F1.0 8 0 R
 /F4.0 39 0 R
 /F2.0 16 0 R
 >>
-/XObject << /Stamp1 332 0 R
+/XObject << /Stamp1 331 0 R
 >>
 >>
-/Annots [158 0 R 159 0 R 160 0 R 164 0 R 165 0 R 167 0 R]
+/Annots [157 0 R 158 0 R 159 0 R 163 0 R 164 0 R 166 0 R]
 >>
 endobj
-158 0 obj
+157 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -18319,7 +18731,7 @@ endobj
 /Type /Annot
 >>
 endobj
-159 0 obj
+158 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -18330,7 +18742,7 @@ endobj
 /Type /Annot
 >>
 endobj
-160 0 obj
+159 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -18341,20 +18753,20 @@ endobj
 /Type /Annot
 >>
 endobj
-161 0 obj
-[157 0 R /XYZ 0 200.4699999999999 null]
+160 0 obj
+[156 0 R /XYZ 0 200.4699999999999 null]
 endobj
-162 0 obj
+161 0 obj
 << /Limits [(_rgfis) (implementation-2)]
-/Names [(_rgfis) 13 0 R (_rgfis_application-layer) 122 0 R (_rgfis_persistence-layer) 185 0 R (_rgfis_presentation-layer) 37 0 R (_rgfis_spi_AuditingServiceInternal) 219 0 R (_rgfis_spi_AuthenticationSessionProvider) 148 0 R (_rgfis_spi_ChangedObjectsServiceInternal) 236 0 R (_rgfis_spi_CommandDtoServiceInternal) 151 0 R (_rgfis_spi_ContentNegotiationService) 53 0 R (_rgfis_spi_InteractionDtoServiceInternal) 173 0 R (_rgfis_spi_MessageBrokerServiceInternal) 166 0 R (_rgfis_spi_PersistenceSessionServiceInternal) 253 0 R (_rgfis_spi_PublishingServiceInternal) 259 0 R (_rgfis_spi_RepresentationService) 99 0 R (_rgfis_spi_TransactionStateProviderInternal) 284 0 R (configuration) 86 0 R (implementation) 69 0 R (implementation-2) 108 0 R]
+/Names [(_rgfis) 13 0 R (_rgfis_application-layer) 121 0 R (_rgfis_persistence-layer) 184 0 R (_rgfis_presentation-layer) 37 0 R (_rgfis_spi_AuditingServiceInternal) 218 0 R (_rgfis_spi_AuthenticationSessionProvider) 147 0 R (_rgfis_spi_ChangedObjectsServiceInternal) 235 0 R (_rgfis_spi_CommandDtoServiceInternal) 150 0 R (_rgfis_spi_ContentNegotiationService) 53 0 R (_rgfis_spi_InteractionDtoServiceInternal) 172 0 R (_rgfis_spi_MessageBrokerServiceInternal) 165 0 R (_rgfis_spi_PersistenceSessionServiceInternal) 252 0 R (_rgfis_spi_PublishingServiceInternal) 258 0 R (_rgfis_spi_RepresentationService) 98 0 R (_rgfis_spi_TransactionStateProviderInternal) 283 0 R (configuration) 85 0 R (implementation) 68 0 R (implementation-2) 107 0 R]
 >>
 endobj
-163 0 obj
+162 0 obj
 << /Limits [(other-guides) (related-services-3)]
-/Names [(other-guides) 19 0 R (registering-the-service) 229 0 R (registering-the-service-2) 245 0 R (registering-the-service-3) 274 0 R (registering-the-services) 90 0 R (registering-the-services-2) 115 0 R (related-classes) 231 0 R (related-classes-2) 249 0 R (related-classes-3) 278 0 R (related-services) 94 0 R (related-services-2) 117 0 R (related-services-3) 161 0 R]
+/Names [(other-guides) 19 0 R (registering-the-service) 228 0 R (registering-the-service-2) 244 0 R (registering-the-service-3) 273 0 R (registering-the-services) 89 0 R (registering-the-services-2) 114 0 R (related-classes) 230 0 R (related-classes-2) 248 0 R (related-classes-3) 277 0 R (related-services) 93 0 R (related-services-2) 116 0 R (related-services-3) 160 0 R]
 >>
 endobj
-164 0 obj
+163 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_InteractionDtoServiceInternal)
 /Subtype /Link
@@ -18362,7 +18774,7 @@ endobj
 /Type /Annot
 >>
 endobj
-165 0 obj
+164 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -18373,10 +18785,10 @@ endobj
 /Type /Annot
 >>
 endobj
-166 0 obj
-[157 0 R /XYZ 0 123.62999999999988 null]
+165 0 obj
+[156 0 R /XYZ 0 123.62999999999988 null]
 endobj
-167 0 obj
+166 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -18387,8 +18799,8 @@ endobj
 /Type /Annot
 >>
 endobj
-168 0 obj
-<< /Length 16631
+167 0 obj
+<< /Length 17057
 >>
 stream
 q
@@ -18503,12 +18915,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24000000000001 670.4450000000002 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -18525,12 +18937,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 670.4450000000002 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <696e74657266616365> Tj
 ET
 
@@ -18547,12 +18959,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 152.74 670.4450000000002 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <4d65737361676542726f6b657253657276696365496e7465726e616c> Tj
 ET
 
@@ -18591,12 +19003,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 81.24000000000001 655.7050000000002 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <766f6964> Tj
 ET
 
@@ -18635,8 +19047,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 169.24 655.7050000000002 Td
@@ -18674,7 +19086,18 @@ ET
 BT
 246.24 655.7050000000002 Td
 /F5.0 11 Tf
-<293b> Tj
+<29> 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
+251.74 655.7050000000002 Td
+/F5.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -18690,12 +19113,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 81.24000000000001 640.9650000000001 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <766f6964> Tj
 ET
 
@@ -18734,8 +19157,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 158.24 640.9650000000001 Td
@@ -18773,7 +19196,18 @@ ET
 BT
 235.24 640.9650000000001 Td
 /F5.0 11 Tf
-<293b> Tj
+<29> 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
+240.74 640.9650000000001 Td
+/F5.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -18789,12 +19223,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 81.24000000000001 626.2250000000003 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <766f6964> Tj
 ET
 
@@ -18833,8 +19267,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 169.24 626.2250000000003 Td
@@ -18872,7 +19306,18 @@ ET
 BT
 246.24 626.2250000000003 Td
 /F5.0 11 Tf
-<293b> Tj
+<29> 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
+251.74 626.2250000000003 Td
+/F5.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -19120,7 +19565,7 @@ ET
 
 BT
 69.66000000000001 431.42600000000033 Td
-/F7.0 10.5 Tf
+/F6.0 10.5 Tf
 <c9> Tj
 ET
 
@@ -19153,7 +19598,7 @@ ET
 
 BT
 316.81929492187504 431.42600000000033 Td
-/F7.0 10.5 Tf
+/F6.0 10.5 Tf
 <c9> Tj
 ET
 
@@ -19439,32 +19884,31 @@ Q
 
 endstream
 endobj
-169 0 obj
+168 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 168 0 R
+/Contents 167 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F3.1 17 0 R
 /F1.0 8 0 R
 /F5.0 40 0 R
 /F2.0 16 0 R
-/F6.0 67 0 R
-/F7.0 72 0 R
+/F6.0 71 0 R
 >>
-/XObject << /Stamp1 332 0 R
+/XObject << /Stamp1 331 0 R
 >>
 >>
-/Annots [172 0 R 174 0 R 175 0 R]
+/Annots [171 0 R 173 0 R 174 0 R]
 >>
 endobj
+169 0 obj
+[168 0 R /XYZ 0 754.33 null]
+endobj
 170 0 obj
-[169 0 R /XYZ 0 754.33 null]
+[168 0 R /XYZ 0 585.5700000000002 null]
 endobj
 171 0 obj
-[169 0 R /XYZ 0 585.5700000000002 null]
-endobj
-172 0 obj
 << /Border [0 0 0]
 /Dest (rgmvn.adoc)
 /Subtype /Link
@@ -19472,10 +19916,10 @@ endobj
 /Type /Annot
 >>
 endobj
-173 0 obj
-[169 0 R /XYZ 0 415.61000000000035 null]
+172 0 obj
+[168 0 R /XYZ 0 415.61000000000035 null]
 endobj
-174 0 obj
+173 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -19486,7 +19930,7 @@ endobj
 /Type /Annot
 >>
 endobj
-175 0 obj
+174 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -19497,11 +19941,11 @@ endobj
 /Type /Annot
 >>
 endobj
-176 0 obj
-[169 0 R /XYZ 0 300.4100000000003 null]
+175 0 obj
+[168 0 R /XYZ 0 300.4100000000003 null]
 endobj
-177 0 obj
-<< /Length 17342
+176 0 obj
+<< /Length 17738
 >>
 stream
 q
@@ -19535,13 +19979,13 @@ h
 S
 Q
 /DeviceRGB cs
-0.000 0.533 0.000 scn
+0.000 0.400 0.600 scn
 /DeviceRGB CS
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 SCN
 
 BT
 59.24 783.0649999999999 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -19558,12 +20002,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 783.0649999999999 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <696e74657266616365> Tj
 ET
 
@@ -19580,12 +20024,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 152.74 783.0649999999999 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <496e746572616374696f6e44746f53657276696365496e7465726e616c> Tj
 ET
 
@@ -19811,8 +20255,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 125.24000000000001 724.105 Td
@@ -19883,7 +20327,18 @@ ET
 BT
 323.24 724.105 Td
 /F5.0 11 Tf
-<293b> Tj
+<29> 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
+328.74 724.105 Td
+/F5.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -20125,7 +20580,18 @@ ET
 BT
 312.24 665.145 Td
 /F5.0 11 Tf
-<293b> Tj
+<29> 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
+317.74 665.145 Td
+/F5.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -20328,8 +20794,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 125.24000000000001 606.185 Td
@@ -20367,7 +20833,18 @@ ET
 BT
 218.74 606.185 Td
 /F5.0 11 Tf
-<293b> Tj
+<29> 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
+224.24 606.185 Td
+/F5.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -20670,25 +21147,24 @@ Q
 
 endstream
 endobj
-178 0 obj
+177 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 177 0 R
+/Contents 176 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F6.0 67 0 R
-/F5.0 40 0 R
-/F5.1 68 0 R
+/Font << /F5.0 40 0 R
+/F5.1 67 0 R
 /F1.0 8 0 R
 /F2.0 16 0 R
 >>
-/XObject << /Stamp1 332 0 R
+/XObject << /Stamp1 331 0 R
 >>
 >>
-/Annots [179 0 R 181 0 R 182 0 R]
+/Annots [178 0 R 180 0 R 181 0 R]
 >>
 endobj
-179 0 obj
+178 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -20699,10 +21175,10 @@ endobj
 /Type /Annot
 >>
 endobj
-180 0 obj
-[178 0 R /XYZ 0 425.07 null]
+179 0 obj
+[177 0 R /XYZ 0 425.07 null]
 endobj
-181 0 obj
+180 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_CommandDtoServiceInternal)
 /Subtype /Link
@@ -20710,7 +21186,7 @@ endobj
 /Type /Annot
 >>
 endobj
-182 0 obj
+181 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -20721,7 +21197,7 @@ endobj
 /Type /Annot
 >>
 endobj
-183 0 obj
+182 0 obj
 << /Length 26130
 >>
 stream
@@ -22511,27 +22987,27 @@ Q
 
 endstream
 endobj
-184 0 obj
+183 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 183 0 R
+/Contents 182 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 16 0 R
 /F1.0 8 0 R
 /F4.0 39 0 R
 /F5.0 40 0 R
 >>
-/XObject << /Stamp1 332 0 R
+/XObject << /Stamp1 331 0 R
 >>
 >>
-/Annots [186 0 R 187 0 R 188 0 R 189 0 R 190 0 R 191 0 R 192 0 R 193 0 R 194 0 R 195 0 R 196 0 R 197 0 R 198 0 R 199 0 R 200 0 R 201 0 R 202 0 R 203 0 R 204 0 R 205 0 R 206 0 R 207 0 R 208 0 R 209 0 R 210 0 R 211 0 R 212 0 R 213 0 R 214 0 R 215 0 R 216 0 R]
+/Annots [185 0 R 186 0 R 187 0 R 188 0 R 189 0 R 190 0 R 191 0 R 192 0 R 193 0 R 194 0 R 195 0 R 196 0 R 197 0 R 198 0 R 199 0 R 200 0 R 201 0 R 202 0 R 203 0 R 204 0 R 205 0 R 206 0 R 207 0 R 208 0 R 209 0 R 210 0 R 211 0 R 212 0 R 213 0 R 214 0 R 215 0 R]
 >>
 endobj
-185 0 obj
-[184 0 R /XYZ 0 841.89 null]
+184 0 obj
+[183 0 R /XYZ 0 841.89 null]
 endobj
-186 0 obj
+185 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -22542,7 +23018,7 @@ endobj
 /Type /Annot
 >>
 endobj
-187 0 obj
+186 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_AuditingServiceInternal)
 /Subtype /Link
@@ -22550,7 +23026,7 @@ endobj
 /Type /Annot
 >>
 endobj
-188 0 obj
+187 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_AuditingServiceInternal)
 /Subtype /Link
@@ -22558,7 +23034,7 @@ endobj
 /Type /Annot
 >>
 endobj
-189 0 obj
+188 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_AuditingServiceInternal)
 /Subtype /Link
@@ -22566,7 +23042,7 @@ endobj
 /Type /Annot
 >>
 endobj
-190 0 obj
+189 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_ChangedObjectsServiceInternal)
 /Subtype /Link
@@ -22574,7 +23050,7 @@ endobj
 /Type /Annot
 >>
 endobj
-191 0 obj
+190 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_ChangedObjectsServiceInternal)
 /Subtype /Link
@@ -22582,7 +23058,7 @@ endobj
 /Type /Annot
 >>
 endobj
-192 0 obj
+191 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_AuditerService)
 /Subtype /Link
@@ -22590,7 +23066,7 @@ endobj
 /Type /Annot
 >>
 endobj
-193 0 obj
+192 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_ChangedObjectsServiceInternal)
 /Subtype /Link
@@ -22598,7 +23074,7 @@ endobj
 /Type /Annot
 >>
 endobj
-194 0 obj
+193 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_ChangedObjectsServiceInternal)
 /Subtype /Link
@@ -22606,7 +23082,7 @@ endobj
 /Type /Annot
 >>
 endobj
-195 0 obj
+194 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_ChangedObjectsServiceInternal)
 /Subtype /Link
@@ -22614,7 +23090,7 @@ endobj
 /Type /Annot
 >>
 endobj
-196 0 obj
+195 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_ChangedObjectsServiceInternal)
 /Subtype /Link
@@ -22622,7 +23098,7 @@ endobj
 /Type /Annot
 >>
 endobj
-197 0 obj
+196 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_PersistenceSessionServiceInternal)
 /Subtype /Link
@@ -22630,7 +23106,7 @@ endobj
 /Type /Annot
 >>
 endobj
-198 0 obj
+197 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_PersistenceSessionServiceInternal)
 /Subtype /Link
@@ -22638,7 +23114,7 @@ endobj
 /Type /Annot
 >>
 endobj
-199 0 obj
+198 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_PersistenceSessionServiceInternal)
 /Subtype /Link
@@ -22646,7 +23122,7 @@ endobj
 /Type /Annot
 >>
 endobj
-200 0 obj
+199 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_PersistenceSessionServiceInternal)
 /Subtype /Link
@@ -22654,7 +23130,7 @@ endobj
 /Type /Annot
 >>
 endobj
-201 0 obj
+200 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_PersistenceSessionServiceInternal)
 /Subtype /Link
@@ -22662,7 +23138,7 @@ endobj
 /Type /Annot
 >>
 endobj
-202 0 obj
+201 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_PersistenceSessionServiceInternal)
 /Subtype /Link
@@ -22670,7 +23146,7 @@ endobj
 /Type /Annot
 >>
 endobj
-203 0 obj
+202 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_PublishingServiceInternal)
 /Subtype /Link
@@ -22678,7 +23154,7 @@ endobj
 /Type /Annot
 >>
 endobj
-204 0 obj
+203 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_PublishingServiceInternal)
 /Subtype /Link
@@ -22686,7 +23162,7 @@ endobj
 /Type /Annot
 >>
 endobj
-205 0 obj
+204 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_PublishingServiceInternal)
 /Subtype /Link
@@ -22694,7 +23170,7 @@ endobj
 /Type /Annot
 >>
 endobj
-206 0 obj
+205 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_ChangedObjectsServiceInternal)
 /Subtype /Link
@@ -22702,7 +23178,7 @@ endobj
 /Type /Annot
 >>
 endobj
-207 0 obj
+206 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_ChangedObjectsServiceInternal)
 /Subtype /Link
@@ -22710,7 +23186,7 @@ endobj
 /Type /Annot
 >>
 endobj
-208 0 obj
+207 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -22721,7 +23197,7 @@ endobj
 /Type /Annot
 >>
 endobj
-209 0 obj
+208 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -22732,7 +23208,7 @@ endobj
 /Type /Annot
 >>
 endobj
-210 0 obj
+209 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -22743,7 +23219,7 @@ endobj
 /Type /Annot
 >>
 endobj
-211 0 obj
+210 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_TransactionStateProviderInternal)
 /Subtype /Link
@@ -22751,7 +23227,7 @@ endobj
 /Type /Annot
 >>
 endobj
-212 0 obj
+211 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_TransactionStateProviderInternal)
 /Subtype /Link
@@ -22759,7 +23235,7 @@ endobj
 /Type /Annot
 >>
 endobj
-213 0 obj
+212 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_TransactionStateProviderInternal)
 /Subtype /Link
@@ -22767,7 +23243,7 @@ endobj
 /Type /Annot
 >>
 endobj
-214 0 obj
+213 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_TransactionStateProviderInternal)
 /Subtype /Link
@@ -22775,7 +23251,7 @@ endobj
 /Type /Annot
 >>
 endobj
-215 0 obj
+214 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_TransactionStateProviderInternal)
 /Subtype /Link
@@ -22783,7 +23259,7 @@ endobj
 /Type /Annot
 >>
 endobj
-216 0 obj
+215 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_TransactionStateProviderInternal)
 /Subtype /Link
@@ -22791,8 +23267,8 @@ endobj
 /Type /Annot
 >>
 endobj
-217 0 obj
-<< /Length 22244
+216 0 obj
+<< /Length 22812
 >>
 stream
 q
@@ -23096,12 +23572,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24000000000001 575.8250000000002 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -23118,12 +23594,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 575.8250000000002 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -23140,12 +23616,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 575.8250000000002 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <4175646974696e6753657276696365496e7465726e616c> Tj
 ET
 
@@ -23184,12 +23660,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 561.0850000000002 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -23206,12 +23682,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 561.0850000000002 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <626f6f6c65616e> Tj
 ET
 
@@ -23245,7 +23721,29 @@ ET
 BT
 207.74 561.0850000000002 Td
 /F5.0 11 Tf
-<28293b> Tj
+<28> 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.24 561.0850000000002 Td
+/F5.0 11 Tf
+<29> 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
+218.74 561.0850000000002 Td
+/F5.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -23283,12 +23781,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 546.3450000000003 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -23305,12 +23803,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 546.3450000000003 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <766f6964> Tj
 ET
 
@@ -23344,7 +23842,29 @@ ET
 BT
 174.74 546.3450000000003 Td
 /F5.0 11 Tf
-<28293b> Tj
+<28> 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
+180.24 546.3450000000003 Td
+/F5.0 11 Tf
+<29> 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
+185.74 546.3450000000003 Td
+/F5.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -24210,29 +24730,28 @@ Q
 
 endstream
 endobj
-218 0 obj
+217 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 217 0 R
+/Contents 216 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 16 0 R
 /F5.0 40 0 R
 /F1.0 8 0 R
 /F3.1 17 0 R
-/F6.0 67 0 R
-/F5.1 68 0 R
+/F5.1 67 0 R
 >>
-/XObject << /Stamp1 332 0 R
+/XObject << /Stamp1 331 0 R
 >>
 >>
-/Annots [220 0 R 221 0 R 222 0 R 223 0 R 225 0 R 226 0 R 227 0 R 228 0 R 230 0 R 232 0 R 233 0 R 234 0 R 235 0 R 237 0 R 238 0 R]
+/Annots [219 0 R 220 0 R 221 0 R 222 0 R 224 0 R 225 0 R 226 0 R 227 0 R 229 0 R 231 0 R 232 0 R 233 0 R 234 0 R 236 0 R 237 0 R]
 >>
 endobj
-219 0 obj
-[218 0 R /XYZ 0 841.89 null]
+218 0 obj
+[217 0 R /XYZ 0 841.89 null]
 endobj
-220 0 obj
+219 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -24243,7 +24762,7 @@ endobj
 /Type /Annot
 >>
 endobj
-221 0 obj
+220 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -24254,7 +24773,7 @@ endobj
 /Type /Annot
 >>
 endobj
-222 0 obj
+221 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -24265,7 +24784,7 @@ endobj
 /Type /Annot
 >>
 endobj
-223 0 obj
+222 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -24276,10 +24795,10 @@ endobj
 /Type /Annot
 >>
 endobj
-224 0 obj
-[218 0 R /XYZ 0 659.71 null]
+223 0 obj
+[217 0 R /XYZ 0 659.71 null]
 endobj
-225 0 obj
+224 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -24290,7 +24809,7 @@ endobj
 /Type /Annot
 >>
 endobj
-226 0 obj
+225 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -24301,7 +24820,7 @@ endobj
 /Type /Annot
 >>
 endobj
-227 0 obj
+226 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_ChangedObjectsServiceInternal)
 /Subtype /Link
@@ -24309,7 +24828,7 @@ endobj
 /Type /Annot
 >>
 endobj
-228 0 obj
+227 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -24320,10 +24839,10 @@ endobj
 /Type /Annot
 >>
 endobj
-229 0 obj
-[218 0 R /XYZ 0 402.7900000000002 null]
+228 0 obj
+[217 0 R /XYZ 0 402.7900000000002 null]
 endobj
-230 0 obj
+229 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -24334,10 +24853,10 @@ endobj
 /Type /Annot
 >>
 endobj
-231 0 obj
-[218 0 R /XYZ 0 294.39000000000016 null]
+230 0 obj
+[217 0 R /XYZ 0 294.39000000000016 null]
 endobj
-232 0 obj
+231 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_ChangedObjectsServiceInternal)
 /Subtype /Link
@@ -24345,7 +24864,7 @@ endobj
 /Type /Annot
 >>
 endobj
-233 0 obj
+232 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -24356,7 +24875,7 @@ endobj
 /Type /Annot
 >>
 endobj
-234 0 obj
+233 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_PublishingServiceInternal)
 /Subtype /Link
@@ -24364,7 +24883,7 @@ endobj
 /Type /Annot
 >>
 endobj
-235 0 obj
+234 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -24375,10 +24894,10 @@ endobj
 /Type /Annot
 >>
 endobj
-236 0 obj
-[218 0 R /XYZ 0 158.21000000000012 null]
+235 0 obj
+[217 0 R /XYZ 0 158.21000000000012 null]
 endobj
-237 0 obj
+236 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_AuditingServiceInternal)
 /Subtype /Link
@@ -24386,7 +24905,7 @@ endobj
 /Type /Annot
 >>
 endobj
-238 0 obj
+237 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_PublishingServiceInternal)
 /Subtype /Link
@@ -24394,8 +24913,8 @@ endobj
 /Type /Annot
 >>
 endobj
-239 0 obj
-<< /Length 29228
+238 0 obj
+<< /Length 31495
 >>
 stream
 q
@@ -24450,8 +24969,8 @@ f
 h
 S
 Q
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 59.24 726.8050000000001 Td
@@ -24461,12 +24980,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24 712.065 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -24483,12 +25002,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 712.065 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -24505,12 +25024,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 712.065 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <4368616e6765644f626a6563747353657276696365496e7465726e616c> Tj
 ET
 
@@ -24549,12 +25068,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 697.325 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -24571,12 +25090,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 697.325 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <766f6964> Tj
 ET
 
@@ -24615,12 +25134,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 224.24 697.325 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <66696e616c> Tj
 ET
 
@@ -24676,7 +25195,18 @@ ET
 BT
 372.74 697.325 Td
 /F5.0 11 Tf
-<293b> Tj
+<29> 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
+378.24 697.325 Td
+/F5.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -24712,12 +25242,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 667.8450000000001 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -24734,12 +25264,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 667.8450000000001 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <766f6964> Tj
 ET
 
@@ -24778,12 +25308,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 229.74 667.8450000000001 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <66696e616c> Tj
 ET
 
@@ -24839,7 +25369,18 @@ ET
 BT
 378.24 667.8450000000001 Td
 /F5.0 11 Tf
-<293b> Tj
+<29> 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
+383.74 667.8450000000001 Td
+/F5.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -24855,12 +25396,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 653.1050000000001 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -24877,12 +25418,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 653.1050000000001 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <766f6964> Tj
 ET
 
@@ -24921,12 +25462,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 229.74 653.1050000000001 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <66696e616c> Tj
 ET
 
@@ -24982,7 +25523,18 @@ ET
 BT
 378.24 653.1050000000001 Td
 /F5.0 11 Tf
-<293b> Tj
+<29> 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
+383.74 653.1050000000001 Td
+/F5.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -24998,12 +25550,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 623.6250000000001 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -25020,12 +25572,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 623.6250000000001 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <626f6f6c65616e> Tj
 ET
 
@@ -25059,7 +25611,29 @@ ET
 BT
 262.74 623.6250000000001 Td
 /F5.0 11 Tf
-<28293b> Tj
+<28> 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
+268.24 623.6250000000001 Td
+/F5.0 11 Tf
+<29> 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
+273.74 623.6250000000001 Td
+/F5.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -25095,12 +25669,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 579.4050000000001 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -25117,8 +25691,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 579.4050000000001 Td
@@ -25194,8 +25768,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 312.24 579.4050000000001 Td
@@ -25242,7 +25816,29 @@ ET
 BT
 224.24 564.6650000000001 Td
 /F5.0 11 Tf
-<28293b> Tj
+<28> 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
+229.74 564.6650000000001 Td
+/F5.0 11 Tf
+<29> 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
+235.24 564.6650000000001 Td
+/F5.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -25280,12 +25876,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 549.9250000000001 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -25302,12 +25898,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 549.9250000000001 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <696e74> Tj
 ET
 
@@ -25341,7 +25937,29 @@ ET
 BT
 251.74 549.9250000000001 Td
 /F5.0 11 Tf
-<28293b> Tj
+<28> 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
+257.24 549.9250000000001 Td
+/F5.0 11 Tf
+<29> 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
+262.74 549.9250000000001 Td
+/F5.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -25357,12 +25975,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 535.1850000000001 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -25379,12 +25997,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 535.1850000000001 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <696e74> Tj
 ET
 
@@ -25418,7 +26036,29 @@ ET
 BT
 306.74 535.1850000000001 Td
 /F5.0 11 Tf
-<28293b> Tj
+<28> 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
+312.24 535.1850000000001 Td
+/F5.0 11 Tf
+<29> 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
+317.74 535.1850000000001 Td
+/F5.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -25434,12 +26074,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 505.70500000000004 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -25456,8 +26096,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 505.70500000000004 Td
@@ -25478,8 +26118,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 141.74 505.70500000000004 Td
@@ -25500,8 +26140,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 163.74 505.70500000000004 Td
@@ -25572,7 +26212,18 @@ ET
 BT
 394.74 505.70500000000004 Td
 /F5.0 11 Tf
-<3e3e> Tj
+<3e> 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
+400.24 505.70500000000004 Td
+/F5.0 11 Tf
+<3e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -25603,7 +26254,29 @@ ET
 BT
 202.24 490.96500000000003 Td
 /F5.0 11 Tf
-<28293b> Tj
+<28> 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.74 490.96500000000003 Td
+/F5.0 11 Tf
+<29> 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.24 490.96500000000003 Td
+/F5.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -25641,12 +26314,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 461.48500000000007 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -25663,12 +26336,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 461.48500000000007 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <766f6964> Tj
 ET
 
@@ -25702,7 +26375,29 @@ ET
 BT
 301.24 461.48500000000007 Td
 /F5.0 11 Tf
-<28293b> Tj
+<28> 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
+306.74 461.48500000000007 Td
+/F5.0 11 Tf
+<29> 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
+312.24 461.48500000000007 Td
+/F5.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -26357,28 +27052,27 @@ Q
 
 endstream
 endobj
-240 0 obj
+239 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 239 0 R
+/Contents 238 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 16 0 R
 /F1.0 8 0 R
 /F5.0 40 0 R
-/F6.0 67 0 R
-/F5.1 68 0 R
+/F5.1 67 0 R
 >>
-/XObject << /Stamp1 332 0 R
+/XObject << /Stamp1 331 0 R
 >>
 >>
-/Annots [242 0 R 243 0 R 244 0 R 246 0 R]
+/Annots [241 0 R 242 0 R 243 0 R 245 0 R]
 >>
 endobj
-241 0 obj
-[240 0 R /XYZ 0 841.89 null]
+240 0 obj
+[239 0 R /XYZ 0 841.89 null]
 endobj
-242 0 obj
+241 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -26389,7 +27083,7 @@ endobj
 /Type /Annot
 >>
 endobj
-243 0 obj
+242 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_PublishingServiceInternal)
 /Subtype /Link
@@ -26397,7 +27091,7 @@ endobj
 /Type /Annot
 >>
 endobj
-244 0 obj
+243 0 obj
 << /Border [0 0 0]
 /Dest (_rgfis_spi_AuditingServiceInternal)
 /Subtype /Link
@@ -26405,10 +27099,10 @@ endobj
 /Type /Annot
 >>
 endobj
-245 0 obj
-[240 0 R /XYZ 0 162.73000000000002 null]
+244 0 obj
+[239 0 R /XYZ 0 162.73000000000002 null]
 endobj
-246 0 obj
+245 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -26419,8 +27113,8 @@ endobj
 /Type /Annot
 >>
 endobj
-247 0 obj
-<< /Length 29606
+246 0 obj
+<< /Length 30462
 >>
 stream
 q
@@ -26870,12 +27564,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24000000000001 467.42500000000035 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -26892,12 +27586,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 467.42500000000035 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <696e74657266616365> Tj
 ET
 
@@ -26914,12 +27608,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 152.74 467.42500000000035 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <416461707465724d616e6167657242617365> Tj
 ET
 
@@ -27002,8 +27696,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 235.24 452.68500000000034 Td
@@ -27041,7 +27735,18 @@ ET
 BT
 295.74 452.68500000000034 Td
 /F5.0 11 Tf
-<293b> Tj
+<29> 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
+301.24 452.68500000000034 Td
+/F5.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -27123,8 +27828,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 218.74 437.94500000000033 Td
@@ -27162,7 +27867,18 @@ ET
 BT
 323.24 437.94500000000033 Td
 /F5.0 11 Tf
-<293b> Tj
+<29> 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
+328.74 437.94500000000033 Td
+/F5.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -27358,12 +28074,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24000000000001 302.08500000000026 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -27380,12 +28096,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 302.08500000000026 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <696e74657266616365> Tj
 ET
 
@@ -27402,12 +28118,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 152.74 302.08500000000026 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <416461707465724d616e61676572> Tj
 ET
 
@@ -27424,12 +28140,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 235.24 302.08500000000026 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <657874656e6473> Tj
 ET
 
@@ -27534,8 +28250,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 235.24 287.3450000000003 Td
@@ -27573,7 +28289,18 @@ ET
 BT
 295.74 287.3450000000003 Td
 /F5.0 11 Tf
-<293b> Tj
+<29> 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
+301.24 287.3450000000003 Td
+/F5.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -27688,8 +28415,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 103.24000000000001 257.8650000000003 Td
@@ -27837,7 +28564,18 @@ ET
 BT
 273.74 243.12500000000028 Td
 /F5.0 11 Tf
-<293b> Tj
+<29> 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
+279.24 243.12500000000028 Td
+/F5.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -27952,8 +28690,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 301.24 228.3850000000003 Td
@@ -27991,7 +28729,18 @@ ET
 BT
 411.24 228.3850000000003 Td
 /F5.0 11 Tf
-<293b> Tj
+<29> 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
+416.74 228.3850000000003 Td
+/F5.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -28029,12 +28778,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 81.24000000000001 213.64500000000032 Td
-/F6.0 11 Tf
+/F5.0 11 Tf
 <766f6964> Tj
 ET
 
@@ -28112,7 +28861,18 @@ ET
 BT
 301.24 213.64500000000032 Td
 /F5.0 11 Tf
-<293b> Tj
+<29> 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
+306.74 213.64500000000032 Td
+/F5.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -28361,34 +29121,33 @@ Q
 
 endstream
 endobj
-248 0 obj
+247 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 247 0 R
+/Contents 246 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 16 0 R
 /F1.0 8 0 R
 /F5.0 40 0 R
 /F3.1 17 0 R
-/F6.0 67 0 R
-/F5.1 68 0 R
+/F5.1 67 0 R
 >>
-/XObject << /Stamp1 332 0 R
+/XObject << /Stamp1 331 0 R
 >>
 >>
-/Annots [251 0 R 252 0 R]
+/Annots [250 0 R 251 0 R]
 >>
 endobj
-249 0 obj
-[248 0 R /XYZ 0 841.89 null]
+248 0 obj
+[247 0 R /XYZ 0 841.89 null]
 endobj
-250 0 obj
+249 0 obj
 << /Limits [(related-services-4) (usage)]
-/Names [(related-services-4) 180 0 R (runtime-vs-noop-implementation) 171 0 R (runtime-vs-noop-implementa

<TRUNCATED>

[20/44] isis-site git commit: ISIS-1594: provide an 'edit' button

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/guides/ugfun.pdf
----------------------------------------------------------------------
diff --git a/content/guides/ugfun.pdf b/content/guides/ugfun.pdf
index 00e1333..dba06ff 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:20170219155252+00'00')
-/ModDate (D:20170219155252+00'00')
+/CreationDate (D:20170307234429+00'00')
+/ModDate (D:20170307234429+00'00')
 >>
 endobj
 2 0 obj
 << /Type /Catalog
 /Pages 3 0 R
 /Names 16 0 R
-/Outlines 1226 0 R
-/PageLabels 1271 0 R
+/Outlines 1225 0 R
+/PageLabels 1270 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 133
-/Kids [7 0 R 10 0 R 12 0 R 14 0 R 42 0 R 51 0 R 54 0 R 57 0 R 60 0 R 78 0 R 88 0 R 92 0 R 101 0 R 112 0 R 117 0 R 126 0 R 131 0 R 142 0 R 150 0 R 164 0 R 180 0 R 187 0 R 192 0 R 198 0 R 203 0 R 209 0 R 222 0 R 247 0 R 278 0 R 307 0 R 323 0 R 331 0 R 335 0 R 347 0 R 350 0 R 362 0 R 370 0 R 378 0 R 385 0 R 391 0 R 397 0 R 404 0 R 410 0 R 417 0 R 422 0 R 428 0 R 446 0 R 450 0 R 453 0 R 461 0 R 468 0 R 474 0 R 476 0 R 480 0 R 483 0 R 492 0 R 500 0 R 511 0 R 518 0 R 524 0 R 534 0 R 541 0 R 545 0 R 551 0 R 559 0 R 571 0 R 576 0 R 583 0 R 586 0 R 600 0 R 609 0 R 618 0 R 621 0 R 629 0 R 634 0 R 657 0 R 674 0 R 687 0 R 697 0 R 702 0 R 707 0 R 717 0 R 722 0 R 725 0 R 727 0 R 734 0 R 744 0 R 751 0 R 769 0 R 807 0 R 832 0 R 868 0 R 880 0 R 882 0 R 887 0 R 889 0 R 892 0 R 894 0 R 900 0 R 902 0 R 904 0 R 918 0 R 921 0 R 934 0 R 941 0 R 946 0 R 951 0 R 967 0 R 980 0 R 984 0 R 989 0 R 993 0 R 996 0 R 1003 0 R 1006 0 R 1010 0 R 1018 0 R 1033 0 R 1036 0 R 1039 0 R 1049 0 R 1054 0 R 1057 0 R 1062 0 R 
 1074 0 R 1080 0 R 1090 0 R 1092 0 R 1103 0 R 1106 0 R 1116 0 R 1122 0 R 1124 0 R]
+/Kids [7 0 R 10 0 R 12 0 R 14 0 R 42 0 R 51 0 R 54 0 R 57 0 R 60 0 R 78 0 R 88 0 R 92 0 R 101 0 R 112 0 R 117 0 R 126 0 R 131 0 R 142 0 R 150 0 R 164 0 R 180 0 R 187 0 R 192 0 R 198 0 R 202 0 R 208 0 R 221 0 R 246 0 R 277 0 R 306 0 R 322 0 R 330 0 R 334 0 R 346 0 R 349 0 R 361 0 R 369 0 R 377 0 R 384 0 R 390 0 R 396 0 R 403 0 R 409 0 R 416 0 R 421 0 R 427 0 R 445 0 R 449 0 R 452 0 R 460 0 R 467 0 R 473 0 R 475 0 R 479 0 R 482 0 R 491 0 R 499 0 R 510 0 R 517 0 R 523 0 R 533 0 R 540 0 R 544 0 R 550 0 R 558 0 R 570 0 R 575 0 R 582 0 R 585 0 R 599 0 R 608 0 R 617 0 R 620 0 R 628 0 R 633 0 R 656 0 R 673 0 R 686 0 R 696 0 R 701 0 R 706 0 R 716 0 R 721 0 R 724 0 R 726 0 R 733 0 R 743 0 R 750 0 R 768 0 R 806 0 R 831 0 R 867 0 R 879 0 R 881 0 R 886 0 R 888 0 R 891 0 R 893 0 R 899 0 R 901 0 R 903 0 R 917 0 R 920 0 R 933 0 R 940 0 R 945 0 R 950 0 R 966 0 R 979 0 R 983 0 R 988 0 R 992 0 R 995 0 R 1002 0 R 1005 0 R 1009 0 R 1017 0 R 1032 0 R 1035 0 R 1038 0 R 1048 0 R 1053 0 R 1056 0 R 1061 0 R 
 1073 0 R 1079 0 R 1089 0 R 1091 0 R 1102 0 R 1105 0 R 1115 0 R 1121 0 R 1123 0 R]
 >>
 endobj
 4 0 obj
@@ -78,13 +78,13 @@ endobj
 endobj
 8 0 obj
 << /Type /Font
-/BaseFont /AAAADH+NotoSerif
+/BaseFont /AAAACX+NotoSerif
 /Subtype /TrueType
-/FontDescriptor 1273 0 R
+/FontDescriptor 1272 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 1275 0 R
-/ToUnicode 1274 0 R
+/Widths 1274 0 R
+/ToUnicode 1273 0 R
 >>
 endobj
 9 0 obj
@@ -1639,7 +1639,7 @@ endobj
 /F1.0 8 0 R
 >>
 >>
-/Annots [1141 0 R 1142 0 R 1143 0 R 1144 0 R 1145 0 R 1146 0 R 1147 0 R 1148 0 R 1149 0 R 1150 0 R 1151 0 R 1152 0 R 1153 0 R 1154 0 R 1155 0 R 1156 0 R 1157 0 R 1158 0 R 1159 0 R 1160 0 R 1161 0 R 1162 0 R 1163 0 R 1164 0 R 1165 0 R 1166 0 R 1167 0 R 1168 0 R 1169 0 R 1170 0 R 1171 0 R 1172 0 R 1173 0 R 1174 0 R 1175 0 R 1176 0 R 1177 0 R 1178 0 R 1179 0 R 1180 0 R 1181 0 R 1182 0 R 1183 0 R 1184 0 R 1185 0 R 1186 0 R 1187 0 R 1188 0 R 1189 0 R 1190 0 R 1191 0 R 1192 0 R 1193 0 R 1194 0 R 1195 0 R 1196 0 R 1197 0 R 1198 0 R 1199 0 R 1200 0 R 1201 0 R 1202 0 R 1203 0 R 1204 0 R 1205 0 R 1206 0 R 1207 0 R 1208 0 R 1209 0 R 1210 0 R 1211 0 R 1212 0 R 1213 0 R 1214 0 R 1215 0 R 1216 0 R]
+/Annots [1140 0 R 1141 0 R 1142 0 R 1143 0 R 1144 0 R 1145 0 R 1146 0 R 1147 0 R 1148 0 R 1149 0 R 1150 0 R 1151 0 R 1152 0 R 1153 0 R 1154 0 R 1155 0 R 1156 0 R 1157 0 R 1158 0 R 1159 0 R 1160 0 R 1161 0 R 1162 0 R 1163 0 R 1164 0 R 1165 0 R 1166 0 R 1167 0 R 1168 0 R 1169 0 R 1170 0 R 1171 0 R 1172 0 R 1173 0 R 1174 0 R 1175 0 R 1176 0 R 1177 0 R 1178 0 R 1179 0 R 1180 0 R 1181 0 R 1182 0 R 1183 0 R 1184 0 R 1185 0 R 1186 0 R 1187 0 R 1188 0 R 1189 0 R 1190 0 R 1191 0 R 1192 0 R 1193 0 R 1194 0 R 1195 0 R 1196 0 R 1197 0 R 1198 0 R 1199 0 R 1200 0 R 1201 0 R 1202 0 R 1203 0 R 1204 0 R 1205 0 R 1206 0 R 1207 0 R 1208 0 R 1209 0 R 1210 0 R 1211 0 R 1212 0 R 1213 0 R 1214 0 R 1215 0 R]
 >>
 endobj
 11 0 obj
@@ -1822,7 +1822,7 @@ endobj
 /Font << /F1.0 8 0 R
 >>
 >>
-/Annots [1217 0 R 1218 0 R 1219 0 R 1220 0 R 1221 0 R 1222 0 R 1223 0 R 1224 0 R]
+/Annots [1216 0 R 1217 0 R 1218 0 R 1219 0 R 1220 0 R 1221 0 R 1222 0 R 1223 0 R]
 >>
 endobj
 13 0 obj
@@ -2578,7 +2578,7 @@ endobj
 /Font << /F2.0 18 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 1225 0 R
+/XObject << /Stamp1 1224 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 39 0 R 40 0 R]
@@ -2593,18 +2593,18 @@ endobj
 >>
 endobj
 17 0 obj
-<< /Kids [120 0 R 299 0 R 121 0 R 485 0 R 624 0 R 531 0 R 670 0 R 830 0 R 196 0 R 1076 0 R 761 0 R 852 0 R 342 0 R 1064 0 R 775 0 R 565 0 R 781 0 R]
+<< /Kids [120 0 R 298 0 R 121 0 R 484 0 R 623 0 R 530 0 R 669 0 R 829 0 R 196 0 R 1075 0 R 760 0 R 851 0 R 341 0 R 1063 0 R 774 0 R 564 0 R 780 0 R]
 >>
 endobj
 18 0 obj
 << /Type /Font
-/BaseFont /AAAADI+NotoSerif-Bold
+/BaseFont /AAAACY+NotoSerif-Bold
 /Subtype /TrueType
-/FontDescriptor 1277 0 R
+/FontDescriptor 1276 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 1279 0 R
-/ToUnicode 1278 0 R
+/Widths 1278 0 R
+/ToUnicode 1277 0 R
 >>
 endobj
 19 0 obj
@@ -3503,7 +3503,7 @@ endobj
 /F3.1 44 0 R
 /F4.0 48 0 R
 >>
-/XObject << /Stamp1 1225 0 R
+/XObject << /Stamp1 1224 0 R
 >>
 >>
 /Annots [47 0 R]
@@ -3514,13 +3514,13 @@ endobj
 endobj
 44 0 obj
 << /Type /Font
-/BaseFont /AAAADJ+FontAwesome
+/BaseFont /AAAACZ+FontAwesome
 /Subtype /TrueType
-/FontDescriptor 1281 0 R
+/FontDescriptor 1280 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 1283 0 R
-/ToUnicode 1282 0 R
+/Widths 1282 0 R
+/ToUnicode 1281 0 R
 >>
 endobj
 45 0 obj
@@ -3542,13 +3542,13 @@ endobj
 endobj
 48 0 obj
 << /Type /Font
-/BaseFont /AAAADK+NotoSerif-BoldItalic
+/BaseFont /AAAADA+NotoSerif-BoldItalic
 /Subtype /TrueType
-/FontDescriptor 1285 0 R
+/FontDescriptor 1284 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 1287 0 R
-/ToUnicode 1286 0 R
+/Widths 1286 0 R
+/ToUnicode 1285 0 R
 >>
 endobj
 49 0 obj
@@ -4271,20 +4271,20 @@ endobj
 /F4.0 48 0 R
 /F2.0 18 0 R
 >>
-/XObject << /Stamp1 1225 0 R
+/XObject << /Stamp1 1224 0 R
 >>
 >>
 >>
 endobj
 52 0 obj
 << /Type /Font
-/BaseFont /AAAADL+NotoSerif-Italic
+/BaseFont /AAAADB+NotoSerif-Italic
 /Subtype /TrueType
-/FontDescriptor 1289 0 R
+/FontDescriptor 1288 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 1291 0 R
-/ToUnicode 1290 0 R
+/Widths 1290 0 R
+/ToUnicode 1289 0 R
 >>
 endobj
 53 0 obj
@@ -5075,7 +5075,7 @@ endobj
 /F2.0 18 0 R
 /F5.0 52 0 R
 >>
-/XObject << /Stamp1 1225 0 R
+/XObject << /Stamp1 1224 0 R
 >>
 >>
 >>
@@ -5919,7 +5919,7 @@ endobj
 /F4.0 48 0 R
 /F5.0 52 0 R
 >>
-/XObject << /Stamp1 1225 0 R
+/XObject << /Stamp1 1224 0 R
 >>
 >>
 >>
@@ -6924,7 +6924,7 @@ endobj
 /F5.0 52 0 R
 /F6.0 73 0 R
 >>
-/XObject << /Stamp1 1225 0 R
+/XObject << /Stamp1 1224 0 R
 >>
 >>
 /Annots [61 0 R 62 0 R 63 0 R 64 0 R 65 0 R 66 0 R 67 0 R 68 0 R 69 0 R 70 0 R 74 0 R 75 0 R 76 0 R]
@@ -7045,24 +7045,24 @@ endobj
 endobj
 72 0 obj
 << /Type /Font
-/BaseFont /AAAADM+NotoSerif
+/BaseFont /AAAADC+NotoSerif
 /Subtype /TrueType
-/FontDescriptor 1293 0 R
+/FontDescriptor 1292 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 1295 0 R
-/ToUnicode 1294 0 R
+/Widths 1294 0 R
+/ToUnicode 1293 0 R
 >>
 endobj
 73 0 obj
 << /Type /Font
-/BaseFont /AAAADN+mplus1mn-regular
+/BaseFont /AAAADD+mplus1mn-regular
 /Subtype /TrueType
-/FontDescriptor 1297 0 R
+/FontDescriptor 1296 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 1299 0 R
-/ToUnicode 1298 0 R
+/Widths 1298 0 R
+/ToUnicode 1297 0 R
 >>
 endobj
 74 0 obj
@@ -7689,7 +7689,7 @@ endobj
 /F2.0 18 0 R
 /F4.0 48 0 R
 >>
-/XObject << /Stamp1 1225 0 R
+/XObject << /Stamp1 1224 0 R
 >>
 >>
 /Annots [79 0 R 80 0 R 82 0 R 84 0 R 85 0 R]
@@ -8613,7 +8613,7 @@ endobj
 /Contents 87 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /XObject << /I1 86 0 R
-/Stamp1 1225 0 R
+/Stamp1 1224 0 R
 >>
 /Font << /F5.0 52 0 R
 /F1.0 8 0 R
@@ -9459,7 +9459,7 @@ endobj
 /F5.0 52 0 R
 /F6.0 73 0 R
 >>
-/XObject << /Stamp1 1225 0 R
+/XObject << /Stamp1 1224 0 R
 >>
 >>
 /Annots [95 0 R 96 0 R 97 0 R 98 0 R 99 0 R]
@@ -10348,7 +10348,7 @@ endobj
 /F2.0 18 0 R
 /F5.0 52 0 R
 >>
-/XObject << /Stamp1 1225 0 R
+/XObject << /Stamp1 1224 0 R
 >>
 >>
 /Annots [102 0 R 103 0 R 104 0 R 105 0 R 106 0 R 107 0 R]
@@ -11064,7 +11064,7 @@ endobj
 /F2.0 18 0 R
 /F5.0 52 0 R
 >>
-/XObject << /Stamp1 1225 0 R
+/XObject << /Stamp1 1224 0 R
 >>
 >>
 /Annots [114 0 R]
@@ -11800,7 +11800,7 @@ endobj
 /F2.0 18 0 R
 /F5.0 52 0 R
 >>
-/XObject << /Stamp1 1225 0 R
+/XObject << /Stamp1 1224 0 R
 >>
 >>
 /Annots [123 0 R 124 0 R]
@@ -11814,12 +11814,12 @@ endobj
 endobj
 120 0 obj
 << /Limits [(_ugfun) (_ugfun_core-concepts_building-blocks_oid)]
-/Names [(_ugfun) 15 0 R (_ugfun_core-concepts) 43 0 R (_ugfun_core-concepts_add-ons) 298 0 R (_ugfun_core-concepts_building-blocks) 176 0 R (_ugfun_core-concepts_building-blocks_domain-events) 215 0 R (_ugfun_core-concepts_building-blocks_domain-services) 206 0 R (_ugfun_core-concepts_building-blocks_metamodel) 177 0 R (_ugfun_core-concepts_building-blocks_mixins-and-contributions) 212 0 R (_ugfun_core-concepts_building-blocks_objects-members) 194 0 R (_ugfun_core-concepts_building-blocks_oid) 219 0 R]
+/Names [(_ugfun) 15 0 R (_ugfun_core-concepts) 43 0 R (_ugfun_core-concepts_add-ons) 297 0 R (_ugfun_core-concepts_building-blocks) 176 0 R (_ugfun_core-concepts_building-blocks_domain-events) 214 0 R (_ugfun_core-concepts_building-blocks_domain-services) 205 0 R (_ugfun_core-concepts_building-blocks_metamodel) 177 0 R (_ugfun_core-concepts_building-blocks_mixins-and-contributions) 211 0 R (_ugfun_core-concepts_building-blocks_objects-members) 194 0 R (_ugfun_core-concepts_building-blocks_oid) 218 0 R]
 >>
 endobj
 121 0 obj
 << /Limits [(_ugfun_core-concepts_principles) (_ugfun_getting-started_datanucleus-enhancer)]
-/Names [(_ugfun_core-concepts_principles) 119 0 R (_ugfun_core-concepts_principles_apache-isis-vs) 132 0 R (_ugfun_core-concepts_principles_apache-isis-vs_cqrs) 148 0 R (_ugfun_core-concepts_principles_apache-isis-vs_event-sourcing) 161 0 R (_ugfun_core-concepts_principles_apache-isis-vs_metawidget) 172 0 R (_ugfun_core-concepts_principles_apache-isis-vs_mvc-server-side-frameworks) 133 0 R (_ugfun_core-concepts_principles_isis-itself) 127 0 R (_ugfun_core-concepts_principles_your-apps) 122 0 R (_ugfun_faqs) 1081 0 R (_ugfun_faqs_enabling-logging) 1083 0 R (_ugfun_faqs_enhance-only) 1096 0 R (_ugfun_faqs_how-run-fixtures-on-app-startup) 1132 0 R (_ugfun_faqs_how-to-handle-void-and-null-results) 1117 0 R (_ugfun_faqs_how-to-implement-a-spellchecker) 1125 0 R (_ugfun_faqs_i18n-label-in-wicket-viewer) 1107 0 R (_ugfun_faqs_per-user-themes) 1097 0 R (_ugfun_faqs_restful-image-property) 1093 0 R (_ugfun_faqs_subtype-entity-not-fully-populated) 1087 0 R (_ugfun_getting-started) 336 0 R (_u
 gfun_getting-started_datanucleus-enhancer) 439 0 R]
+/Names [(_ugfun_core-concepts_principles) 119 0 R (_ugfun_core-concepts_principles_apache-isis-vs) 132 0 R (_ugfun_core-concepts_principles_apache-isis-vs_cqrs) 148 0 R (_ugfun_core-concepts_principles_apache-isis-vs_event-sourcing) 161 0 R (_ugfun_core-concepts_principles_apache-isis-vs_metawidget) 172 0 R (_ugfun_core-concepts_principles_apache-isis-vs_mvc-server-side-frameworks) 133 0 R (_ugfun_core-concepts_principles_isis-itself) 127 0 R (_ugfun_core-concepts_principles_your-apps) 122 0 R (_ugfun_faqs) 1080 0 R (_ugfun_faqs_enabling-logging) 1082 0 R (_ugfun_faqs_enhance-only) 1095 0 R (_ugfun_faqs_how-run-fixtures-on-app-startup) 1131 0 R (_ugfun_faqs_how-to-handle-void-and-null-results) 1116 0 R (_ugfun_faqs_how-to-implement-a-spellchecker) 1124 0 R (_ugfun_faqs_i18n-label-in-wicket-viewer) 1106 0 R (_ugfun_faqs_per-user-themes) 1096 0 R (_ugfun_faqs_restful-image-property) 1092 0 R (_ugfun_faqs_subtype-entity-not-fully-populated) 1086 0 R (_ugfun_getting-started) 335 0 R (_u
 gfun_getting-started_datanucleus-enhancer) 438 0 R]
 >>
 endobj
 122 0 obj
@@ -12514,7 +12514,7 @@ endobj
 /F3.1 44 0 R
 /F2.0 18 0 R
 >>
-/XObject << /Stamp1 1225 0 R
+/XObject << /Stamp1 1224 0 R
 >>
 >>
 >>
@@ -13455,7 +13455,7 @@ endobj
 /F2.0 18 0 R
 /F5.0 52 0 R
 >>
-/XObject << /Stamp1 1225 0 R
+/XObject << /Stamp1 1224 0 R
 >>
 >>
 /Annots [134 0 R 135 0 R 136 0 R 137 0 R 138 0 R 139 0 R 140 0 R]
@@ -14384,7 +14384,7 @@ endobj
 /F5.0 52 0 R
 /F6.0 73 0 R
 >>
-/XObject << /Stamp1 1225 0 R
+/XObject << /Stamp1 1224 0 R
 >>
 >>
 /Annots [143 0 R 144 0 R 145 0 R 146 0 R 147 0 R]
@@ -15560,7 +15560,7 @@ endobj
 /F2.0 18 0 R
 /F5.0 52 0 R
 >>
-/XObject << /Stamp1 1225 0 R
+/XObject << /Stamp1 1224 0 R
 >>
 >>
 /Annots [151 0 R 152 0 R 153 0 R 154 0 R 155 0 R 157 0 R 158 0 R 159 0 R 160 0 R 162 0 R]
@@ -15623,13 +15623,13 @@ endobj
 endobj
 156 0 obj
 << /Type /Font
-/BaseFont /AAAADO+mplus-1p-regular
+/BaseFont /AAAADE+mplus-1p-regular
 /Subtype /TrueType
-/FontDescriptor 1301 0 R
+/FontDescriptor 1300 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 1303 0 R
-/ToUnicode 1302 0 R
+/Widths 1302 0 R
+/ToUnicode 1301 0 R
 >>
 endobj
 157 0 obj
@@ -16687,7 +16687,7 @@ endobj
 /F6.0 73 0 R
 /F2.0 18 0 R
 >>
-/XObject << /Stamp1 1225 0 R
+/XObject << /Stamp1 1224 0 R
 >>
 >>
 /Annots [165 0 R 166 0 R 167 0 R 168 0 R 169 0 R 170 0 R 171 0 R 173 0 R 174 0 R 175 0 R 178 0 R]
@@ -17893,7 +17893,7 @@ endobj
 /F2.0 18 0 R
 /F5.0 52 0 R
 >>
-/XObject << /Stamp1 1225 0 R
+/XObject << /Stamp1 1224 0 R
 >>
 >>
 /Annots [181 0 R 183 0 R 184 0 R 185 0 R]
@@ -18611,7 +18611,7 @@ endobj
 /F6.0 73 0 R
 >>
 /XObject << /I2 189 0 R
-/Stamp1 1225 0 R
+/Stamp1 1224 0 R
 >>
 >>
 /Annots [188 0 R 190 0 R]
@@ -19811,7 +19811,7 @@ endobj
 /F2.0 18 0 R
 /F7.0 156 0 R
 >>
-/XObject << /Stamp1 1225 0 R
+/XObject << /Stamp1 1224 0 R
 >>
 >>
 /Annots [193 0 R]
@@ -19836,11 +19836,11 @@ endobj
 endobj
 196 0 obj
 << /Limits [(auto-complete-for-action-param) (code-memberorder-code)]
-/Names [(auto-complete-for-action-param) 856 0 R (auto-complete-for-property) 838 0 R (auto-complete-repository-based) 869 0 R (best-of-both-worlds) 1075 0 R (building-the-app) 352 0 R (choices-for-action-parameter) 847 0 R (choices-for-property) 834 0 R (class-object) 650 0 R (code-membergrouplayout-code) 923 0 R (code-memberorder-code) 911 0 R]
+/Names [(auto-complete-for-action-param) 855 0 R (auto-complete-for-property) 837 0 R (auto-complete-repository-based) 868 0 R (best-of-both-worlds) 1074 0 R (building-the-app) 351 0 R (choices-for-action-parameter) 846 0 R (choices-for-property) 833 0 R (class-object) 649 0 R (code-membergrouplayout-code) 922 0 R (code-memberorder-code) 910 0 R]
 >>
 endobj
 197 0 obj
-<< /Length 32685
+<< /Length 34574
 >>
 stream
 q
@@ -19874,13 +19874,13 @@ h
 S
 Q
 /DeviceRGB cs
-0.000 0.533 0.000 scn
+0.000 0.400 0.600 scn
 /DeviceRGB CS
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 SCN
 
 BT
 59.24 783.0649999999999 Td
-/F8.0 11 Tf
+/F6.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -19897,12 +19897,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 783.0649999999999 Td
-/F8.0 11 Tf
+/F6.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -19919,12 +19919,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 783.0649999999999 Td
-/F8.0 11 Tf
+/F6.0 11 Tf
 <437573746f6d6572> Tj
 ET
 
@@ -19941,12 +19941,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 768.3249999999999 Td
-/F8.0 11 Tf
+/F6.0 11 Tf
 <70726976617465> Tj
 ET
 
@@ -19963,8 +19963,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 125.24000000000001 768.3249999999999 Td
@@ -20018,12 +20018,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 753.585 Td
-/F8.0 11 Tf
+/F6.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -20040,8 +20040,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 753.585 Td
@@ -20079,7 +20079,18 @@ ET
 BT
 224.24 753.585 Td
 /F6.0 11 Tf
-<2829> Tj
+<28> 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
+229.74 753.585 Td
+/F6.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -20117,12 +20128,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 251.74 753.585 Td
-/F8.0 11 Tf
+/F6.0 11 Tf
 <72657475726e> Tj
 ET
 
@@ -20194,12 +20205,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 738.845 Td
-/F8.0 11 Tf
+/F6.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -20216,12 +20227,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 738.845 Td
-/F8.0 11 Tf
+/F6.0 11 Tf
 <766f6964> Tj
 ET
 
@@ -20260,8 +20271,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 218.74 738.845 Td
@@ -20337,12 +20348,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 328.74 738.845 Td
-/F8.0 11 Tf
+/F6.0 11 Tf
 <74686973> Tj
 ET
 
@@ -20359,8 +20370,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 356.24 738.845 Td
@@ -20464,7 +20475,29 @@ ET
 BT
 81.24000000000001 724.105 Td
 /F6.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+86.74000000000001 724.105 Td
+/F6.0 11 Tf
+<2e> 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
+92.24000000000001 724.105 Td
+/F6.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -20662,12 +20695,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24 531.6250000000002 Td
-/F8.0 11 Tf
+/F6.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -20684,12 +20717,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 531.6250000000002 Td
-/F8.0 11 Tf
+/F6.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -20706,12 +20739,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 531.6250000000002 Td
-/F8.0 11 Tf
+/F6.0 11 Tf
 <437573746f6d6572> Tj
 ET
 
@@ -20728,12 +20761,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 516.8850000000002 Td
-/F8.0 11 Tf
+/F6.0 11 Tf
 <70726976617465> Tj
 ET
 
@@ -20750,8 +20783,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 125.24000000000001 516.8850000000002 Td
@@ -20849,12 +20882,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 268.24 516.8850000000002 Td
-/F8.0 11 Tf
+/F6.0 11 Tf
 <6e6577> Tj
 ET
 
@@ -20871,8 +20904,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 290.24 516.8850000000002 Td
@@ -20910,7 +20943,40 @@ ET
 BT
 361.74 516.8850000000002 Td
 /F6.0 11 Tf
-<3e28293b> Tj
+<3e> 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
+367.24 516.8850000000002 Td
+/F6.0 11 Tf
+<28> 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
+372.74 516.8850000000002 Td
+/F6.0 11 Tf
+<29> 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
+378.24 516.8850000000002 Td
+/F6.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -20926,12 +20992,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 502.14500000000015 Td
-/F8.0 11 Tf
+/F6.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -20948,8 +21014,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 502.14500000000015 Td
@@ -21020,7 +21086,18 @@ ET
 BT
 262.74 502.14500000000015 Td
 /F6.0 11 Tf
-<2829> Tj
+<28> 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
+268.24 502.14500000000015 Td
+/F6.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -21058,12 +21135,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 290.24 502.14500000000015 Td
-/F8.0 11 Tf
+/F6.0 11 Tf
 <72657475726e> Tj
 ET
 
@@ -21135,12 +21212,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 487.40500000000014 Td
-/F8.0 11 Tf
+/F6.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -21157,12 +21234,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 487.40500000000014 Td
-/F8.0 11 Tf
+/F6.0 11 Tf
 <766f6964> Tj
 ET
 
@@ -21201,8 +21278,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 202.24 487.40500000000014 Td
@@ -21311,12 +21388,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 350.74 487.40500000000014 Td
-/F8.0 11 Tf
+/F6.0 11 Tf
 <74686973> Tj
 ET
 
@@ -21333,8 +21410,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 378.24 487.40500000000014 Td
@@ -21438,7 +21515,29 @@ ET
 BT
 81.24000000000001 472.66500000000013 Td
 /F6.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+86.74000000000001 472.66500000000013 Td
+/F6.0 11 Tf
+<2e> 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
+92.24000000000001 472.66500000000013 Td
+/F6.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -21692,12 +21791,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24000000000001 197.06500000000005 Td
-/F8.0 11 Tf
+/F6.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -21714,12 +21813,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 197.06500000000005 Td
-/F8.0 11 Tf
+/F6.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -21736,12 +21835,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 197.06500000000005 Td
-/F8.0 11 Tf
+/F6.0 11 Tf
 <437573746f6d6572> Tj
 ET
 
@@ -21758,12 +21857,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 182.32500000000007 Td
-/F8.0 11 Tf
+/F6.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -21802,12 +21901,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.400 0.733 scn
-0.000 0.400 0.733 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 169.24 182.32500000000007 Td
-/F8.0 11 Tf
+/F6.0 11 Tf
 <706c6163654f72646572> Tj
 ET
 
@@ -21879,12 +21978,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 290.24 182.32500000000007 Td
-/F8.0 11 Tf
+/F6.0 11 Tf
 <696e74> Tj
 ET
 
@@ -21962,7 +22061,29 @@ ET
 BT
 378.24 182.32500000000007 Td
 /F6.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+383.74 182.32500000000007 Td
+/F6.0 11 Tf
+<2e> 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
+389.24 182.32500000000007 Td
+/F6.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -22006,7 +22127,29 @@ ET
 BT
 81.24000000000001 167.58500000000006 Td
 /F6.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+86.74000000000001 167.58500000000006 Td
+/F6.0 11 Tf
+<2e> 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
+92.24000000000001 167.58500000000006 Td
+/F6.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -22107,36 +22250,24 @@ endobj
 /MediaBox [0 0 595.28 841.89]
 /Contents 197 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F8.0 199 0 R
-/F6.0 73 0 R
+/Font << /F6.0 73 0 R
 /F1.0 8 0 R
 /F5.0 52 0 R
 /F2.0 18 0 R
 /F3.1 44 0 R
 >>
-/XObject << /Stamp1 1225 0 R
+/XObject << /Stamp1 1224 0 R
 >>
 >>
 >>
 endobj
 199 0 obj
-<< /Type /Font
-/BaseFont /AAAADP+mplus1mn-bold
-/Subtype /TrueType
-/FontDescriptor 1305 0 R
-/FirstChar 32
-/LastChar 255
-/Widths 1307 0 R
-/ToUnicode 1306 0 R
->>
-endobj
-200 0 obj
 [198 0 R /XYZ 0 655.67 null]
 endobj
-201 0 obj
+200 0 obj
 [198 0 R /XYZ 0 321.1100000000001 null]
 endobj
-202 0 obj
+201 0 obj
 << /Length 15222
 >>
 stream
@@ -22938,11 +23069,11 @@ Q
 
 endstream
 endobj
-203 0 obj
+202 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 202 0 R
+/Contents 201 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F3.1 44 0 R
 /F1.0 8 0 R
@@ -22951,16 +23082,16 @@ endobj
 /F2.0 18 0 R
 /F7.0 156 0 R
 >>
-/XObject << /Stamp1 1225 0 R
+/XObject << /Stamp1 1224 0 R
 >>
 >>
-/Annots [205 0 R]
+/Annots [204 0 R]
 >>
 endobj
-204 0 obj
-[203 0 R /XYZ 0 722.77 null]
+203 0 obj
+[202 0 R /XYZ 0 722.77 null]
 endobj
-205 0 obj
+204 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -22971,13 +23102,13 @@ endobj
 /Type /Annot
 >>
 endobj
+205 0 obj
+[202 0 R /XYZ 0 333.45000000000016 null]
+endobj
 206 0 obj
-[203 0 R /XYZ 0 333.45000000000016 null]
+[202 0 R /XYZ 0 137.93000000000012 null]
 endobj
 207 0 obj
-[203 0 R /XYZ 0 137.93000000000012 null]
-endobj
-208 0 obj
 << /Length 13191
 >>
 stream
@@ -23674,23 +23805,23 @@ Q
 
 endstream
 endobj
-209 0 obj
+208 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 208 0 R
+/Contents 207 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 18 0 R
 /F1.0 8 0 R
 /F3.1 44 0 R
 >>
-/XObject << /Stamp1 1225 0 R
+/XObject << /Stamp1 1224 0 R
 >>
 >>
-/Annots [210 0 R 211 0 R 213 0 R 214 0 R 216 0 R 218 0 R 220 0 R]
+/Annots [209 0 R 210 0 R 212 0 R 213 0 R 215 0 R 217 0 R 219 0 R]
 >>
 endobj
-210 0 obj
+209 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -23701,7 +23832,7 @@ endobj
 /Type /Annot
 >>
 endobj
-211 0 obj
+210 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -23712,10 +23843,10 @@ endobj
 /Type /Annot
 >>
 endobj
-212 0 obj
-[209 0 R /XYZ 0 650.5100000000001 null]
+211 0 obj
+[208 0 R /XYZ 0 650.5100000000001 null]
 endobj
-213 0 obj
+212 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -23726,7 +23857,7 @@ endobj
 /Type /Annot
 >>
 endobj
-214 0 obj
+213 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -23737,10 +23868,10 @@ endobj
 /Type /Annot
 >>
 endobj
-215 0 obj
-[209 0 R /XYZ 0 553.6700000000003 null]
+214 0 obj
+[208 0 R /XYZ 0 553.6700000000003 null]
 endobj
-216 0 obj
+215 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -23751,10 +23882,10 @@ endobj
 /Type /Annot
 >>
 endobj
-217 0 obj
-[209 0 R /XYZ 0 484.61000000000047 null]
+216 0 obj
+[208 0 R /XYZ 0 484.61000000000047 null]
 endobj
-218 0 obj
+217 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -23765,10 +23896,10 @@ endobj
 /Type /Annot
 >>
 endobj
-219 0 obj
-[209 0 R /XYZ 0 418.9500000000004 null]
+218 0 obj
+[208 0 R /XYZ 0 418.9500000000004 null]
 endobj
-220 0 obj
+219 0 obj
 << /Border [0 0 0]
 /Dest (_ugfun_core-concepts_building-blocks_metamodel)
 /Subtype /Link
@@ -23776,7 +23907,7 @@ endobj
 /Type /Annot
 >>
 endobj
-221 0 obj
+220 0 obj
 << /Length 16311
 >>
 stream
@@ -24772,24 +24903,24 @@ Q
 
 endstream
 endobj
-222 0 obj
+221 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 221 0 R
+/Contents 220 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F6.0 73 0 R
 /F2.0 18 0 R
 /F3.1 44 0 R
 >>
-/XObject << /Stamp1 1225 0 R
+/XObject << /Stamp1 1224 0 R
 >>
 >>
-/Annots [223 0 R 224 0 R 225 0 R 226 0 R 227 0 R 228 0 R 229 0 R 230 0 R 231 0 R 234 0 R 235 0 R 236 0 R 237 0 R 238 0 R 239 0 R 240 0 R 241 0 R 242 0 R 243 0 R 244 0 R 245 0 R]
+/Annots [222 0 R 223 0 R 224 0 R 225 0 R 226 0 R 227 0 R 228 0 R 229 0 R 230 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 241 0 R 242 0 R 243 0 R 244 0 R]
 >>
 endobj
-223 0 obj
+222 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -24800,7 +24931,7 @@ endobj
 /Type /Annot
 >>
 endobj
-224 0 obj
+223 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -24811,7 +24942,7 @@ endobj
 /Type /Annot
 >>
 endobj
-225 0 obj
+224 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -24822,7 +24953,7 @@ endobj
 /Type /Annot
 >>
 endobj
-226 0 obj
+225 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -24833,7 +24964,7 @@ endobj
 /Type /Annot
 >>
 endobj
-227 0 obj
+226 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -24844,7 +24975,7 @@ endobj
 /Type /Annot
 >>
 endobj
-228 0 obj
+227 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -24855,7 +24986,7 @@ endobj
 /Type /Annot
 >>
 endobj
-229 0 obj
+228 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -24866,7 +24997,7 @@ endobj
 /Type /Annot
 >>
 endobj
-230 0 obj
+229 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -24877,7 +25008,7 @@ endobj
 /Type /Annot
 >>
 endobj
-231 0 obj
+230 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -24888,13 +25019,13 @@ endobj
 /Type /Annot
 >>
 endobj
+231 0 obj
+[221 0 R /XYZ 0 557.2800000000002 null]
+endobj
 232 0 obj
-[222 0 R /XYZ 0 557.2800000000002 null]
+[221 0 R /XYZ 0 488.22000000000037 null]
 endobj
 233 0 obj
-[222 0 R /XYZ 0 488.22000000000037 null]
-endobj
-234 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -24905,7 +25036,7 @@ endobj
 /Type /Annot
 >>
 endobj
-235 0 obj
+234 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -24916,7 +25047,7 @@ endobj
 /Type /Annot
 >>
 endobj
-236 0 obj
+235 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -24927,7 +25058,7 @@ endobj
 /Type /Annot
 >>
 endobj
-237 0 obj
+236 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -24938,7 +25069,7 @@ endobj
 /Type /Annot
 >>
 endobj
-238 0 obj
+237 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -24949,7 +25080,7 @@ endobj
 /Type /Annot
 >>
 endobj
-239 0 obj
+238 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -24960,7 +25091,7 @@ endobj
 /Type /Annot
 >>
 endobj
-240 0 obj
+239 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -24971,7 +25102,7 @@ endobj
 /Type /Annot
 >>
 endobj
-241 0 obj
+240 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -24982,7 +25113,7 @@ endobj
 /Type /Annot
 >>
 endobj
-242 0 obj
+241 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -24993,7 +25124,7 @@ endobj
 /Type /Annot
 >>
 endobj
-243 0 obj
+242 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -25004,7 +25135,7 @@ endobj
 /Type /Annot
 >>
 endobj
-244 0 obj
+243 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -25015,7 +25146,7 @@ endobj
 /Type /Annot
 >>
 endobj
-245 0 obj
+244 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -25026,7 +25157,7 @@ endobj
 /Type /Annot
 >>
 endobj
-246 0 obj
+245 0 obj
 << /Length 14476
 >>
 stream
@@ -26053,22 +26184,22 @@ Q
 
 endstream
 endobj
-247 0 obj
+246 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 246 0 R
+/Contents 245 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F6.0 73 0 R
 >>
-/XObject << /Stamp1 1225 0 R
+/XObject << /Stamp1 1224 0 R
 >>
 >>
-/Annots [248 0 R 249 0 R 250 0 R 251 0 R 252 0 R 253 0 R 254 0 R 255 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 267 0 R 268 0 R 269 0 R 270 0 R 271 0 R 272 0 R 273 0 R 274 0 R 275 0 R 276 0 R]
+/Annots [247 0 R 248 0 R 249 0 R 250 0 R 251 0 R 252 0 R 253 0 R 254 0 R 255 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 267 0 R 268 0 R 269 0 R 270 0 R 271 0 R 272 0 R 273 0 R 274 0 R 275 0 R]
 >>
 endobj
-248 0 obj
+247 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -26079,7 +26210,7 @@ endobj
 /Type /Annot
 >>
 endobj
-249 0 obj
+248 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -26090,7 +26221,7 @@ endobj
 /Type /Annot
 >>
 endobj
-250 0 obj
+249 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -26101,7 +26232,7 @@ endobj
 /Type /Annot
 >>
 endobj
-251 0 obj
+250 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -26112,7 +26243,7 @@ endobj
 /Type /Annot
 >>
 endobj
-252 0 obj
+251 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -26123,7 +26254,7 @@ endobj
 /Type /Annot
 >>
 endobj
-253 0 obj
+252 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -26134,7 +26265,7 @@ endobj
 /Type /Annot
 >>
 endobj
-254 0 obj
+253 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -26145,7 +26276,7 @@ endobj
 /Type /Annot
 >>
 endobj
-255 0 obj
+254 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -26156,7 +26287,7 @@ endobj
 /Type /Annot
 >>
 endobj
-256 0 obj
+255 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -26167,7 +26298,7 @@ endobj
 /Type /Annot
 >>
 endobj
-257 0 obj
+256 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -26178,7 +26309,7 @@ endobj
 /Type /Annot
 >>
 endobj
-258 0 obj
+257 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -26189,7 +26320,7 @@ endobj
 /Type /Annot
 >>
 endobj
-259 0 obj
+258 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -26200,7 +26331,7 @@ endobj
 /Type /Annot
 >>
 endobj
-260 0 obj
+259 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -26211,7 +26342,7 @@ endobj
 /Type /Annot
 >>
 endobj
-261 0 obj
+260 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -26222,7 +26353,7 @@ endobj
 /Type /Annot
 >>
 endobj
-262 0 obj
+261 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -26233,7 +26364,7 @@ endobj
 /Type /Annot
 >>
 endobj
-263 0 obj
+262 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -26244,7 +26375,7 @@ endobj
 /Type /Annot
 >>
 endobj
-264 0 obj
+263 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -26255,7 +26386,7 @@ endobj
 /Type /Annot
 >>
 endobj
-265 0 obj
+264 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -26266,7 +26397,7 @@ endobj
 /Type /Annot
 >>
 endobj
-266 0 obj
+265 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -26277,7 +26408,7 @@ endobj
 /Type /Annot
 >>
 endobj
-267 0 obj
+266 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -26288,7 +26419,7 @@ endobj
 /Type /Annot
 >>
 endobj
-268 0 obj
+267 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -26299,7 +26430,7 @@ endobj
 /Type /Annot
 >>
 endobj
-269 0 obj
+268 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -26310,7 +26441,7 @@ endobj
 /Type /Annot
 >>
 endobj
-270 0 obj
+269 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -26321,7 +26452,7 @@ endobj
 /Type /Annot
 >>
 endobj
-271 0 obj
+270 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -26332,7 +26463,7 @@ endobj
 /Type /Annot
 >>
 endobj
-272 0 obj
+271 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -26343,7 +26474,7 @@ endobj
 /Type /Annot
 >>
 endobj
-273 0 obj
+272 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -26354,7 +26485,7 @@ endobj
 /Type /Annot
 >>
 endobj
-274 0 obj
+273 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -26365,7 +26496,7 @@ endobj
 /Type /Annot
 >>
 endobj
-275 0 obj
+274 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -26376,7 +26507,7 @@ endobj
 /Type /Annot
 >>
 endobj
-276 0 obj
+275 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -26387,7 +26518,7 @@ endobj
 /Type /Annot
 >>
 endobj
-277 0 obj
+276 0 obj
 << /Length 15763
 >>
 stream
@@ -27446,24 +27577,24 @@ Q
 
 endstream
 endobj
-278 0 obj
+277 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 277 0 R
+/Contents 276 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F6.0 73 0 R
 /F2.0 18 0 R
 /F3.1 44 0 R
 >>
-/XObject << /Stamp1 1225 0 R
+/XObject << /Stamp1 1224 0 R
 >>
 >>
-/Annots [279 0 R 280 0 R 281 0 R 282 0 R 283 0 R 284 0 R 285 0 R 286 0 R 287 0 R 288 0 R 289 0 R 290 0 R 291 0 R 292 0 R 293 0 R 294 0 R 295 0 R 296 0 R 297 0 R 300 0 R 301 0 R 302 0 R 303 0 R 304 0 R 305 0 R]
+/Annots [278 0 R 279 0 R 280 0 R 281 0 R 282 0 R 283 0 R 284 0 R 285 0 R 286 0 R 287 0 R 288 0 R 289 0 R 290 0 R 291 0 R 292 0 R 293 0 R 294 0 R 295 0 R 296 0 R 299 0 R 300 0 R 301 0 R 302 0 R 303 0 R 304 0 R]
 >>
 endobj
-279 0 obj
+278 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -27474,7 +27605,7 @@ endobj
 /Type /Annot
 >>
 endobj
-280 0 obj
+279 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -27485,7 +27616,7 @@ endobj
 /Type /Annot
 >>
 endobj
-281 0 obj
+280 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -27496,7 +27627,7 @@ endobj
 /Type /Annot
 >>
 endobj
-282 0 obj
+281 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -27507,7 +27638,7 @@ endobj
 /Type /Annot
 >>
 endobj
-283 0 obj
+282 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -27518,7 +27649,7 @@ endobj
 /Type /Annot
 >>
 endobj
-284 0 obj
+283 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -27529,7 +27660,7 @@ endobj
 /Type /Annot
 >>
 endobj
-285 0 obj
+284 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -27540,7 +27671,7 @@ endobj
 /Type /Annot
 >>
 endobj
-286 0 obj
+285 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -27551,7 +27682,7 @@ endobj
 /Type /Annot
 >>
 endobj
-287 0 obj
+286 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -27562,7 +27693,7 @@ endobj
 /Type /Annot
 >>
 endobj
-288 0 obj
+287 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -27573,7 +27704,7 @@ endobj
 /Type /Annot
 >>
 endobj
-289 0 obj
+288 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -27584,7 +27715,7 @@ endobj
 /Type /Annot
 >>
 endobj
-290 0 obj
+289 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -27595,7 +27726,7 @@ endobj
 /Type /Annot
 >>
 endobj
-291 0 obj
+290 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -27606,7 +27737,7 @@ endobj
 /Type /Annot
 >>
 endobj
-292 0 obj
+291 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -27617,7 +27748,7 @@ endobj
 /Type /Annot
 >>
 endobj
-293 0 obj
+292 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -27628,7 +27759,7 @@ endobj
 /Type /Annot
 >>
 endobj
-294 0 obj
+293 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -27639,7 +27770,7 @@ endobj
 /Type /Annot
 >>
 endobj
-295 0 obj
+294 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -27650,7 +27781,7 @@ endobj
 /Type /Annot
 >>
 endobj
-296 0 obj
+295 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -27661,7 +27792,7 @@ endobj
 /Type /Annot
 >>
 endobj
-297 0 obj
+296 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -27672,15 +27803,15 @@ endobj
 /Type /Annot
 >>
 endobj
-298 0 obj
-[278 0 R /XYZ 0 308.97000000000037 null]
+297 0 obj
+[277 0 R /XYZ 0 308.97000000000037 null]
 endobj
-299 0 obj
+298 0 obj
 << /Limits [(_ugfun_core-concepts_building-blocks_types-of-domain-objects) (_ugfun_core-concepts_philosophy_naked-objects-pattern_object-interface-mapping)]
-/Names [(_ugfun_core-concepts_building-blocks_types-of-domain-objects) 182 0 R (_ugfun_core-concepts_building-blocks_value-objects) 232 0 R (_ugfun_core-concepts_framework-provided-services) 233 0 R (_ugfun_core-concepts_other-deployment-options) 314 0 R (_ugfun_core-concepts_philosophy) 45 0 R (_ugfun_core-concepts_philosophy_aop) 89 0 R (_ugfun_core-concepts_philosophy_domain-driven-design) 46 0 R (_ugfun_core-concepts_philosophy_domain-driven-design_ubiquitous-language) 49 0 R (_ugfun_core-concepts_philosophy_hexagonal-architecture) 83 0 R (_ugfun_core-concepts_philosophy_how-eases-ddd) 108 0 R (_ugfun_core-concepts_philosophy_naked-objects-pattern) 58 0 R (_ugfun_core-concepts_philosophy_naked-objects-pattern_object-interface-mapping) 71 0 R]
+/Names [(_ugfun_core-concepts_building-blocks_types-of-domain-objects) 182 0 R (_ugfun_core-concepts_building-blocks_value-objects) 231 0 R (_ugfun_core-concepts_framework-provided-services) 232 0 R (_ugfun_core-concepts_other-deployment-options) 313 0 R (_ugfun_core-concepts_philosophy) 45 0 R (_ugfun_core-concepts_philosophy_aop) 89 0 R (_ugfun_core-concepts_philosophy_domain-driven-design) 46 0 R (_ugfun_core-concepts_philosophy_domain-driven-design_ubiquitous-language) 49 0 R (_ugfun_core-concepts_philosophy_hexagonal-architecture) 83 0 R (_ugfun_core-concepts_philosophy_how-eases-ddd) 108 0 R (_ugfun_core-concepts_philosophy_naked-objects-pattern) 58 0 R (_ugfun_core-concepts_philosophy_naked-objects-pattern_object-interface-mapping) 71 0 R]
 >>
 endobj
-300 0 obj
+299 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -27691,7 +27822,7 @@ endobj
 /Type /Annot
 >>
 endobj
-301 0 obj
+300 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -27702,7 +27833,7 @@ endobj
 /Type /Annot
 >>
 endobj
-302 0 obj
+301 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -27713,7 +27844,7 @@ endobj
 /Type /Annot
 >>
 endobj
-303 0 obj
+302 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -27724,7 +27855,7 @@ endobj
 /Type /Annot
 >>
 endobj
-304 0 obj
+303 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -27735,7 +27866,7 @@ endobj
 /Type /Annot
 >>
 endobj
-305 0 obj
+304 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -27746,7 +27877,7 @@ endobj
 /Type /Annot
 >>
 endobj
-306 0 obj
+305 0 obj
 << /Length 15564
 >>
 stream
@@ -28574,22 +28705,22 @@ Q
 
 endstream
 endobj
-307 0 obj
+306 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 306 0 R
+/Contents 305 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F2.0 18 0 R
 >>
-/XObject << /Stamp1 1225 0 R
+/XObject << /Stamp1 1224 0 R
 >>
 >>
-/Annots [308 0 R 309 0 R 310 0 R 311 0 R 312 0 R 313 0 R 316 0 R 317 0 R 318 0 R 319 0 R 320 0 R 321 0 R]
+/Annots [307 0 R 308 0 R 309 0 R 310 0 R 311 0 R 312 0 R 315 0 R 316 0 R 317 0 R 318 0 R 319 0 R 320 0 R]
 >>
 endobj
-308 0 obj
+307 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -28600,7 +28731,7 @@ endobj
 /Type /Annot
 >>
 endobj
-309 0 obj
+308 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -28611,7 +28742,7 @@ endobj
 /Type /Annot
 >>
 endobj
-310 0 obj
+309 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -28622,7 +28753,7 @@ endobj
 /Type /Annot
 >>
 endobj
-311 0 obj
+310 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -28633,7 +28764,7 @@ endobj
 /Type /Annot
 >>
 endobj
-312 0 obj
+311 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -28644,7 +28775,7 @@ endobj
 /Type /Annot
 >>
 endobj
-313 0 obj
+312 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -28655,13 +28786,13 @@ endobj
 /Type /Annot
 >>
 endobj
+313 0 obj
+[306 0 R /XYZ 0 542.3100000000003 null]
+endobj
 314 0 obj
-[307 0 R /XYZ 0 542.3100000000003 null]
+[306 0 R /XYZ 0 399.3300000000003 null]
 endobj
 315 0 obj
-[307 0 R /XYZ 0 399.3300000000003 null]
-endobj
-316 0 obj
 << /Border [0 0 0]
 /Dest (_ugfun_core-concepts_add-ons)
 /Subtype /Link
@@ -28669,7 +28800,7 @@ endobj
 /Type /Annot
 >>
 endobj
-317 0 obj
+316 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -28680,7 +28811,7 @@ endobj
 /Type /Annot
 >>
 endobj
-318 0 obj
+317 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -28691,7 +28822,7 @@ endobj
 /Type /Annot
 >>
 endobj
-319 0 obj
+318 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -28702,7 +28833,7 @@ endobj
 /Type /Annot
 >>
 endobj
-320 0 obj
+319 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -28713,7 +28844,7 @@ endobj
 /Type /Annot
 >>
 endobj
-321 0 obj
+320 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -28724,7 +28855,7 @@ endobj
 /Type /Annot
 >>
 endobj
-322 0 obj
+321 0 obj
 << /Length 13536
 >>
 stream
@@ -29396,29 +29527,29 @@ Q
 
 endstream
 endobj
-323 0 obj
+322 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 322 0 R
+/Contents 321 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 18 0 R
 /F1.0 8 0 R
 /F6.0 73 0 R
 >>
-/XObject << /Stamp1 1225 0 R
+/XObject << /Stamp1 1224 0 R
 >>
 >>
-/Annots [326 0 R 328 0 R 329 0 R]
+/Annots [325 0 R 327 0 R 328 0 R]
 >>
 endobj
+323 0 obj
+[322 0 R /XYZ 0 841.89 null]
+endobj
 324 0 obj
-[323 0 R /XYZ 0 841.89 null]
+[322 0 R /XYZ 0 599.3900000000001 null]
 endobj
 325 0 obj
-[323 0 R /XYZ 0 599.3900000000001 null]
-endobj
-326 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -29429,10 +29560,10 @@ endobj
 /Type /Annot
 >>
 endobj
-327 0 obj
-[323 0 R /XYZ 0 368.5300000000002 null]
+326 0 obj
+[322 0 R /XYZ 0 368.5300000000002 null]
 endobj
-328 0 obj
+327 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -29443,7 +29574,7 @@ endobj
 /Type /Annot
 >>
 endobj
-329 0 obj
+328 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -29454,7 +29585,7 @@ endobj
 /Type /Annot
 >>
 endobj
-330 0 obj
+329 0 obj
 << /Length 4208
 >>
 stream
@@ -29667,25 +29798,25 @@ Q
 
 endstream
 endobj
-331 0 obj
+330 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 330 0 R
+/Contents 329 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F2.0 18 0 R
 >>
-/XObject << /Stamp1 1225 0 R
+/XObject << /Stamp1 1224 0 R
 >>
 >>
-/Annots [333 0 R]
+/Annots [332 0 R]
 >>
 endobj
-332 0 obj
-[331 0 R /XYZ 0 691.74 null]
+331 0 obj
+[330 0 R /XYZ 0 691.74 null]
 endobj
-333 0 obj
+332 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -29696,7 +29827,7 @@ endobj
 /Type /Annot
 >>
 endobj
-334 0 obj
+333 0 obj
 << /Length 14658
 >>
 stream
@@ -30483,27 +30614,27 @@ Q
 
 endstream
 endobj
-335 0 obj
+334 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 334 0 R
+/Contents 333 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 18 0 R
 /F1.0 8 0 R
 /F3.1 44 0 R
 /F6.0 73 0 R
 >>
-/XObject << /Stamp1 1225 0 R
+/XObject << /Stamp1 1224 0 R
 >>
 >>
-/Annots [337 0 R 338 0 R 339 0 R 340 0 R 343 0 R 344 0 R]
+/Annots [336 0 R 337 0 R 338 0 R 339 0 R 342 0 R 343 0 R]
 >>
 endobj
-336 0 obj
-[335 0 R /XYZ 0 841.89 null]
+335 0 obj
+[334 0 R /XYZ 0 841.89 null]
 endobj
-337 0 obj
+336 0 obj
 << /Border [0 0 0]
 /Dest (_ugfun_getting-started_simpleapp-archetype)
 /Subtype /Link
@@ -30511,7 +30642,7 @@ endobj
 /Type /Annot
 >>
 endobj
-338 0 obj
+337 0 obj
 << /Border [0 0 0]
 /Dest (_ugfun_getting-started_datanucleus-enhancer)
 /Subtype /Link
@@ -30519,7 +30650,7 @@ endobj
 /Type /Annot
 >>
 endobj
-339 0 obj
+338 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -30530,7 +30661,7 @@ endobj
 /Type /Annot
 >>
 endobj
-340 0 obj
+339 0 obj
 << /Border [0 0 0]
 /Dest (_ugfun_getting-started_simpleapp-archetype)
 /Subtype /Link
@@ -30538,15 +30669,15 @@ endobj
 /Type /Annot
 >>
 endobj
-341 0 obj
-[335 0 R /XYZ 0 484.47 null]
+340 0 obj
+[334 0 R /XYZ 0 484.47 null]
 endobj
-342 0 obj
+341 0 obj
 << /Limits [(for-action-parameters) (hide-a-property)]
-/Names [(for-action-parameters) 846 0 R (for-both-properties-and-action-parameters) 864 0 R (for-properties) 833 0 R (from-within-the-ide) 359 0 R (full-stack-but-extensible) 128 0 R (generating-the-app) 348 0 R (grids-vs-components) 969 0 R (hide-a-collection) 776 0 R (hide-a-contributed-property-collection-or-action) 778 0 R (hide-a-property) 774 0 R]
+/Names [(for-action-parameters) 845 0 R (for-both-properties-and-action-parameters) 863 0 R (for-properties) 832 0 R (from-within-the-ide) 358 0 R (full-stack-but-extensible) 128 0 R (generating-the-app) 347 0 R (grids-vs-components) 968 0 R (hide-a-collection) 775 0 R (hide-a-contributed-property-collection-or-action) 777 0 R (hide-a-property) 773 0 R]
 >>
 endobj
-343 0 obj
+342 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -30557,7 +30688,7 @@ endobj
 /Type /Annot
 >>
 endobj
-344 0 obj
+343 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -30568,11 +30699,11 @@ endobj
 /Type /Annot
 >>
 endobj
-345 0 obj
-[335 0 R /XYZ 0 204.81 null]
+344 0 obj
+[334 0 R /XYZ 0 204.81 null]
 endobj
-346 0 obj
-<< /Length 21416
+345 0 obj
+<< /Length 13576
 >>
 stream
 q
@@ -30699,18 +30830,7 @@ Q
 BT
 59.24 667.1950000000002 Td
 /F6.0 11 Tf
-<6d766e206172636865747970653a67656e65726174652020> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
-
-BT
-191.24 667.1950000000002 Td
-/F6.0 11 Tf
-<5c> Tj
+<6d766e206172636865747970653a67656e657261746520205c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -30721,51 +30841,7 @@ ET
 BT
 59.24 652.4550000000002 Td
 /F6.0 11 Tf
-<ca2020202d4420> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-97.74000000000001 652.4550000000002 Td
-/F6.0 11 Tf
-<61726368657479706547726f75704964> 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
-185.74 652.4550000000002 Td
-/F6.0 11 Tf
-<3d> 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
-191.24 652.4550000000002 Td
-/F6.0 11 Tf
-<6f72672e6170616368652e697369732e61726368657479706520> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
-
-BT
-334.24 652.4550000000002 Td
-/F6.0 11 Tf
-<5c> Tj
+<ca2020202d442061726368657479706547726f757049643d6f72672e6170616368652e697369732e617263686574797065205c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -30776,51 +30852,7 @@ ET
 BT
 59.24 637.7150000000001 Td
 /F6.0 11 Tf
-<ca2020202d4420> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-97.74000000000001 637.7150000000001 Td
-/F6.0 11 Tf
-<61726368657479706541727469666163744964> 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
-202.24 637.7150000000001 Td
-/F6.0 11 Tf
-<3d> 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.74 637.7150000000001 Td
-/F6.0 11 Tf
-<73696d706c656170702d61726368657479706520> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
-
-BT
-317.74 637.7150000000001 Td
-/F6.0 11 Tf
-<5c> Tj
+<ca2020202d4420617263686574797065417274696661637449643d73696d706c656170702d617263686574797065205c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -30831,51 +30863,7 @@ ET
 BT
 59.24 622.9750000000003 Td
 /F6.0 11 Tf
-<ca2020202d4420> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-97.74000000000001 622.9750000000003 Td
-/F6.0 11 Tf
-<61726368657479706556657273696f6e> 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
-185.74 622.9750000000003 Td
-/F6.0 11 Tf
-<3d> 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
-191.24 622.9750000000003 Td
-/F6.0 11 Tf
-<312e31342e3020> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
-
-BT
-229.74 622.9750000000003 Td
-/F6.0 11 Tf
-<5c> Tj
+<ca2020202d442061726368657479706556657273696f6e3d312e31342e30205c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -30886,51 +30874,7 @@ ET
 BT
 59.24 608.2350000000002 Td
 /F6.0 11 Tf
-<ca2020202d4420> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-97.74000000000001 608.2350000000002 Td
-/F6.0 11 Tf
-<67726f75704964> 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
-136.24 608.2350000000002 Td
-/F6.0 11 Tf
-<3d> 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
-141.74 608.2350000000002 Td
-/F6.0 11 Tf
-<636f6d2e6d79636f6d70616e7920> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
-
-BT
-218.74 608.2350000000002 Td
-/F6.0 11 Tf
-<5c> Tj
+<ca2020202d442067726f757049643d636f6d2e6d79636f6d70616e79205c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -30941,51 +30885,7 @@ ET
 BT
 59.24 593.4950000000002 Td
 /F6.0 11 Tf
-<ca2020202d4420> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-97.74000000000001 593.4950000000002 Td
-/F6.0 11 Tf
-<61727469666163744964> 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
-152.74 593.4950000000002 Td
-/F6.0 11 Tf
-<3d> 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
-158.24 593.4950000000002 Td
-/F6.0 11 Tf
-<6d7961707020> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
-
-BT
-191.24 593.4950000000002 Td
-/F6.0 11 Tf
-<5c> Tj
+<ca2020202d4420617274696661637449643d6d79617070205c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -30996,51 +30896,7 @@ ET
 BT
 59.24 578.7550000000002 Td
 /F6.0 11 Tf
-<ca2020202d4420> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-97.74000000000001 578.7550000000002 Td
-/F6.0 11 Tf
-<76657273696f6e> 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
-136.24 578.7550000000002 Td
-/F6.0 11 Tf
-<3d> 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
-141.74 578.7550000000002 Td
-/F6.0 11 Tf
-<312e302d534e415053484f5420> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
-
-BT
-213.24 578.7550000000002 Td
-/F6.0 11 Tf
-<5c> Tj
+<ca2020202d442076657273696f6e3d312e302d534e415053484f54205c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -31349,18 +31205,7 @@ Q
 BT
 59.24000000000001 285.47500000000036 Td
 /F6.0 11 Tf
-<6d766e206172636865747970653a67656e65726174652020> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
-
-BT
-191.24 285.47500000000036 Td
-/F6.0 11 Tf
-<5c> Tj
+<6d766e206172636865747970653a67656e657261746520205c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -31371,51 +31216,7 @@ ET
 BT
 59.24000000000001 270.73500000000035 Td
 /F6.0 11 Tf
-<ca2020202d4420> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-97.74000000000001 270.73500000000035 Td
-/F6.0 11 Tf
-<61726368657479706547726f75704964> 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
-185.74 270.73500000000035 Td
-/F6.0 11 Tf
-<3d> 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
-191.24 270.73500000000035 Td
-/F6.0 11 Tf
-<6f72672e6170616368652e697369732e61726368657479706520> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
-
-BT
-334.24 270.73500000000035 Td
-/F6.0 11 Tf
-<5c> Tj
+<ca2020202d442061726368657479706547726f757049643d6f72672e6170616368652e697369732e617263686574797065205c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -31426,51 +31227,7 @@ ET
 BT
 59.24000000000001 255.99500000000035 Td
 /F6.0 11 Tf
-<ca2020202d4420> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-97.74000000000001 255.99500000000035 Td
-/F6.0 11 Tf
-<61726368657479706541727469666163744964> 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
-202.24 255.99500000000035 Td
-/F6.0 11 Tf
-<3d> 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.74 255.99500000000035 Td
-/F6.0 11 Tf
-<73696d706c656170702d61726368657479706520> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
-
-BT
-317.74 255.99500000000035 Td
-/F6.0 11 Tf
-<5c> Tj
+<ca2020202d4420617263686574797065417274696661637449643d73696d706c656170702d617263686574797065205c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -31481,51 +31238,7 @@ ET
 BT
 59.24000000000001 241.25500000000034 Td
 /F6.0 11 Tf
-<ca2020202d4420> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-97.74000000000001 241.25500000000034 Td
-/F6.0 11 Tf
-<61726368657479706556657273696f6e> 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
-185.74 241.25500000000034 Td
-/F6.0 11 Tf
-<3d> 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
-191.24 241.25500000000034 Td
-/F6.0 11 Tf
-<312e31352e302d534e415053484f5420> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
-
-BT
-279.24 241.25500000000034 Td
-/F6.0 11 Tf
-<5c> Tj
+<ca2020202d442061726368657479706556657273696f6e3d312e31352e302d534e415053484f54205c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -31536,51 +31249,7 @@ ET
 BT
 59.24000000000001 226.51500000000033 Td
 /F6.0 11 Tf
-<ca2020202d4420> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-97.74000000000001 226.51500000000033 Td
-/F6.0 11 Tf
-<67726f75704964> 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
-136.24 226.51500000000033 Td
-/F6.0 11 Tf
-<3d> 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
-141.74 226.51500000000033 Td
-/F6.0 11 Tf
-<636f6d2e6d79636f6d70616e7920> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
-
-BT
-218.74 226.51500000000033 Td
-/F6.0 11 Tf
-<5c> Tj
+<ca2020202d442067726f757049643d636f6d2e6d79636f6d70616e79205c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -31591,51 +31260,7 @@ ET
 BT
 59.24000000000001 211.77500000000035 Td
 /F6.0 11 Tf
-<ca2020202d4420> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-97.74000000000001 211.77500000000035 Td
-/F6.0 11 Tf
-<61727469666163744964> 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
-152.74 211.77500000000035 Td
-/F6.0 11 Tf
-<3d> 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
-158.24 211.77500000000035 Td
-/F6.0 11 Tf
-<6d7961707020> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
-
-BT
-191.24 211.77500000000035 Td
-/F6.0 11 Tf
-<5c> Tj
+<ca2020202d4420617274696661637449643d6d79617070205c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -31646,51 +31271,7 @@ ET
 BT
 59.24000000000001 197.03500000000037 Td
 /F6.0 11 Tf
-<ca2020202d4420> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-97.74000000000001 197.03500000000037 Td
-/F6.0 11 Tf
-<76657273696f6e> 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
-136.24 197.03500000000037 Td
-/F6.0 11 Tf
-<3d> 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
-141.74 197.03500000000037 Td
-/F6.0 11 Tf
-<312e302d534e415053484f5420> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
-
-BT
-213.24 197.03500000000037 Td
-/F6.0 11 Tf
-<5c> Tj
+<ca2020202d442076657273696f6e3d312e302d534e415053484f54205c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -31701,51 +31282,7 @@ ET
 BT
 59.24000000000001 182.29500000000036 Td
 /F6.0 11 Tf
-<ca2020202d4420> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-97.74000000000001 182.29500000000036 Td
-/F6.0 11 Tf
-<6172636865747970655265706f7369746f7279> 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
-202.24 182.29500000000036 Td
-/F6.0 11 Tf
-<3d> 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.74 182.29500000000036 Td
-/F6.0 11 Tf
-<687474703a2f2f7265706f7369746f72792d6573746174696f2e666f7267652e636c6f7564626565732e636f6d2f736e617073686f742f20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.267 0.867 scn
-0.000 0.267 0.867 SCN
-
-BT
-515.74 182.29500000000036 Td
-/F6.0 11 Tf
-<5c> Tj
+<ca2020202d44206172636865747970655265706f7369746f72793d687474703a2f2f7265706f7369746f72792d6573746174696f2e666f7267652e636c6f7564626565732e636f6d2f736e617073686f742f205c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -31907,26 +31444,26 @@ Q
 
 endstream
 endobj
-347 0 obj
+346 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 346 0 R
+/Contents 345 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F6.0 73 0 R
 /F2.0 18 0 R
 >>
-/XObject << /Stamp1 1225 0 R
+/XObject << /Stamp1 1224 0 R
 >>
 >>
 >>
 endobj
-348 0 obj
-[347 0 R /XYZ 0 778.86 null]
+347 0 obj
+[346 0 R /XYZ 0 778.86 null]
 endobj
-349 0 obj
-<< /Length 14976
+348 0 obj
+<< /Length 14537
 >>
 stream
 q
@@ -32099,24 +31636,13 @@ f
 h
 S
 Q
-0.000 0.200 0.533 scn
-0.000 0.200 0.533 SCN
-
-BT
-59.24000000000001 616.8850000000002 Td
-/F6.0 11 Tf
-<636420> 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
-75.74000000000001 616.8850000000002 Td
+59.24000000000001 616.8850000000002 Td
 /F6.0 11 Tf
-<6d79617070> Tj
+<6364206d79617070> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -32500,29 +32026,7 @@ Q
 BT
 59.24000000000001 255.26500000000036 Td
 /F6.0 11 Tf
-<6d766e202d706c20776562617070206a657474793a72756e202d44206a657474792e706f7274> 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
-268.24 255.26500000000036 Td
-/F6.0 11 Tf
-<3d> 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
-273.74 255.26500000000036 Td
-/F6.0 11 Tf
-<39303930> Tj
+<6d766e202d706c20776562617070206a657474793a72756e202d44206a657474792e706f72743d39303930> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -32771,23 +32275,23 @@ Q
 
 endstream
 endobj
-350 0 obj
+349 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 349 0 R
+/Contents 348 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F6.0 73 0 R
 /F2.0 18 0 R
 >>
-/XObject << /Stamp1 1225 0 R
+/XObject << /Stamp1 1224 0 R
 >>
 >>
-/Annots [351 0 R 354 0 R 355 0 R 358 0 R 360 0 R]
+/Annots [350 0 R 353 0 R 354 0 R 357 0 R 359 0 R]
 >>
 endobj
-351 0 obj
+350 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -32798,13 +32302,13 @@ endobj
 /Type /Annot
 >>
 endobj
+351 0 obj
+[349 0 R /XYZ 0 700.7700000000001 null]
+endobj
 352 0 obj
-[350 0 R /XYZ 0 700.7700000000001 null]
+[349 0 R /XYZ 0 548.4500000000003 null]
 endobj
 353 0 obj
-[350 0 R /XYZ 0 548.4500000000003 null]
-endobj
-354 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -32815,7 +32319,7 @@ endobj
 /Type /Annot
 >>
 endobj
-355 0 obj
+354 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -32826,13 +32330,13 @@ endobj
 /Type /Annot
 >>
 endobj
+355 0 obj
+[349 0 R /XYZ 0 428.0500000000004 null]
+endobj
 356 0 obj
-[350 0 R /XYZ 0 428.0500000000004 null]
+[349 0 R /XYZ 0 229.35000000000036 null]
 endobj
 357 0 obj
-[350 0 R /XYZ 0 229.35000000000036 null]
-endobj
-358 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -32843,10 +32347,10 @@ endobj
 /Type /Annot
 >>
 endobj
-359 0 obj
-[350 0 R /XYZ 0 140.13000000000034 null]
+358 0 obj
+[349 0 R /XYZ 0 140.13000000000034 null]
 endobj
-360 0 obj
+359 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -32857,7 +32361,7 @@ endobj
 /Type /Annot
 >>
 endobj
-361 0 obj
+360 0 obj
 << /Length 3765
 >>
 stream
@@ -33084,24 +32588,24 @@ Q
 
 endstream
 endobj
-362 0 obj
+361 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 361 0 R
+/Contents 360 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F2.0 18 0 R
 /F6.0 73 0 R
 >>
-/XObject << /I3 364 0 R
-/Stamp1 1225 0 R
+/XObject << /I3 363 0 R
+/Stamp1 1224 0 R
 >>
 >>
-/Annots [363 0 R 365 0 R 367 0 R]
+/Annots [362 0 R 364 0 R 366 0 R]
 >>
 endobj
-363 0 obj
+362 0 obj
 << /Border [0 0 0]
 /Dest (_ugfun_getting-started_datanucleus-enhancer)
 /Subtype /Link
@@ -33109,7 +32613,7 @@ endobj
 /Type /Annot
 >>
 endobj
-364 0 obj
+363 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 702
@@ -33192,7 +32696,7 @@ D
 \ufffd`\ufffd\ufffd\ufffd\u063d
\ufffd\ufffd/l9p}\ufffd\ufffdm9\ufffd\4\ufffd\ufffdMvMk\ufffdS\ufffd>\ufffd~-\ufffd:\ufffd\ufffdq\ufffd\ufffdr\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd}\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd?{S'\ufffdl\ufffd\ufffd\ufffd\ufffd~\ufffd\u0671\ufffd\ufffd|\ufffd\ufffd;\ufffd\ufffd[\ufffd\ufffdn=kbbb\ufffdc\ufffd5\ufffd-]\ufffd\u061e\ufffd\ufffd\ufffdY\ufffd\ufffd\ufffdgO\ufffd&\ufffd$^\ufffd'\ufffd:^\ufffd}m\ufffdM\ufffdu\ufffdyk\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdG\ufffdk\ufffd\ufffd\u01db\ufffd\ufffd<\ufffd\ufffd
f\ufffd\ufffdzO\ufffd*|\ufffd\ufffdk3M\ufffdY\ufffd\ufffdU\ufffd\ufffdti\ufffd
j.\ufffdj}t\ufffd5\ufffdV\ufffd\ufffd?\ufffd\ufffd\ufffdK\ufffd\ufffdG\ufffdHP\ufffd$\ufffd\ufffd}\ufffdw\ufffd\ufffd\ufffd\ufffd/\ufffd9z\ufffdM{Om\u07f07Y|\ufffd\ufffdOm\ufffd:\ufffd\ufffd\ufffd\ufffdU}B\ufffd\ufffd\ufffd\u077b7\ufffd<+s+\ufffd\ufffdG+\ufffdZ\ufffd2\ufffd\ufffd>\ufffd{w\ufffd\U000ac55bw\ufffd_\ufffd^\u069dlg\ufffd\ufffd\ufffd\ufffd3k\ufffd/\ufffd\ufffd\ufffd\ufffd\ufffd	\ufffd`$J\ufffdWV\ufffda<\ufffddT\ufffd\ufffd\ufffdG8d}\ufffd\ufffdV\ufffd\ufffdr\ufffd\ufffd\ufffdE\ufffd\ufffdf\ufffdO\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd.\ufffdZ\ufffdHP\ufffd8\ufffd\u0734\ufffd\ufffdU}B\ufffd\ufffd\ufffdjnp\u05ee\ufffd\ufffdM|nr\u05ee\ufffd\ub2dbE[Eb\ufffdfY\ufffd\ufffd\ufffd\ufffd\ufffdP"
@.\ufffd\u049d\ufffd\u0774\ufffd\ufffdU}B\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdd\ufffd\u0719\ufffd\ufffdw\ufffd,\ufffd\ufffd\ufffd\ufffd\ufffd6\u03ef<+J4\u03df\ufffd\ufffd\ufffd\ufffdr"
@.\ufffd\ufffd\ufffd\U000feda7\ufffdUq\ufffdx\ufffdw\ufffd\ufffdL57\ufffd\ufffd\ufffdZ2\ufffd\ufffd[o\ufffdQq}*z:\ufffd\ufffd[\ufffdq\ufffd~\ufffdC[\ufffdH\ufffd\ufffdCiv7\ufffd\ufffdO\ufffd\ufffdh&
.\ufffdS
 "
\ufffd8\ufffdH\ufffd\ufffd\ufffdM\ufffd\ufffd\ufffd\ufffdU\ufffdV\ufffd\ufffdL\ 
\ufffdD\ufffdqD\ufffd\ufffd\u072f\ufffdjb\ufffd[\ufffd\ufffdJ\ufffd\u0444\ufffd'\u0364\ufffd\ufffd`J\ufffd\ufffdU\ufffd\ufffd>\ufffd\ufffd~t\ufffd;\ufffdUW\ufffd\u07b6~\ufffd\ufffd*
\ufffd]\ufffd\ufffd\ufffdW_\ufffdq\ufffdl\u07bcY\ufffd\ufffd\ufffd\ufffdH0\ufffd\ufffdO?\ufffdl\ufffd3\ufffd\ufffd\ufffdf\ufffd\ufffd\ufffd\ufffd[\ufffdY\ufffd\ufffd\u07bd{\ufffd4\ufffd\ufffd\ufffdn\u06b4\ufffdG\ufffd\u0346x@\ufffd\ufffd\ufffd\ufffdH0\ufffdc\u01ceMNN\ufffd\ufffd\ufffd\u05ad[\ufffd~\ufffd\ufffd\u077b5\ufffd\ufffd\ufffdi\ufffdS"
\ufffd`"
\ufffd`"
\ufffd`"
\ufffd`"
\ufffd`"
\ufffd`"
\ufffd`"
\ufffd`"
\ufffd`"
\ufffd`"
\ufffd`cF\ufffd\ufffdRJ)\ufffd\ufffd\ufffd'5r\ufffdQJ)\ufffd\ufffdRJ\ufffdy^"\ufffdRJ)\ufffd\ufffdR\ufffd\ufffd%\ufffd(\ufffd\ufffdRJ)\ufffd\"\ufffdRJ)\ufffd\ufffdR\ufffd\ufffd%\ufffd(\ufffd\ufffdRJ)\ufffd\"\ufffdRJ)\ufffd\ufffdR\ufffd\ufffd%\ufffd(\ufffd\ufffdRJ)\ufffd\\ufffdH\ufffd\ufffdRJ)\ufffd\ufffdR
\ufffd\ufffdP\ufffd
 endstream
 endobj
-365 0 obj
+364 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -33203,10 +32707,10 @@ endobj
 /Type /Annot
 >>
 endobj
-366 0 obj
-[362 0 R /XYZ 0 450.32314442413167 null]
+365 0 obj
+[361 0 R /XYZ 0 450.32314442413167 null]
 endobj
-367 0 obj
+366 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -33217,7 +32721,7 @@ endobj
 /Type /Annot
 >>
 endobj
-368 0 obj
+367 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 702
@@ -33326,7 +32830,7 @@ Qi
 \ufffd\ufffd(\ufffd}\u0194}\ufffd\ufffdJ#\ufffd�\ufffd\ufffd\ufffd#1B\ufffd\u04881Si\ufffd\ufffd\ufffdJC\ufffd	\ufffdO\ufffd|\ufffd\u048b\ufffd\ufffddX\ufffdf\ufffd\u5210\ufffd4\ufffd\ufffd\ufffd\ufffdHV\ufffd\ufffd\ufffd\ufffd\ufffd\ud5ca\ufffd\ufffds#\ufffd\ufffd[\ufffd\ufffd\u0544\u0434\ufffd4\ufffd1c+My\ufffdPc\ufffdp\ufffd7b\ufffdb\ufffdT\ufffd4\ufffd\ufffd\ufffd\ufffdf\ufffd\ufffd"\ufffd#\ufffd\u056bW_\ufffd\ufffd[i\ufffd\ufffdEa(\ufffd\ufffd\ufffdA\ufffdP\ufffd\ufffdJ\*
\ufffd&T\ufffdJ3\ufffd\ufffdW\ufffd\ufffd\ufffd\ufffd\u0255\ufffd\ufffdD\ufffd7b\ufffdT\ufffdq\ufffd4\ufffd\ufffd\ufffdX\ufffd\ufffd\ufffd\ufffd/
D"\ufffd&3\ufffd\u04bczl\ufffd\ufffd\ufffdP\ufffd7b\ufffdb\ufffdT\ufffdYih5!1\ufffd*\ufffd\ufffd/\ufffd|1"fl\ufffd\ufffdr\ufffd\ufffd\ufffd\ufffd`\ufffd7b\ufffdb\ufffdT\ufffd\ufffd\ufffd\ufffdj\ufffd\ufffd\ufffdW\ufffd\ufffdb$"_i\ufffd"b\ufffdV\ufffd\ufffd\ufffd>Q\ufffd\ufffd\ufffds#\ufffd\ufffd\ufffd\ufffd\ufffdVStz\ufffd\ufffd\ufffd/\ufffd\ufffd\ufffdK\ufffd\ufffd\ufffd\ufffd\ufffdz5U\ufffd\ufffdw\ufffd\ufffd\ufffd\ufffd\ufffdS-\ufffd\ufffd^K\ufffd\ufffd\ufffd\ufffdD\ufffd\ufffdc\ufffd\uf5dc\ufffd\ufffd2\ufffd\u02fdy-\u01c7[Qi&\ufffdOV\ufffd\ufffd\u05f6M\ufffd?\u0179\ufffd\ufffd\ufffdZm~\ufffd _i\ufffdg\ufffd\u063cb\ufffd=c\ufffd\ufffd\ufffd_\ufffd\ufffd\ufffd_\ufffd#\ufffd\ufffdM\ufffdJC\ufffd).\ufffd\u0488\ufffd+s7\ufffd\ufffdL\ufffd\ufffdL\ufffd\ufffd\ufffdy\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdf\ufffdvw\ufffdz\ufffd}\ufffd\ufffd/'yd\ufffdj\u056a~9}}\ufffdo\ufffd\ufffd+\ufffd\ufffd\ufffd\ufffdSv?\ufffd\ufffd\ufffd>}\ufffd\ufffd\ufffd\ufffdr|\ufffd\ufffdF\ufffd#u\ufffd\ufffd\ufffd\ufffd\ufffd)\ufffd\ufffdF\ufffd4G\ufffdn~>
 \ufffd\ufffd\ufffd4\ufffdk{\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdC\ufffd%\ub526\ufffd\ufffd.\ufffd_\ufffd#\ufffd\ufffd\ufffdJC\ufffd)"\u07d5\ufffdl,SS+\ufffd\ufffdu\ufffd\ufffdX+\ufffd\u073d\u05b6s\ufffd+M\ufffd\ufffd*Qh\ufffd\u029c\ufffd\ufffd+y\ufffd\ufffd\ufffdWr9\ufffd)\ufffd4\ufffd	\ufffd\ufffd\ufffd
\ufffd
\ufffd\ufffd?\ufffd|\ufffd\ufffdBnm\ufffdy\ufffd=u\ufffd\ufffdy\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd:\ufffdi\ufffdl\ufffd}gP\ufffd\ufffd\ufffd8\ufffd4 \ufffd7\ufffde*\ufffd`g\ufffd{_9\ufffd1N\ufffd\ufffd-\ufffd\ufffd1Q\ufffd1\ufffds\ufffd\ufffdOU\ufffd\ufffdM\ufffd\ufffd\ufffd^\u02c8|\ufffd\ufffd\ufffd\ufffd(\ufffdg/o\ufffdqy\ufffdg\u05c3\ufffdw\ufffd\ufffd\u8df5\ufffd\ufffd\ufffd\u0653\ufffd[\ufffd\ufffds\ufffdg\ufffd'\u024cA}\ufffd\ufffd\ufffd\ufffd\ufffd\u05fbj\ufffd\ufffdL\ufffd$u!\ufffd\ufffdY^QQQ^^}\ufffd?\ufffdt\ufffd\u0488\ufffd\ufffdI\ufffd\ufffdk\ufffdd\ufffd9\ufffd\ufffdf\u04d1nQ\ufffd-+\ufffd\ufffdu\ufffd\ufffd\ufffd\ufffde\ufffd_\ufffd-o\ufffd\ufffd\ufffd
s\ufffd=\ufffdJ\ufffdP\ufffd\ufffdJl\ufffd\ufffdq\ufffd\ufffdC\ufffd\ufffd_\ufffd\ufffd\ufffd|\ufffd\ufffd\ufffd\ufffd;\ufffd\ufffd\ufffd\ufffd\ufffd\u0212\ufffdK\ufffdR\ufffd\ufffd\ufffd\ufffd%}F\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u143f2#yd\ufffdr\ufffd\ufffd	\ufffd\ufffda\ufffd\ufffd\ufffd\ufffd.u\ufffd\ufffd\ufffd\ufffd\ufffd\ufffde\ufffdc\ufffdc\ufffd\ufffd\ufffd}\ufffd6\ufffd\ufffd\ufffd]\ufffd\ufffd\ufffd\ufffd\u04f5\ufffdr\ufffdAy\ufffd1\ufffd\ufffd\u073c>\ufffd\u054f-]\ufffdh2YQ\ufffd\ufffd\ufffd\ufffdO\ufffd\ufffd\u07fdDcy\ufffd\ufffd\u01b3N\ufffd*\ufffd'\ufffd\ufffd\ufffd\u0181\ufffdB\ufffd\ufffd\ufffdh\ufffd\ufffd\ufffd\ufffdV#_ij\u07d5\ufffdKI\ufffd\ufffdb\ufffd\ufffd\ufffd-o\u0643\ufffdS\u035d\ufffd\ufffdy;'1B*
\u04185\ufffd\ufffd0\ufffd
 \ufffd\ufffd+\ufffdy\ufffd\ufffdJ\ufffd\ufffdt\ufffd\ufffd\u04f4\ufffd\u02fc\ufffd\ufffd\ufffd\ufffd\ufffdJ\u02dc>"_i.H\ufffdz\ufffd\ufffd\u062c\ufffd
]].i\ufffd=\ufffdzWWW\ufffd\ufffdY\ufffd\ufffd\ufffdtq_\ufffd6]\ufffd\ufffd4\ufffd^\ufffd1\ufffd\ufffd4f\ufffd\ufffdf"\ufffdiD\ufffd\ufffdo\ufffd?3%~\ufffd\ufffdG\ufffd|\ufffd\ufffd\ufffd2\ufffd\ufffd=]\ufffd4\ufffd\ufffd)SF\ufffd\ufffd\ufffd\ufffd\ufffdf\ufffd\ufffd\ufffdHV\ufffd\ufffd\ufffd:rZf/]\ufffd\u069e\u019e\ufffd\ufffd\ufffd\ufffd=\ufffdz\u0632\ufffdd^T\ufffdP\ufffd\ufffdJ\ufffd\ufffdl/T\ufffd\ufffd\ufffd*\u0352>2w\ufffd~\ufffdf\ufffd\ufffd\ufffd\u04ae\ufffd\ufffd\ufffdK\ufffd\ufffdh\ufffd\u0139\ufffdS\ufffdfO\ufffd\ufffd\u0539!\ufffdeD\ufffd\u023e\ufffd\ufffd\ufffdKBg\ufffd\ufffdg\ufffd~\ufffd\ufffd\ufffd\ufffd\ufffd\u039d\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd<\ufffd\ufffds\ufffd\ufffd\ufffd\ufffdk\ufffd|\ufffd]1\ufffd\ufffd\ufffd/\ufffd\ufffdVQ:*\ufffd\ufffd\ufffdS*\u0273._\ufffd\ufffd\u019c\ufffd\ufffd\u051c\ufffd\ufffd\ufffd\ufffdd\ufffd\ufffd5\ufffd\ufffd\u05fei@\u0728>5vC/?\ufffd\ufffdj\ufffd4o\ufffd\ufffd\ufffdKI\ufffd~\ufffdN1\ufffd\ufffd\u05d6O\ufffd\ufffd\u050d,\ufffd\ufffd"FH\ufffd\ufffd\ufffd\ufffd\ufffdjB\ufffd_\ufffd\ufffd]\ufffd\ufffd#s\ufffdT%\ufffd`\ufffddq\ufffdm\ufffd\ufffd\ufffd�;\u037bM{:\u750e\ufffd\ufffd\ufffd\ufffd\ufffd{9\ufffdJ\ufffd)\ufffd\ufffd\ufffd\ufffdK\ufffdb\ufffd^\ufffd\ufffd=\ufffd\ufffd\ufffd\ufffd\ufffdoX\ufffd"\ufffdq\ufffd>\ufffd>\ufffdv\ufffd,9\ufffd\ufffd\ufffd,V\ufffd\ufffdi\ufffdv!\ufffdv\ufffd%u\ufffd\ufffd\ufffd\ufffdGk\ufffd9\ufffd*s\ufffd\ufffd{z\ufffd\u0488\ufffd\u0589N\ufffd\ufffd\ufffd\ufffd\u06177>\ufffdR\ufffdP\ufffdJ\ufffd\ufffd\ufffdNQ\ufffd7\ufffd\ufffdu\ufffdS\ufffd\ufffd\ufffdw\ufffd-\ufffd\u0783\ufffd
 -{P{@\ufffdE\ufffd\ufffd8\ufffd4`2\ufffd\ufffdPiBE\ufffd4\ufffd\ufffd\ufffd\u029c\ufffd\ufffdn_\ufffd|\ufffdj\ufffdy\ufffd\ufffd\ufffdR\ufffdf\ufffdv\ufffd\ufffd\ufffd\ufffd>"YV\ufffdX\ufffd!\ufffd\ufffd\u82f7\ufffd\ufffd\ufffd}\ufffd\ufffdS\ufffd\ufffdw\ufffd\ufffd\ufffdv\ufffdGL\ufffd\u04d8#5\ufffdvG\ufffdm\u0326\ufffdh7\ufffdO\ufffd\ufffd\ufffd\ufffdQ\u02576\ufffd\ufffd4\ufffd\ufffd/$+7\ufffd\ufffdL\ufffd's\ufffdz\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd7\ufffd\ufffd;
\ufffd
\ufffd\ufffd\ufffd0\ufffd\ufffd\ufffd\ufffdYi\ufffd>\ufffd\ufffd\ufffd\ufffdJl\\u01f6M\ufffd\ufffd-o\u0643\u06a3\ufffd=(fmo\ufffdyQ1B1N*
pG\ufffd	\ufffd\u049c\ufffd\ufffd9\ufffduWY?034\ufffd\ufffds\ufffd\ufffd\ufffdvw\ufffdw\ufffd\ufffd\ufffd\ufffd\ufffdxIj\ufffd\ufffd"_i\u06a5\ufffd\ufffd\u057dp\ufffd\u58a5\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdmmm\ufffd\ufffd)\ufffd\ufffdPgL\ufffd>I\ufffds\ufffd\ufffd\u04f3SXi\ufffdO\ufffd\ufffd\ufffd8.3.KV\ufffdDc\ufffdj\ufffd\ufffd\ufffd\ufffdk_\ufffdz\ufffd\ufffdx\ufffd\ufffdJ3\ufffdV+m\ufffd\ufffd>\ufffdS\ufffdP\ufffdJ\ufffd\ue34e\ufffd\ufffd\ufffdIlY\ufffd\ufffdS\ufffd=\ufffd\ufffd\ufffd=\ufffd\ufffd\ufffd~\j\ufffd\ufffd\ufffd8\ufffd4\ufffd\ufffd&<\ufffdJ\ufffd\ufffd\ufffdHD\ufffd\u04b4E\ufffd\ufffd\ufffd\ufffdL]\ufffd\ufffd\ufffd:\ufffd|zC\ufffd6f\ufffd\ufffdhs\ufffd\ufffdhs\ufffd>\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdS\ufffd\u04bc\ufffd\ufffd\ufffdnm\ufffd\ufffd7voek\ufffd\ufffd\ufffdRi@6\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd+\ufffd<\ufffd\ufffd\ufffdW\ufffd\ufffd�\ufffd\ufffd_\ufffdrrR\ufffd%\u03ae\ufffd\ufffd\ufffdL\ufffd\ufffdR\ufffd\ufffd\ufffdM\ufffd\ufffd\u067f\ufffdYr\ufffdf\ufffdY{\ufffd]\ufffd[\ufffdy\ufffd\ufffd\ufffd\u04b4\ufffd\ufffdx\ufffd
 '\ufffdx\ufffd\u0484\ufffd\u074f\ufffd\ufffd\ufffd\ufffdHD\ufffd\ufffd~\ufffd\ufffd\ufffdFD\ufffd+\ufffdxX\ufffd \ufffd\ufffd\ufffd\ufffd7s~1\ufffd\ufffdP\ufffdJ\ufffd\ufffd`\ufffd\ufffd\ufffd[\ufffd\ufffd\ufffd\ufffdU,\ufffd-\ufffd8w\ufffd\ufffds\ufffd\ufffd8\ufffd4 \ufffd\ufffd�=\ufffdM\ufffd4m\ufffd\ufffd|\ufffd9\ufffdT\ufffdI\ufffd\ufffdd2\ufffdM\ufffdK\ufffd$>Ec\ufffd\ufffd4\ufffd\ufffd8\ufffdR\ufffd\u035f\ufffd\ufffd'\ufffd \ufffdJ\ufffd\u06f6HD\ufffd\ufffd~\u0672eg#"\ufffdJ\ufffdJS\ufffd\ufffda\ufffd7b\ufffdT\ufffd\ufffd\ufffd\ufffd\u07f6F"\ufffd\u05ef\ufffdY#Qi>\ufffd\ufffd5\ufffdP\ufffd\u027eF\ufffd\ufffd\ufffd+\ufffd\ufffd5-\ufffd\ufffd\ufffd{\ufffd\ufffd F(\ufffdy\ufffd\ufffd\ufffduuT\ufffd{d\ufffd\ufffdy\ufffdy\ufffd\ufffdg[B\ufffd\ufffdK\uaaea\ufffdd\ufffdh\u056aU'O\ufffd|?\ufffd\ufffd\ufffd\ufffd$\u05e8\ufffd\ufffdtxx\ufffd\ufffd\ufffd\ufffd3g\ufffdd_\ufffdx\ufffd\ufffd\ufffd\ufffd\u0103\ufffd\ufffdKj:\ufffd\ufffdg�g^\ufffd\ufffdM\ufffd\ufffd
\ufffd
\ufffdc\ufffd\ufffdJ\ufffd\ufffd}\ufffd.;p\ufffd\ufffd\ufffd9\ufffd\ufffd\u05ec/\ufffd\ufffd\ufffdY\ufffdC\ufffdUWW\ufffdn\ufffd\u03c8\ufffd"\ufffdF\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd[N\ufffdM\ufffd6e_\ufffdS\ufffd\ufffd_kYr`\ufffd]\u0697\ufffd\ufffd\ufffd>\ufffd>\ufffd
\ufffdkk\ufffdO\ufffd\ufffd\ufffd]\ufffd\ufffdT\ufffd\ufffd\ufffd\ufffd\ufffdTVV\ufffd
\ufffd\ufffd\ufffd\ufffdWUU\ufffd\ufffd\ufffd\ufffdF\ufffd%\ufffdF}\ufffd\ufffd7\ufffd]_7\ufffdx\ufffd\ufffd\ufffd\ufffda\ufffd\ufffd\ufffd~S=\ufffd\ufffd\ufffd\ufffd\u03a6\ufffdx\ufffd\ufffd\ufffdq\ufffd}E\ufffd\ufffd\ufffd3=\ufffd\ufffdx\ufffd\u04ab
\ufffd\ufffd\ufffdkk\ufffd1\ufffd\ufffdz\ufffd\ufffd\ufffd\ufffd3#c\ufffd\ufffdC\ufffd\ufffd
 \ufffd:\ufffdZ\u01ce\ufffd\ufffd\ufffdA\ufffd\ufffd]\ufffd??c\ufffd\ufffd\ufffd0*
\ufffd\ufffd\ufffd\ufffd0*
\ufffd\ufffd\ufffd\ufffd0*
\ufffd\ufffd\ufffd\ufffd0*
\ufffd\ufffd\ufffd\ufffd0\ufffd\ufffd\ufffdB!\ufffdBB\ufffd\ufffd+
!\ufffdB!\ufffd\ufffd<TB!\ufffdBH\ufffdC\ufffd!\ufffdB!\ufffdD8TB!\ufffdBH\ufffdC\ufffd!\ufffdB!\ufffdD8TB!\ufffdBH\ufffdC\ufffd!\ufffdB!\ufffdD8\ufffdJC!\ufffdB!\ufffd\ufffd\ufffd\u0546\ufffd
 endstream
 endobj
-369 0 obj
+368 0 obj
 << /Length 4923
 >>
 stream
@@ -33659,14 +33163,14 @@ Q
 
 endstream
 endobj
-370 0 obj
+369 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 369 0 R
+/Contents 368 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/XObject << /I4 368 0 R
-/Stamp1 1225 0 R
+/XObject << /I4 367 0 R
+/Stamp1 1224 0 R
 >>
 /Font << /F1.0 8 0 R
 /F6.0 73 0 R
@@ -33674,10 +33178,10 @@ endobj
 /F3.1 44 0 R
 >>
 >>
-/Annots [371 0 R 372 0 R 374 0 R 375 0 R]
+/Annots [370 0 R 371 0 R 373 0 R 374 0 R]
 >>
 endobj
-371 0 obj
+370 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -33688,7 +33192,7 @@ endobj
 /Type /Annot
 >>
 endobj
-372 0 obj
+371 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -33699,10 +33203,10 @@ endobj
 /Type /Annot
 >>
 endobj
-373 0 obj
-[370 0 R /XYZ 0 445.7931444241316 null]
+372 0 obj
+[369 0 R /XYZ 0 445.7931444241316 null]
 endobj
-374 0 obj
+373 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -33713,7 +33217,7 @@ endobj
 /Type /Annot
 >>
 endobj
-375 0 obj
+374 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -33724,7 +33228,7 @@ endobj
 /Type /Annot
 >>
 endobj
-376 0 obj
+375 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 827
@@ -33851,7 +33355,7 @@ Z
 \ufffdB pB!VPH\ufffd\u043f_\ufffd\ufffd
` HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG
 t HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt HG\ufffdt \ufffd\ufffd\ufffd\ufffd\ufffd\ufffd^ffffff\ufffd\ufffd&'	w\ufffd\ufffd\ufffd\ufffdMe\ufffd\ufffd\ufffd&\ufffd\ufffd\ufffd\ufffd$\u0715\ufffd\ufffd\ufffdyN'4\ufffd\ufffdELNN\ufffdJG\ufffd\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd#\ufffd\ufffd\ufffdM\ufffd|
 endstream
 endobj
-377 0 obj
+376 0 obj
 << /Length 3116
 >>
 stream
@@ -34061,25 +33565,25 @@ Q
 
 endstream
 endobj
-378 0 obj
+377 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 377 0 R
+/Contents 376 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/XObject << /I5 376 0 R
-/I6 381 0 R
-/Stamp1 1225 0 R
+/XObject << /I5 375 0 R
+/I6 380 0 R
+/Stamp1 1224 0 R
 >>
 /Font << /F1.0 8 0 R
 /F6.0 73 0 R
 /F5.0 52 0 R
 >>
 >>
-/Annots [379 0 R 380 0 R 382 0 R 383 0 R]
+/Annots [378 0 R 379 0 R 381 0 R 382 0 R]
 >>
 endobj
-379 0 obj
+378 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -34090,7 +33594,7 @@ endobj
 /Type /Annot
 >>
 endobj
-380 0 obj
+379 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -34101,7 +33605,7 @@ endobj
 /Type /Annot
 >>
 endobj
-381 0 obj
+380 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 827
@@ -34256,7 +33760,7 @@ Y1
 +($s\ufffd\ufffd]O\ufffd0A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#A:\ufffd#\ufffdt\ufffd\ufffdO\ufffd\ufffd\ufffd`1\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u06262\ufffdar
 \ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdd\ufffd\ufffd\ufffd$\ufffdt\ufffd=\ufffds:\ufffd9?ffffff\ufffd\ufffd&''	w\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdw\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdb\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdb\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdb\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdb\ufffdt4333333\ufffd\ufffd7&4)0
 endstream
 endobj
-382 0 obj
+381 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -34267,7 +33771,7 @@ endobj
 /Type /Annot
 >>
 endobj
-383 0 obj
+382 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -34278,7 +33782,7 @@ endobj
 /Type /Annot
 >>
 endobj
-384 0 obj
+383 0 obj
 << /Length 2118
 >>
 stream
@@ -34408,24 +33912,24 @@ Q
 
 endstream
 endobj
-385 0 obj
+384 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 384 0 R
+/Contents 383 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F5.0 52 0 R
 >>
-/XObject << /I7 386 0 R
-/I8 388 0 R
-/Stamp1 1225 0 R
+/XObject << /I7 385 0 R
+/I8 387 0 R
+/Stamp1 1224 0 R
 >>
 >>
-/Annots [387 0 R 389 0 R]
+/Annots [386 0 R 388 0 R]
 >>
 endobj
-386 0 obj
+385 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 827
@@ -34532,7 +34036,7 @@ R}
 \ufffd\ufffd\ufffd$I\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u05ff\ufffd\ufffd\ufffd\ufffd\ufffdKL1\ufffdI\ufffd\ufffdt\ufffd\ufffd\ufffd.Vf\ufffd\ufffd\u0714$I\ufffd$-\ufffd\ufffdX\ufffd\ufffdb\ufffd4\ufffd\ufffd;\u0161\ufffd\ufffd,\ufffdF\ufffd$I\ufffd\ufffdD*f`1\ufffdI\ufffd\ufffdt\ufffd$I\ufffd$i*\ufffdQ\ufffd$I\ufffd2%I\ufffd$I!\ufffdQ\ufffd$I\ufffd2%I\ufffd$I\ufffd\ufffdt\ufffd$I\ufffd$i\ufffd\ufffd\ufffd=\ufffd\ufffd
 endstream
 endobj
-387 0 obj
+386 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -34543,7 +34047,7 @@ endobj
 /Type /Annot
 >>
 endobj
-388 0 obj
+387 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 827
@@ -34628,7 +34132,7 @@ T\u0327
 \ufffd\ufffd\ufffd\ufffdO\ufffdH\ufffdc\ufffd\ufffd\ufffd(f=\ufffdc|i7\ufffd\ufffd\ufffdg\ufffd_\ufffd\ufffds\ufffdzZ\ufffd\ufffd1\ufffd\ufffd\ufffd\ufffd\ufffdP\ufffd\ufffdl\ufffdI\ufffd\ufffds\ufffdM\ufffd6\ufffd\ufffd{lH\ufffd<6\ufffd\ufffd\u0329\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd+\u07d4\u02b3\ufffd\ufffd\ufffd\ufffdL[\ufffdT5\ufffd\ufffd\ufffd\ufffdG\ufffdw\ufffdW\ufffd\ufffdo\ufffd+\ufffdY\ufffd\ufffdq\ufffd|\ufffdf\ufffd|l\ufffdz`v53\ufffd\u0198\ufffd\ufffdR\ufffdc\ufffd*:\ufffd\u06c1|)\u02b1":\u03a9\ufffdn\ufffd\ufffdx\ufffd\ufffd9\ufffd\ufffd\ufffdR[W9f)\ufffd\ufffd\ufffd\ufffd=\ufffdINp\ufffdM\ufffd(DG\ufffdr\ufffd\ufffd\ufffd\ufffds\ufffd\ufffd\ufffdh\ufffds\ufffd\ufffd\ufffd\ufffdk\ufffd\ufffd\ufffd\u0759\ufffd\ufffd"\ufffd2e7y\ufffd\ufffd\ufffd\ufffd\ufffdQDG\ufffdr\ufffd\ufffd\ufffd\ufffds\ufffd\ufffd\ufffd3\ufffdy\ufffd\ufffdb\ufffd\ufffdLt|=\ufffd*\ufffd\ufffd\u0207\ufffd\ufffd|$9\ufffdxO;R;\ufffd\ufffd\u01e7\ufffd\ufffdHQ\ufffd\ufffd\ufffd\ufffd3\ufffd\ufffdWt\ufffdNQg\ufffd\ufffd\ufffdx<2\ufffd\ufffd2p>\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd_^^\u01ef\ufffd0\ufffd\ufffd\ufffdZ\u064f\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffde\ufffd|:+\ufffd\ufffdO\ufffd\ufffd"=Ff\ufffd\ufffd7EQF%r\ufffd\ufffd1q\ufffdW\u03a7\ufffdg\ufffd`\ufffd\ufffd\ufffd@tX :,\ufffd\ufffdDG\ufffd\ufffd#\ufffd\ufffd`\ufffd\ufffd\ufffd@tX :,\ufffd\ufffdDG\ufffd\ufffd#\ufffdB~\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd?\ufffd\ufffd(\ufffd\ufffd(\ufffd\ufffd(\ua715\ufffd"\u068a\ufffd\ufffd\ufffd\ufffd\
 \ufffdL\ufffd\ufffd\ufffd\ufffd\ufffdsB\ufffd@E$\ufffd\ufffd~\ufffd\ufffdh*\ufffd\ufffdXpN\ufffd(�\ufffd\ufffd\ufffd\ufffd#iDG\ufffd\ufffd#\ufffd\ufffd`\ufffd\ufffd\ufffd\ufffdEG\ufffd\ufffdt\ufffd]\ufffd
 endstream
 endobj
-389 0 obj
+388 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -34639,7 +34143,7 @@ endobj
 /Type /Annot
 >>
 endobj
-390 0 obj
+389 0 obj
 << /Length 2290
 >>
 stream
@@ -34762,23 +34266,23 @@ Q
 
 endstream
 endobj
-391 0 obj
+390 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 390 0 R
+/Contents 389 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 >>
-/XObject << /I9 392 0 R
-/I10 394 0 R
-/Stamp1 1225 0 R
+/XObject << /I9 391 0 R
+/I10 393 0 R
+/Stamp1 1224 0 R
 >>
 >>
-/Annots [393 0 R 395 0 R]
+/Annots [392 0 R 394 0 R]
 >>
 endobj
-392 0 obj
+391 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 827
@@ -34929,7 +34433,7 @@ O
 \ufffd5\ufffd\ufffdt\ufffd$\ufffdi=Ce\ufffd\ufffdq_:\ufffdQ\ufffd\ufffd\ufffd\ufffd\ufffdH}_\ufffdX\u0791\ufffd\ufffd\ufffd\ufffd.y\ufffdk\ufffdZn\ufffdLGh\ufffdQ\ufffd\u0516\ufffd\ufffd\u028d\ufffd\ufffd\ufffd\u056a\ufffdL\ufffdPN\ufffd\ufffd\ufffd\ufffd\ufffd.\ufffd/?\ufffd4\ufffd\ufffd\ufffdfq\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd
c:J\ufffd\u06ae\ufffd\ufffd\u04e3\ufffd\ufffd_|\ufffd\ufffd>f\ufffd\ufffd`4\ufffd~\ufffd\ufffd\ufffd\ufffd\ufffdk\ufffd\u02cf\ufffdGj\ufffd\ufffd\ufffd<\ufffd\ufffdt\ufffd$I\ufffdA\ufffd\ufffd\ufffd\ufffd\ufffd\u05ef\ufffd\ufffdthN{\ufffd\ufffd\ufffdBarj\ufffd\ufffd\ufffddH\ufffd$\ufffd=k\ufffd\ufffd\ufffd\u06db\ufffd-,,\ufffd\ufffd\ufffd\ufffda:4\ufffd\ufffd\ufffd\ufffd\ufffd\u05ef\ufffd W\ufffd\ufffdh\ufffd?\ufffd$Ij\u03dae:~\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdc\ufffd\ufffd\ufffd\ufffd&
\ufffd'C\ufffd$I\ufffdY\ufffdLGI\ufffd$IR\ufffdf:J\ufffd$I\ufffd"\ufffd\ufffd\ufffd$I\ufffd\ufffdH\ufffd\ufffd$I\ufffd$)\ufffd\ufffd(I\ufffd$I\ufffdd:J\ufffd$I\ufffd"\ufffd\ufffd\ufffd$I\ufffd\ufffdH\ufffd\ufffd$I\ufffd$)\ufffd\ufffd(I\ufffd$I\ufffdd:J\ufffd$I\ufffd"\ufffd\ufffd\ufffd$I\ufffd\ufffdH\ufffd\ufffd$I\ufffd$)\ufffd\ufffd(I\ufffd$I\ufffdd:J\ufffd$I\ufffd"\ufffd\ufffd\ufffd$I\ufffd\ufffdH\ufffd\ufffd$I\ufffd$)\ufffd\ufffd(I\ufffd$I\ufffd\ufffd\ufffd\ufffd\ufffd/\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd6\ufffd`\ufffd\ufffduM\ufffd\ufffd\ufffd\u07c7\ufffd~A\ufffd\ufffd\ufffd$I\ufffd\ufffd6)\ufffd\ufffd0\ufffd$\ufffdk:\ufffd\ufffd\ufffdS\ufffdh\ufffd\ufffd\ufffdH\ufffd$I\ufffd\u06a40\ufffd\ufffd\ufffd\ufffd\ufffd(I\ufffd$IR)\ufffdQ\ufffd$I\ufffd\ufffdt\ufffd$I\ufffd$E2%I\ufffd$I\ufffdLGI\ufffd$IR\ufffd\ufffdt\ufffd$I\ufffd$i\ufffd\ufffd\ufffdn
 endstream
 endobj
-393 0 obj
+392 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -34940,7 +34444,7 @@ endobj
 /Type /Annot
 >>
 endobj
-394 0 obj
+393 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 827
@@ -35044,7 +34548,7 @@ w
 TG\ufffd\ufffdQ\ufffd\ufffd\ufffd\ufffdq\ufffd
 endstream
 endobj
-395 0 obj
+394 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -35055,7 +34559,7 @@ endobj
 /Type /Annot
 >>
 endobj
-396 0 obj
+395 0 obj
 << /Length 1152
 >>
 stream
@@ -35129,23 +34633,23 @@ Q
 
 endstream
 endobj
-397 0 obj
+396 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 396 0 R
+/Contents 395 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 >>
-/XObject << /I11 398 0 R
-/I12 400 0 R
-/Stamp1 1225 0 R
+/XObject << /I11 397 0 R
+/I12 399 0 R
+/Stamp1 1224 0 R
 >>
 >>
-/Annots [399 0 R 401 0 R]
+/Annots [398 0 R 400 0 R]
 >>
 endobj
-398 0 obj
+397 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 827
@@ -35290,7 +34794,7 @@ d:J
 d:J\ufffd$I\ufffdU6\ufffd\ufffd\ufffd\ufffd\u0127\ufffd\ufffdOV\ufffdhF\ufffd\ufffd\ufffd\ufffdx\ufffd>\ufffdVf\ufffd\ufffd\u0714$I\ufffd$\ufffd\ufffd\ufffd\ufffd\ufffdh\ufffd5\ufffd\ufffd\ufffdg\u0461\ufffd\u040c\ufffdF\ufffd$I\ufffd\ufffdJ\ufffdf`4\ufffdIX\ufffdt\ufffd$I\ufffd$i.\ufffdQ\ufffd$I\ufffd\ufffdt\ufffd$I\ufffd$2%I\ufffd$I\ufffdLGI\ufffd$IR\ufffd\ufffdt\ufffd$I\ufffd$i\ufffd\ufffd\u01c4K\ufffd
 endstream
 endobj
-399 0 obj
+398 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -35301,7 +34805,7 @@ endobj
 /Type /Annot
 >>
 endobj
-400 0 obj
+399 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 827
@@ -35440,7 +34944,7 @@ K-\ucd492
 \u0451\ufffd"+\ufffd#\ufffd&%2\ufffdt\ufffd\u046a:D\ufffd}\ufffd\ufffd\ufffdr\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd1dwksiz\ufffd\ufffd\ufffd\ufffd\ufffd":RTdEt\u051c\ufffd\uecf9\ufffd\ufffd\ufffdm\ufffd\ufffd-\ufffd\ufffdNc\ufffd0\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u0599\u06ae?\ufffduDG\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd/\ufffdPt|\ufffd\ufffd\ufffd[:A\ufffd\ufffd\ufffdY\ufffd\ufffdc\ufffdX\ufffd\ufffd>\ufffd\ufffdWj\ufffd^\ufffd\ufffd7\ufffd\ufffdaqqQ\ufffd\ufffd\ufffd\ufffdt\ufffd\ufffdk<:\ufffdz\ufffdJ\ufffd\ufffd|u\ufffdf\ufffd2P\ufffd\ufffdJt\ufffd0qR\ufffd\ufffd\ufffd\ufffd?)\ufffd\ufffd+\ufffd\u014fI\ufffd2P\ufffd\ufffdJt\ufffdYDG\ufffd\ufffd\ufffdAthDG\ufffd\ufffd\ufffdAthDG\ufffd\ufffd\ufffdAthDG\ufffd\ufffd\ufffdAth\ufffd\u33ff|}\ufffd\u0197\ufffdREQEQEQ5V"\ufffdH(:\ufffd\ufffd\ufffd\ufffdH\ufffd\ufffd"nj\ufffd\ufffd\ufffd"\ufffdH(:\ufffd\ufffd\ufffdM\ufffdTM\ufffd@\ufffd1P\ufffdA	EGlDG\ufffd\ufffd\ufffdAthVt\ufffd\ufffd\ufffdyni\ufffd
 endstream
 endobj
-401 0 obj
+400 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -35451,7 +34955,7 @@ endobj
 /Type /Annot
 >>
 endobj
-402 0 obj
+401 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 827
@@ -35646,7 +35150,7 @@ Ku
 \ufffd\ufffd\ufffd\ufffd$I\ufffd$-\ufffd\ufffd\ufffd\ufffd*w
 endstream
 endobj
-403 0 obj
+402 0 obj
 << /Length 846
 >>
 stream
@@ -35709,23 +35213,23 @@ Q
 
 endstream
 endobj
-404 0 obj
+403 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 403 0 R
+/Contents 402 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/XObject << /I13 402 0 R
-/I14 406 0 R
-/Stamp1 1225 0 R
+/XObject << /I13 401 0 R
+/I14 405 0 R
+/Stamp1 1224 0 R
 >>
 /Font << /F1.0 8 0 R
 >>
 >>
-/Annots [405 0 R 407 0 R]
+/Annots [404 0 R 406 0 R]
 >>
 endobj
-405 0 obj
+404 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -35736,7 +35240,7 @@ endobj
 /Type /Annot
 >>
 endobj
-406 0 obj
+405 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 827
@@ -35889,7 +35393,7 @@ R~
 2%I\ufffd$IA\ufffd\ufffd$I\ufffd$)\ufffdt\ufffd$I\ufffd$\ufffd\ufffd\ufffd$I\ufffd\ufffd\ufffd\u05a6\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd?\ufffd\ufffd?.\ufffdd&\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdde&_\ufffd\ufffdMI\ufffd$I\ufffd%)\ufffd\ufffd\ufffdL&aS\ufffd\ufffd\ufffd\ufffd\u07d3C\ufffd\ufffd\ufffd|\ufffd$I\ufffd$\u9494\ufffd\ufffdd&\ufffd\ufffd\ufffd\ufffd(I\ufffd$I\ufffdQ\ufffd\ufffd$I\ufffd$)\ufffdt\ufffd$I\ufffd$\ufffd\ufffd\ufffd$I\ufffd\ufffd \ufffdQ\ufffd$I\ufffdT\ufffd\ufffd\ufffd$I\ufffd$\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd
 endstream
 endobj
-407 0 obj
+406 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -35900,7 +35404,7 @@ endobj
 /Type /Annot
 >>
 endobj
-408 0 obj
+407 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 827
@@ -36034,7 +35538,7 @@ s)v�\u04ccV\u01fc
 TG\ufffd\ufffdQ\ufffd\ufffd\ufffdn\ufffdu
 endstream
 endobj
-409 0 obj
+408 0 obj
 << /Length 1650
 >>
 stream
@@ -36142,23 +35646,23 @@ Q
 
 endstream
 endobj
-410 0 obj
+409 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 409 0 R
+/Contents 408 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/XObject << /I15 408 0 R
-/I16 412 0 R
-/Stamp1 1225 0 R
+/XObject << /I15 407 0 R
+/I16 411 0 R
+/Stamp1 1224 0 R
 >>
 /Font << /F1.0 8 0 R
 >>
 >>
-/Annots [411 0 R 413 0 R 414 0 R]
+/Annots [410 0 R 412 0 R 413 0 R]
 >>
 endobj
-411 0 obj
+410 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -36169,7 +35673,7 @@ endobj
 /Type /Annot
 >>
 endobj
-412 0 obj
+411 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 827
@@ -36299,7 +35803,7 @@ u�
 \ufffd\ufffd\ufffdo\ufffd'yd\ufffd\ufffd\ufffd\ufffd7(=\ufffd\ufffd\ufffd\ufffd^\ufffd1\ufffdk/\ueac1\ufffd\ufffd\ufffd9\ufffd\ufffd=-\ue9f1\ufffd\ufffd\ufffd\u05ab\ufffd\ufffd\ufffdl\ufffdI\ufffd\ufffds\ufffdM\ufffd\ufffd8\ufffd\ufffd?c\ufffdr\ufffd\u062cy2\ufffdr\ufffd7\ufffdM\ufffd\ufffd\ufffd\ufffdu\ufffd:x\ufffdf\ufffdj\ufffdF\ufffd1>o\ufffdDre7\ufffd\u07fb\ufffd\ufffd\ufffd}\ufffd\ufffd\u06a9\ufffd8\ufffd
\ufffdXxS\ufffd\ufffd\ufffd\u03d8\u03d2\u07fe\ufffd\ufffd\ufffd_DG\ufffd*[\ufffd1\ufffdy\ufffd\ufffd<OT\ufffdp__\ufffd\ufffd\ufffd.\ufffd"W\ufffdq\ufffd\ufffdG\ue45c\ufffdjM\ufffd?+DG\ufffd*[\ufffd\ufffdV\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdx\ufffd\ufffd\ufffd\ufffd\ufffd7?1TPSv\ufffdk\ufffd\ufffd\ufffd\ufffd7\ufffd\u0451\ufffd\ufffdVDG@\u0169\ufffd\ufffd\ufffd?\ufffdu\ufffd\ufffdLt<\ufffd\ufffds8\ufffd(\ufffd1\ufffd$\ufffd\ufffdWj\ufffd>\ufffd\ufffd\ufffd)\ufffdlEt\ufffdyq\ufffd\ufffd\ufffd>\ufffd:E\ufffd\ufffd\ufffd\ufffd\ufffdtr\ufffd\u01f2\ufffd\ufffd\ufffd\ufffdtV\ufffd\ufffd\ufffd?\ufffdeeeE\\ufffd\ufffdt\ufffd:k\ufffd=:\ufffd\ufffd^\ufffd\ufffd\ufffd\ufffd\ufffd\ufffde\ufffd'\ufffd\ufffdD\ufffd_\ufffdZEzL\ufffd\ufffd\ufffd/\ufffd\ufffd\ufffdJ\ufffdF\ufffdkR\ufffd2P\ufffd\ufffdJt\ufffdYDG\ufffd\ufffd#\ufffd\ufffd\ufffd\ufffdpAt\ufffd :\.\ufffd\ufffdDG\ufffd\ufffd#\ufffd\ufffd\ufffd\ufffdpAt\ufffd :\.\ufffd\ufffd\ufffd\ufffd\ufffd_\ufffd\ufffd\ufffdo\ufffd\ufffdEQEQEQT\ufffd\ufffd\ufffd"z\ufffd\ufffd\ufffd(R\ufffd\ufffd@\ufffdM@\ufffd1P\ufffdA	=E\ufffd
 ^~/\ufffd\ufffd\ufffd)\ufffdTE\ufffd\ufffdSt \ufffd\ufffdpAt\ufffd :\.\ufffd\ufffd@	\ufffd\ufffdc
 endstream
 endobj
-413 0 obj
+412 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -36310,7 +35814,7 @@ endobj
 /Type /Annot
 >>
 endobj
-414 0 obj
+413 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -36321,7 +35825,7 @@ endobj
 /Type /Annot
 >>
 endobj
-415 0 obj
+414 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 827
@@ -36524,7 +36028,7 @@ uUX
 \ufffd\ufffd\ufffdB2\ufffd\ufffd\ufffd\ufffd\ufffdn\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd
 \ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@
 \ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd@\ufffd//\ufffd\ufffdq;\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdl\ufffdMN\ufffdJ\ufffd\ufffdc\ufffd\u029c\ufffd\ufffdM1818I\ufffd+o\ufffd\ufffdNh\ufffd\ufffd\ufffd\ufffd\ufffd$\u0715\ufffd\ufffd%\ufffd\ufffd \ufffd\ufffd\ufffdIG\ufffd\ufffd
t\ufffd;\ufffd
 endstream
 endobj
-416 0 obj
+415 0 obj
 << /Length 2219
 >>
 stream
@@ -36654,24 +36158,24 @@ Q
 
 endstream
 endobj
-417 0 obj
+416 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 416 0 R
+/Contents 415 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/XObject << /I17 415 0 R
-/I18 419 0 R
-/Stamp1 1225 0 R
+/XObject << /I17 414 0 R
+/I18 418 0 R
+/Stamp1 1224 0 R
 >>
 /Font << /F1.0 8 0 R
 /F3.1 44 0 R
 >>
 >>
-/Annots [418 0 R 420 0 R]
+/Annots [417 0 R 419 0 R]
 >>
 endobj
-418 0 obj
+417 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -36682,7 +36186,7 @@ endobj
 /Type /Annot
 >>
 endobj
-419 0 obj
+418 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 827
@@ -36945,7 +36449,7 @@ glz
 JtTJ)\ufffd\ufffdRJ)UP\ufffd\ufffdRJ)\ufffd\ufffdRJ\ufffd\ufffd\ufffdRJ)\ufffd\ufffdRJ\ufffd,:*\ufffd\ufffdRJ)\ufffd\ufffdR\ufffd\ufffd\ufffd\ufffdy
 endstream
 endobj
-420 0 obj
+419 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -36956,7 +36460,7 @@ endobj
 /Type /Annot
 >>
 endobj
-421 0 obj
+420 0 obj
 << /Length 2270
 >>
 stream
@@ -37093,24 +36597,24 @@ Q
 
 endstream
 endobj
-422 0 obj
+421 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 421 0 R
+/Contents 420 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F6.0 73 0 R
 >>
-/XObject << /I19 423 0 R
-/I20 425 0 R
-/Stamp1 1225 0 R
+/XObject << /I19 422 0 R
+/I20 424 0 R
+/Stamp1 1224 0 R
 >>
 >>
-/Annots [424 0 R 426 0 R]
+/Annots [423 0 R 425 0 R]
 >>
 endobj
-423 0 obj
+422 0 obj
 << /Type /XObject
 /Subtype /Image
 /Height 827
@@ -37345,7 +36849,7 @@ u}
 }\ufffdp\ufffdg\ufffd\ufffdNp\ufffd'84\ufffdu\ufffd :j\ufffdw\ufffd\ufffdp/,:\ufffd\ufffd\ufffdU\ufffdix\ufffdg8\ufffd\ufffdDG\ufffdP\ufffd\ufffd\ufffdN\ufffdr\ufffdsp\ufffd\ufffd\ufffdDG@
\ufffd#\ufffd\ufffdP\ufffd\ufffd\ufffdAt\ufffd :j5\ufffd\ufffd\ufffdDG@
\ufffd#\ufffd\ufffdP\ufffd\ufffd\ufffdAt\ufffd :j5\ufffd\ufffd\ufffdDG@\ufffd[F\u01ef\ufffd\ufffd\ufffd?Ap\ufffds\ufffdNn\u07fc\ufffdEQEQ\ufffd6u}\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdG8kDG\ufffd\ufffd(\ufffd\ufffd^Qz\ufffd\ufffdN}\ufffd\ufffd=\ufffd#EQEQ\ufffd~\ufffd\ufffd~\ufffd\ufffdO{\ufffdGt\ufffd(\ufffd\ufffd(\ufffd\ufffd\ufffd\ufffd_\ufffd\ufffd\ufffdp{\ufffd\ufffd\ufffd_]=\ufffdx\ufffd2\ufffd(\ufffd\ufffd\ufffd|oqI\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd/\ufffd} \ufffd\ufffd\ufffd\ufffd\u016b\ufffd\ufffd\ufffd|*\ufffd~|\ufffd\u056d7\ufffd\ufffd\ufffdW},6a\ufffd\u07dd\ufffd\ufffd\ufffd\ufffd(\ufffd\ufffd\ufffde\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd/\ufffd\ufffd\ufffdT\ufffd\ufffd\ufffd\ufffdw\ufffd\ufffdy\ufffd\u02f7\ufffds\ufffd\ufffdI\ufffd\ufffd\ufffdO\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\<\ufffd\ufffd\ufffdT\ufffd\ufffd(\ufffd:`\ufffd\ufffd5:n\ufffd\u03b8]t\ufffd\ufffd=M\ufffd"\ufffd\ufffd\ufffd<NWKQEQ\ufffda\ufffd\ufffdg\ufffd0\ufffd\ufffd\ufffd\ufffd{\ufffd\ufffd\ufffd\ufffdb\ufffdo\ufffd\ufffd\ufffd:\ufffd\u061b}\ufffd\ufffd\ufffd\ufffdO\ufffd\ufffd\ufffdx\ufffd\u03ef^<\ufffd\ufffdQ\ufffd\ufffd\ufffd^\ufffd\aYt\ufffd\ufffd\ufffd\ufffd_\\ufffd\ufffd\ufffdwet\ufffd\ufffd?\ufffd
 qq\ufffdx\ufffd\ufffdGb\ufffd\ufffdy\ufffd\ufffd\ufffd/\ufffdF\ufffd}\ufffd\ufffd\ufffd\ufffd\ufffdsc\ufffd\ufffd\ufffd\ufffdk\ufffd\ufffd(\ufffd\ufffd\ufffdk\ufffd.:^\ufffd\ufffd\ufffd\ufffd|\ufffd\ufffd\ufffd\u03dd\ufffd\ufffd\ufffd\ufffd\ufffden\ufffd\u03dbW\ufffd\ufffd\ufffdH\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd+,\ufffd\ufffd_\ufffd\ufffd\u0245\ufffd\ufffd\ufffdoetL\ufffd\ufffd\ufffd\ufffd\ufffdV\u06fdx\ufffdb\ufffd\ufffd\ufffd_\ufffd\ufffd\ufffd\u01cf.\ufffdx7\uc8cb\ufffd}\ufffd\ufffd\ufffd\ufffd\ufffd1\ufffd4EQEQ\ufffd)\ufffd#\ufffd\ufffd\ufffdE\ufffdG\ufffd\ufffdHG\ufffd\ufffd?\ufffd\ufffdO\ufffd\ufffdw\ufffd\ufffd:\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdx\ufffd\ufffd_\ufffd+,F\ufffd\ufffdW\ufffd>\ufffd\ufffd\ufffd\ufffdW\ufffdb\ufffd\u0471|\ufffd\u024d\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u03ffO\ufffd\ufffd\ufffd\u04cb?\ufffd)\ufffd\ufffd(\ufffdEt\ufffd\ufffdv\ufffd\u8e3c\ufffd0\ufffd.\ufffd\ufffd?|t\ufffd\ufffd\ufffd\u523f|\ufffd\ufffd\ufffd>y$F\ufffd~\ufffd\ufffd@u=:\u01b9\ufffd_\ufffd\ufffd\ufffdh\ufffd\ufffd\ufffd\ufffd\ufffd7F\ufffd*\ufffdT\ufffd\ufffdEQu\ufffd":\ufffdY;rt7~\ufffd\u0253\ufffd\ufffd\ufffdR\ufffd\ufffd\ufffdr>\ufffdL\u01a3\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u02cf_\ufffd\ufffd[\ufffdv\ufffd1\ufffd\ufffd\u0451\ufffd(\ufffd\ufffd^DG8k'\ufffd\ufffdo\ufffd\ufffd>~t\ufffd\ufffd\ufffdwt\ufffdw\ufffd.\ufffd\ufffd\ufffd~\ufffd\ufffd\ufffd?\ufffd\ufffd\ufffd\ufffd7\ufffd\ufffd\ufffd\ufffd\ufffdyr\ufffd\u06e7_\ufffd\\ufffd\ufffd]t\ufffd\\ufffd\ufffd\ufffd>\ufffd\ufffdf)\ufffd\ufffd(\ufffd\ufffdEt\ufffd\ufffdv\ufffd\ufffd\ufffd\ufffd\ufffd_\ufffdY\ufffdx\ufffd\ufffdu\ufffd\ufffd\ufffdzq\ufffd\ufffd)V?x\ufffd\ufffd\ufffdj\ufffd\ufffd$:\ufffd\ufffd\ufffdQa\ufffdi\ufffd\ufffdV\ufffd1\ufffd\ufffd\ufffd\ufffd

<TRUNCATED>

[13/44] isis-site git commit: ISIS-1594: provide an 'edit' button

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/guides/ugvro.html
----------------------------------------------------------------------
diff --git a/content/guides/ugvro.html b/content/guides/ugvro.html
index a807b2f..990664d 100644
--- a/content/guides/ugvro.html
+++ b/content/guides/ugvro.html
@@ -1,12 +1,10 @@
 <!doctype html>
 <html class="no-js" lang="en">
-<head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-
-    <title>Restful Objects Viewer</title>
-
-    <!--
+ <head> 
+  <meta charset="utf-8"> 
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"> 
+  <title>Restful Objects Viewer</title> 
+  <!--
         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
@@ -23,31 +21,21 @@
         KIND, either express or implied.  See the License for the
         specific language governing permissions and limitations
         under the License.
-    -->
-
-    <!-- No caching headers -->
-    <meta http-equiv="cache-control" content="no-cache" />
-    <meta http-equiv="pragma" content="no-cache" />
-    <meta http-equiv="expires" content="-1" />
-
-
-    <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
-    <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet" />
-    <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script>
-    <link href="../css/asciidoctor/colony.css" rel="stylesheet">
-    <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-
-
-
-    <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
-    <!--[if lt IE 9]>
+    --> 
+  <!-- No caching headers --> 
+  <meta http-equiv="cache-control" content="no-cache"> 
+  <meta http-equiv="pragma" content="no-cache"> 
+  <meta http-equiv="expires" content="-1"> 
+  <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line --> 
+  <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet"> 
+  <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script> 
+  <link href="../css/asciidoctor/colony.css" rel="stylesheet"> 
+  <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet"> 
+  <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet"> 
+  <!--[if lt IE 9]>
       <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
-    <![endif]-->
-
-
-
-    <style type="text/css">
+    <![endif]--> 
+  <style type="text/css">
         pre code {
             background-color: inherit;
             border-style: none;
@@ -192,9 +180,8 @@ table.CodeRay td.code>pre{padding:0}
         color:#fff;
         font-size: 1.1em;
     }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         @media only screen and (min-width: 40.063em) {
           .top-bar {
             .contain-to-grid .top-bar {
@@ -205,9 +192,8 @@ table.CodeRay td.code>pre{padding:0}
         .row {
             max-width: 80rem;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .extended-quote,
         .extended-quote-first {
             margin-left: 40px;
@@ -231,9 +217,8 @@ table.CodeRay td.code>pre{padding:0}
             text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
         }
         
-    </style>
-
-    <style>
+    </style> 
+  <style>
         body {
           position: relative;
         }
@@ -255,6 +240,7 @@ table.CodeRay td.code>pre{padding:0}
 
         div#doc-content {
             margin-top: 30px;
+            padding-top: 30px;
         }
 
         div.documentation-page table.frame-all {
@@ -286,9 +272,8 @@ table.CodeRay td.code>pre{padding:0}
             min-height: 2000px;
         }
 
-    </style>
-
-    <style>
+    </style> 
+  <style>
 
         @media only screen and (min-width: 768px) {
           #toc.toc2 ul ul { margin-left: -10px; }
@@ -316,15 +301,13 @@ table.CodeRay td.code>pre{padding:0}
         body div#toc2 li.tocify-item.active a {
             color: red;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         footer {
             margin-top: 1000px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* overriding colony.css stylesheet */
         .literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
            /*padding: 1.25em 1.5625em 1.125em 1.5625em;*/
@@ -372,9 +355,8 @@ table.CodeRay td.code>pre{padding:0}
         .imageblock img {
             margin-bottom: 10px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* from http://ben.balter.com/2014/03/13/pages-anchor-links/ */
         .header-link {
           position: absolute;
@@ -395,9 +377,8 @@ table.CodeRay td.code>pre{padding:0}
         h6:hover .header-link {
           opacity: 1;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .top-bar
         {
             -webkit-transition-duration: .5s;
@@ -425,607 +406,505 @@ table.CodeRay td.code>pre{padding:0}
             -webkit-transition-property: -webkit-transform;
             transition-property: transform;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         #doc-content a.guide {
             color: white;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
+        .tocify {
+            margin-top: 80px;
+        }
+    </style> 
+  <style>
         .tocify {
             margin-top: 80px;
         }
-    </style>
-
-
-</script>
-
-</head>
-<body>
-
-<<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
-    <div class="github-fork-ribbon">
-        <a href="https://github.com/apache/isis#fork-destination-box">Fork me on GitHub</a>
-    </div>
-</div>
-
-
-<div class="row">
-
-    <div class="fixed contain-to-grid header">
-        <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
-            <ul class="title-area">
-                <li class="name">
-                    <h1>
-                        <a href="/index.html">Apache Isis&trade;</a>
-                    </h1>
-                </li>
-                <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
-                <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
-            </ul>
-
-            <section class="top-bar-section">
-                <ul class="right">
-
-                    <li class="has-form">
-                       <FORM class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
-                        <div class="row collapse">
-                            <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
-                            <INPUT type="hidden" name="cof" value="FORID:0">
-                            <INPUT class="form-control" name="q" type="text" placeholder="Search">
-                        </div>
-                    </FORM>
-                     </li>
-
-                </ul>
-
-                <!-- Left Nav Section -->
-                <ul class="left">
-
-                    <li><a href="/documentation.html">Documentation</a></li>
-                    <li><a href="/downloads.html">Downloads</a></li>
-                    <li><a href="/help.html">Help</a></li>
-                    <li><a href="/asf.html">@ASF</a></li>
-
-                </ul>
-
-            </section>
-        </nav>
-    </div>
-</div>
-
-<div class="row">
-
-    <div id="doc-content-left" class="large-9 medium-9 columns">
-
-
-        <div id="doc-content">
-          <div class="sect1">
-<h2 id="_ugvw">1. Restful Objects Viewer</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Apache Isis' Restful Objects viewer is an implementation of the <a href="http://restfulobjects.org">Restful Objects spec</a>,
-which defines a generic way to expose a domain model through a REST (or more precisely, hypermedia) API.  Having a REST
-API opens up an Apache Isis domain model to a huge variety of applications, from bespoke single-page apps,
-through integration scenarious, through providing an API for bulk-upload/migration from an existing system.</p>
-</div>
-<div class="paragraph">
-<p>The Restful Objects viewer also provides a number of extensions specific to Apache Isis.  Most significant of these is
-enhanced content negotiation support, making it easier to use the returned representations within bespoke clients using
-standard third-party configurations.</p>
-</div>
-<div class="paragraph">
-<p>This user guide discuss features, configuration and also how to extend the Restful Objects viewer.</p>
-</div>
-<div class="sect2">
-<h3 id="_other_guides">1.1. Other Guides</h3>
-<div class="paragraph">
-<p>Apache Isis documentation is broken out into a number of user, reference and "supporting procedures" guides.</p>
-</div>
-<div class="paragraph">
-<p>The user guides available are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="ugfun.html">Fundamentals</a></p>
-</li>
-<li>
-<p><a href="ugvw.html">Wicket viewer</a></p>
-</li>
-<li>
-<p><a href="#">Restful Objects viewer</a> (this guide)</p>
-</li>
-<li>
-<p><a href="ugdno.html">DataNucleus object store</a></p>
-</li>
-<li>
-<p><a href="ugsec.html">Security</a></p>
-</li>
-<li>
-<p><a href="ugtst.html">Testing</a></p>
-</li>
-<li>
-<p><a href="ugbtb.html">Beyond the Basics</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The reference guides are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="rgant.html">Annotations</a></p>
-</li>
-<li>
-<p><a href="rgsvc.html">Domain Services</a></p>
-</li>
-<li>
-<p><a href="rgcfg.html">Configuration Properties</a></p>
-</li>
-<li>
-<p><a href="rgcms.html">Classes, Methods and Schema</a></p>
-</li>
-<li>
-<p><a href="rgmvn.html">Apache Isis Maven plugin</a></p>
-</li>
-<li>
-<p><a href="rgfis.html">Framework Internal Services</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The remaining guides are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="dg.html">Developers' Guide</a> (how to set up a development environment
-for Apache Isis and contribute back to the project)</p>
-</li>
-<li>
-<p><a href="cgcom.html">Committers' Guide</a> (release procedures and related practices)</p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_ugvro_ro-spec">2. RO Specification</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>The Restful Objects v1.0 specification defines a comprehensive hypermedia API, consisting of HTTP resources and
-corresponding JSON representations, for accessing and manipulating a domain object model.</p>
-</div>
-<div class="paragraph">
-<p>The Restful Objects spec can be downloaded from <a href="http://restfulobjects.org">here</a> as either a PDF or Word doc.</p>
-</div>
-<div class="sect2">
-<h3 id="_ugvro_ro-spec_goals">2.1. Goals of the Spec</h3>
-<div class="paragraph">
-<p>The goal of Restful Objects is to allow domain models to be accessed through HTTP resources, returning a set of JSON
-representations. These representations can then be consumed by any client (e.g. Javascript, Java, .NET, Ruby, Python).</p>
-</div>
-<div class="paragraph">
-<p>Both the resources and representations are generalized so that they can be applied to any domain model, and by default
-all representations have media types designed to allow a completely generic client to be written, capable of working,
-unmodified, with any domain model that has a Restful Objects interface.</p>
-</div>
-<div class="paragraph">
-<p>Alternatively, the developer may write a custom client that has some shared knowledge of the domain being exposed, and
-render the information in a more specific fashion.</p>
-</div>
-<div class="paragraph">
-<p>Restful Objects also defines that representations are served up with parameterized media types. This allows clients to
-use content negotiation to ensure that representations do not change in a breaking fashion, enabling server and client
-to evolve independently.</p>
-</div>
-<div class="paragraph">
-<p>The Restful Objects specification is at a higher-level of abstraction than, say, the JAX-RS specifications for Java
-platform, or the WCF specifications on .NET. Specifically, the domain classes that it exposes are represented in a very
-general form. They consist of:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>properties (fields), each holding either a scalar value or reference to another object;</p>
-</li>
-<li>
-<p>collections, each holding a vector reference to other entities;</p>
-</li>
-<li>
-<p>actions (operations/methods), whereby the object can execute business logic.</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>Beyond this, though, Restful Objects makes very few assumptions. In particular, Restful Objects does not prescribe the
-nature of the domain model.</p>
-</div>
-<div class="paragraph">
-<p>The Restful Objects spec may be downloaded directly from github as either a PDF or as a Word doc.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_resources_and_representations">2.2. Resources and Representations</h3>
-<div class="paragraph">
-<p>The diagram below - taken from the Restful Objects spec - shows the various resources (URLs) and representations (JSON)
-that are defined:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/restfulobjects/ro-spec-resources-and-representations.png"><img src="images/restfulobjects/ro-spec-resources-and-representations.png" alt="ro spec resources and representations" width="800px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>The resource URLs are always well-defined, but Apache Isis' implementation allows for different representations to
-be returned, using content negotiation.  This is discussed further below.</p>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>In fact, there&#8217;s nothing in Apache Isis to prevent you from defining your own REST controllers to provide custom
-resource URLs.  One use case might be to support user registration/authentication, a topic out-of-scope of the RO spec
-itself.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_ugvro_ro-spec_apache-isis-implementation">2.3. Apache Isis' implementation</h3>
-<div class="paragraph">
-<p>The Restful Objects viewer is Apache Isis' implementation of the Restful Objects spec.  It implements all the mandatory
-features of the specification.  It also implements some of the optional capabilities (as defined in section 3 of the
-RO spec, and as represented in the version resource, section 8.1):</p>
-</div>
-<table class="tableblock frame-all grid-all spread">
-<colgroup>
-<col style="width: 33.3333%;">
-<col style="width: 33.3333%;">
-<col style="width: 33.3334%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">Capability</th>
-<th class="tableblock halign-left valign-top">Support</th>
-<th class="tableblock halign-left valign-top">Notes</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>blobsClobs</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>yes</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>deleteObjects</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>yes</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>domainModel</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>formal</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>The 'simple' scheme is <em>not</em> supported</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>validateOnly</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>yes</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>protoPersistentObjects</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>yes</p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-</tbody>
-</table>
-</div>
-<div class="sect2">
-<h3 id="_ugvro_ro-spec_extensions">2.4. Extensions</h3>
-<div class="paragraph">
-<p>The Restful Objects viewer also implements some of the "future ideas" that are out of scope for the RO spec v1.0, but
-described in section 34, "ideas for future extensions".</p>
-</div>
-<div class="sect3">
-<h4 id="_ugvro_ro-spec_extensions_content-negotiation">2.4.1. Content Negotiation (34.1)</h4>
-<div class="paragraph">
-<p>Apache Isis provides two levels of support for content negotiation.</p>
-</div>
-<div class="sect4">
-<h5 id="_ugvro_ro-spec_extensions_content-negotiation_x-ro-domain-type"><code>x-ro-domain-type</code></h5>
-<div class="paragraph">
-<p>The first level is very similar to the "Domain Model Agnostic" approach sketched out in the RO spec.  The client
-can send an <code>x-ro-domain-type</code> parameter for either domain object representations (section 14 of the spec) or
-action invocation results (section 19 of the spec).  This can be combined with either <code>application/json</code> or
-<code>application/xml</code>.</p>
-</div>
-<div class="paragraph">
-<p>For example, the client could use an <code>Accept</code> header such as:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code>Accept: application/xml;x-ro-domain-type="com.mycompany.viewmodels.v2.CustomerViewModel"</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>The server will use the <a href="rgsvc.html#_rgsvc_spi_ContentMappingService"><code>ContentMappingService</code></a> to attempt to
-transform the domain object into the requested <code>x-ro-domain-type</code>.  The whole process is discussed in more detail in
-the <a href="#_ugvro_architecture">architecture</a> chapter.</p>
-</div>
-</div>
-<div class="sect4">
-<h5 id="_ugvro_ro-spec_extensions_content-negotiation_apache-isis-profile">Apache Isis profile</h5>
-<div class="paragraph">
-<p>The representations defined by the RO spec are very rich and enable complex client-side applications to be built.
-However, their sophistication can be an impediment to their use if one wishes to write a simple app using third-party
-components that expect to consume much simpler representations.  Examples of such tools are
-<a href="http://angular-ui.github.io/bootstrap/">Angular Bootstrap</a>,
-<a href="http://vitalets.github.io/angular-xeditable/">Angular XEditable</a>,
-<a href="https://github.com/mgcrea/angular-strap">Angular Strap</a>.</p>
-</div>
-<div class="paragraph">
-<p>This support is discussed further in the <a href="#_ugvro_simplified-representations">simplified representations</a>
-chapter.</p>
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_ugvro_ro-spec_extensions_minimizing-round-trips">2.4.2. Minimizing Round-trips (34.4)</h4>
-<div class="paragraph">
-<p>The Restful Objects viewer supports the <code>x-ro-follow-links</code> query parameter in a way very similar to that suggested
-in the RO spec, the main point being to avoid the "N+1" problem of too many (slow) network calls.  For example, using
-this feature one can load a grid of data in a single call.  (That said, the <a href="#_ugvro_simplified-representations">simplified representations</a>
-supported by Restful Objects viewer also support this use case, albeit in way that deviates from the RO spec).</p>
-</div>
-<div class="paragraph">
-<p>This <a href="https://www.youtube.com/watch?v=hSKnqqBQ7Zo">screencast</a> demonstrates the Restful Object viewer&#8217;s support for <code>x-ro-follow-links</code> parameter, using the
-(non-ASF) <a href="http://github.com/isisaddons/isis-app-kitchensink">Isis addons' kitchensink</a> app as the example,
-This app contains three entities, <code>Grandparent</code>, <code>Parent</code> and <code>Child</code> that define a hierarchy of 1:m relationships.</p>
-</div>
-<div class="paragraph">
-<p>The queries that are shown in the screencast include:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>show parent and its children (titles)<br></p>
-<div class="paragraph">
-<p><pre>http://localhost:8080/restful/objects/PARENT/0?x-ro-follow-links=members[children].value</p>
-</div>
-</li>
-<li>
-<p>show parent and its children (full details)<br></p>
-<div class="paragraph">
-<p><pre>http://localhost:8080/restful/objects/PARENT/0?x-ro-follow-links=members[children].value.href</p>
-</div>
-</li>
-<li>
-<p>child&#8217;s parent (title)<br></p>
-<div class="paragraph">
-<p><pre>http://localhost:8080/restful/objects/CHILD/0?x-ro-follow-links=members[parent].value</p>
-</div>
-</li>
-<li>
-<p>child&#8217;s siblings (up to its parent, down to children)<br></p>
-<div class="paragraph">
-<p><pre>http://localhost:8080/restful/objects/CHILD/0?x-ro-follow-links=members[parent].value.members[children].value</p>
-</div>
-</li>
-</ul>
-</div>
-<div class="sect4">
-<h5 id="_ugvro_ro-spec_extensions_minimizing-round-trips_honor-ui-hints">Honor UI hints</h5>
-<div class="paragraph">
-<p>By default the representations generated by Restful Objects ignore any Apache Isis metamodel hints referring to the UI.
-In particular, if a collection is annotated then <code>Render(EAGERLY)</code> then the contents of the collection are <em>not</em>
-eagerly embedded in the object representation.</p>
-</div>
-<div class="paragraph">
-<p>However, this behaviour can be overridden globally using following property (typically added to <code>WEB-INF/viewer_restfulobjects.properties</code>):</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="ini">isis.viewer.restfulobjects.honorUiHints=true</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>This means that standard Apache Isis annotations can be used as a simple way to obtain follow-links (driven from the
-server model, though, rather than the requesting client).</p>
-</div>
-</div>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_ugvro_architecture">3. Architecture</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>The <a href="#">RestfulObjects viewer</a> implements the <a href="http://restfulobjects.org">Restful Object spec</a>, meaning
-that it defines a well-defined set of endpoint URLs as resources, and generates a well-defined set of (JSON)
-representations when these resources are accessed.</p>
-</div>
-<div class="paragraph">
-<p>By default, the Restful Objects viewer will automatically handle requests and return representations according to the
-RO spec.  However, its internal architecture provides several hooks for content negotiation, thereby allowing the
-generated representation to be influenced using the standard HTTP <code>Accept</code> header.  In response, the server uses
-the <code>Content-Type</code> header which the client can use to know how to process the returned representation.</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><code>RepresentationService</code><br></p>
-<div class="paragraph">
-<p>The <a href="rgfis.html#_rgfis_spi_RepresentationService"><code>RepresentationService</code></a> is an SPI domain service (plugin-point)
-that allows an arbitrary representation to be generated for any of the resources defined in the RO spec.<br></p>
-</div>
-<div class="paragraph">
-<p>Normally this SPI service need not be replaced, because the default implementation
-(<code>RepresentationServiceContentNegotiator</code>) simply uses the HTTP <code>Accept</code> header and delegates onto another service, the
-(slightly misnamed) <code>ContentNegotiationService</code>, to actually generate the representation.  There can be multiple
-implementations of the <code>ContentNegotiationService</code> and the content negotiator will delegate to each in turn until one
-is able to handle the request (per the chain of responsibliity pattern).</p>
-</div>
-</li>
-<li>
-<p><code>ContentNegotiationService</code><br></p>
-<div class="paragraph">
-<p>As noted above, there can be multiple implementations of the
-<a href="rgfis.html#_rgfis_spi_ContentNegotiationService"><code>ContentNegotiationService</code></a>, each one handling a particular
-HTTP <code>Accept</code> header.  If the implementation does not recognize the value of the header, if can simply return <code>null</code>.<br></p>
-</div>
-<div class="paragraph">
-<p>The framework provides a number of implementations; an implementation that handles the
-<a href="#_ugvro_simplified-representations">simplified representation</a> of the Apache Isis profile; an implementation that provides support for the <code>x-ro-domain-type</code> parameter, and a
-default/fallback implementation that returns the representations defined by the RO spec.</p>
-</div>
-</li>
-<li>
-<p><code>ContentMappingService</code><br></p>
-<div class="paragraph">
-<p>The <a href="rgsvc.html#_rgsvc_spi_ContentMappingService"><code>ContentMappingService</code></a> is used by the implementation of
-<code>ContentNegotationService</code> that recognizes the <code>x-ro-domain-type</code>, its role being to transform a domain object
-(usually an entity) into some other form (usually a DTO), as specified by the <code>x-ro-domain-type</code> parameter.  There
-can be many such implementations, each handling a different target domain type.</p>
-</div>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>This diagram shows how these services collaborate:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/reference-services-spi/RepresentationService/service-collaborations.png"><img src="images/reference-services-spi/RepresentationService/service-collaborations.png" alt="service collaborations" width="800px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>Taken together these domain services offer a lot of flexibility in terms of the representations that can be generated
-from the RestfulObjects viewer.</p>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_ugvro_simplified-representations">4. Simplified Representations</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>The representations defined by the RO spec are very rich and enable complex client-side applications to be built.
-However, their sophistication can be an impediment to their use if one wishes to write a simple app using third-party
-components that expect to consume much simpler representations.  Examples of such tools are
-<a href="http://angular-ui.github.io/bootstrap/">Angular Bootstrap</a>,
-<a href="http://vitalets.github.io/angular-xeditable/">Angular XEditable</a>,
-<a href="https://github.com/mgcrea/angular-strap">Angular Strap</a>.</p>
-</div>
-<div class="paragraph">
-<p>As of <code>1.11.0</code>, Apache Isis provides support for its own simplified representation for the most commonly-used
-representations.  This is implemented using the <code>ContentNegotiationService</code> described in the
-<a href="#_ugvro_architecture">architecture</a> chapter.</p>
-</div>
-<div class="sect2">
-<h3 id="_ugvro_simplified-representations_apache-isis-profile">4.1. The Apache Isis "Profile"</h3>
-<div class="paragraph">
-<p>The RO spec uses the standard <code>Accept</code> header for content negotiation, and defines its own "profile" for the standard
-representations; these take the form:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code>Accept: application/json;profile="urn:org.restfulobjects:repr-types/xxx"</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>where "xxx" varies by resource.  The detail can be found in section 2.4.1 of the RO spec.</p>
-</div>
-<div class="paragraph">
-<p>The Apache Isis viewer also defines its own "Isis" profile which enables the client to request simplified
-representations for the most frequently accessed resources.  This is done by specifying an <code>Accept</code> header of:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code>Accept: application/json;profile="urn:org.apache.isis/v1"</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Not every resource supports this header, but the most commonly accessed ones do.  In each case the server will set the
-<code>Content-Type</code> header so that the client knows how to process the representation.</p>
-</div>
-<div class="paragraph">
-<p>The <a href="https://www.youtube.com/watch?v=HMSqapQDY_4">screencast</a> demonstrates the feature.</p>
-</div>
-<div class="paragraph">
-<p>The sections below explain in a little more detail what is returned when this profile is activated.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_ugvro_simplified-representations_domain-object">4.2. Domain Object</h3>
-<div class="paragraph">
-<p>If a domain object resource (section 14) is accessed with the Apache Isis profile, the resultant representation is a
-JSON object with simple key/value pairs for each property.</p>
-</div>
-<div class="paragraph">
-<p>The contents of any collections are also eagerly returned, consisting of an array of elements of each referenced
-object.  Each such element contains key/value pairs of each property (in other words, a grid of data is returned).
-Each element also has a special <code>href` property (so that the client can easily navigate to a resource for that
-object) and a `title</code> property (to use as a label, eg the hyperlink text).</p>
-</div>
-<div class="paragraph">
-<p>In addition, the representation defined by the RO spec is also included, under a special <code>$$ro</code> property.</p>
-</div>
-<div class="paragraph">
-<p>For example, using the (non-ASF) <a href="http://github.com/isisaddons/isis-app-todoapp">Isis addons' todoapp</a>, accessing
-this resource:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code>http://localhost:8080/restful/objects/TODO/45</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>with an <code>Accept</code> request header of:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code>Accept: application/json;profile="urn:org.apache.isis/v1"</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>returns the following representation:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code>{
+    </style>  
+ </head> 
+ <body> 
+  <div class="row"> 
+   <div class="fixed contain-to-grid header"> 
+    <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem"> 
+     <ul class="title-area"> 
+      <li class="name"> <h1> <a href="/index.html">Apache Isis\u2122</a> </h1> </li> 
+      <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone --> 
+      <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li> 
+     </ul> 
+     <section class="top-bar-section"> 
+      <ul class="right"> 
+       <li class="has-form"> 
+        <form class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse"> 
+         <div class="row collapse"> 
+          <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya"> 
+          <input type="hidden" name="cof" value="FORID:0"> 
+          <input class="form-control" name="q" type="text" placeholder="Search"> 
+         </div> 
+        </form> </li> 
+      </ul> 
+      <!-- Left Nav Section --> 
+      <ul class="left"> 
+       <li><a href="/documentation.html">Documentation</a></li> 
+       <li><a href="/downloads.html">Downloads</a></li> 
+       <li><a href="/help.html">Help</a></li> 
+       <li><a href="/asf.html">@ASF</a></li> 
+      </ul> 
+     </section> 
+    </nav> 
+   </div> 
+  </div> 
+  <div class="row"> 
+   <div id="doc-content-left" class="large-9 medium-9 columns"> 
+    <div id="doc-content">
+     <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/ugvro.adoc&quot;" style="float: right; font-size: small; padding: 6px;  "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+     <div class="sect1"> 
+      <h2 id="_ugvw">1. Restful Objects Viewer</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_ugvw.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>Apache Isis' Restful Objects viewer is an implementation of the <a href="http://restfulobjects.org">Restful Objects spec</a>, which defines a generic way to expose a domain model through a REST (or more precisely, hypermedia) API. Having a REST API opens up an Apache Isis domain model to a huge variety of applications, from bespoke single-page apps, through integration scenarious, through providing an API for bulk-upload/migration from an existing system.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>The Restful Objects viewer also provides a number of extensions specific to Apache Isis. Most significant of these is enhanced content negotiation support, making it easier to use the returned representations within bespoke clients using standard third-party configurations.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>This user guide discuss features, configuration and also how to extend the Restful Objects viewer.</p> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_other_guides">1.1. Other Guides</h3> 
+        <div class="paragraph"> 
+         <p>Apache Isis documentation is broken out into a number of user, reference and "supporting procedures" guides.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The user guides available are:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><a href="ugfun.html">Fundamentals</a></p> </li> 
+          <li> <p><a href="ugvw.html">Wicket viewer</a></p> </li> 
+          <li> <p><a href="#">Restful Objects viewer</a> (this guide)</p> </li> 
+          <li> <p><a href="ugdno.html">DataNucleus object store</a></p> </li> 
+          <li> <p><a href="ugsec.html">Security</a></p> </li> 
+          <li> <p><a href="ugtst.html">Testing</a></p> </li> 
+          <li> <p><a href="ugbtb.html">Beyond the Basics</a></p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The reference guides are:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><a href="rgant.html">Annotations</a></p> </li> 
+          <li> <p><a href="rgsvc.html">Domain Services</a></p> </li> 
+          <li> <p><a href="rgcfg.html">Configuration Properties</a></p> </li> 
+          <li> <p><a href="rgcms.html">Classes, Methods and Schema</a></p> </li> 
+          <li> <p><a href="rgmvn.html">Apache Isis Maven plugin</a></p> </li> 
+          <li> <p><a href="rgfis.html">Framework Internal Services</a></p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The remaining guides are:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><a href="dg.html">Developers' Guide</a> (how to set up a development environment for Apache Isis and contribute back to the project)</p> </li> 
+          <li> <p><a href="cgcom.html">Committers' Guide</a> (release procedures and related practices)</p> </li> 
+         </ul> 
+        </div> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_ugvro_ro-spec">2. RO Specification</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_ugvro_ro-spec.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>The Restful Objects v1.0 specification defines a comprehensive hypermedia API, consisting of HTTP resources and corresponding JSON representations, for accessing and manipulating a domain object model.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>The Restful Objects spec can be downloaded from <a href="http://restfulobjects.org">here</a> as either a PDF or Word doc.</p> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_ugvro_ro-spec_goals">2.1. Goals of the Spec</h3> 
+        <div class="paragraph"> 
+         <p>The goal of Restful Objects is to allow domain models to be accessed through HTTP resources, returning a set of JSON representations. These representations can then be consumed by any client (e.g. Javascript, Java, .NET, Ruby, Python).</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Both the resources and representations are generalized so that they can be applied to any domain model, and by default all representations have media types designed to allow a completely generic client to be written, capable of working, unmodified, with any domain model that has a Restful Objects interface.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Alternatively, the developer may write a custom client that has some shared knowledge of the domain being exposed, and render the information in a more specific fashion.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Restful Objects also defines that representations are served up with parameterized media types. This allows clients to use content negotiation to ensure that representations do not change in a breaking fashion, enabling server and client to evolve independently.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The Restful Objects specification is at a higher-level of abstraction than, say, the JAX-RS specifications for Java platform, or the WCF specifications on .NET. Specifically, the domain classes that it exposes are represented in a very general form. They consist of:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p>properties (fields), each holding either a scalar value or reference to another object;</p> </li> 
+          <li> <p>collections, each holding a vector reference to other entities;</p> </li> 
+          <li> <p>actions (operations/methods), whereby the object can execute business logic.</p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Beyond this, though, Restful Objects makes very few assumptions. In particular, Restful Objects does not prescribe the nature of the domain model.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The Restful Objects spec may be downloaded directly from github as either a PDF or as a Word doc.</p> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_resources_and_representations">2.2. Resources and Representations</h3> 
+        <div class="paragraph"> 
+         <p>The diagram below - taken from the Restful Objects spec - shows the various resources (URLs) and representations (JSON) that are defined:</p> 
+        </div> 
+        <div class="imageblock"> 
+         <div class="content"> 
+          <a class="image" href="images/restfulobjects/ro-spec-resources-and-representations.png"><img src="images/restfulobjects/ro-spec-resources-and-representations.png" alt="ro spec resources and representations" width="800px"></a> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The resource URLs are always well-defined, but Apache Isis' implementation allows for different representations to be returned, using content negotiation. This is discussed further below.</p> 
+        </div> 
+        <div class="admonitionblock note"> 
+         <table> 
+          <tbody>
+           <tr> 
+            <td class="icon"> <i class="fa icon-note" title="Note"></i> </td> 
+            <td class="content"> 
+             <div class="paragraph"> 
+              <p>In fact, there\u2019s nothing in Apache Isis to prevent you from defining your own REST controllers to provide custom resource URLs. One use case might be to support user registration/authentication, a topic out-of-scope of the RO spec itself.</p> 
+             </div> </td> 
+           </tr> 
+          </tbody>
+         </table> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_ugvro_ro-spec_apache-isis-implementation">2.3. Apache Isis' implementation</h3> 
+        <div class="paragraph"> 
+         <p>The Restful Objects viewer is Apache Isis' implementation of the Restful Objects spec. It implements all the mandatory features of the specification. It also implements some of the optional capabilities (as defined in section 3 of the RO spec, and as represented in the version resource, section 8.1):</p> 
+        </div> 
+        <table class="tableblock frame-all grid-all spread"> 
+         <colgroup> 
+          <col style="width: 33.3333%;"> 
+          <col style="width: 33.3333%;"> 
+          <col style="width: 33.3334%;"> 
+         </colgroup> 
+         <thead> 
+          <tr> 
+           <th class="tableblock halign-left valign-top">Capability</th> 
+           <th class="tableblock halign-left valign-top">Support</th> 
+           <th class="tableblock halign-left valign-top">Notes</th> 
+          </tr> 
+         </thead> 
+         <tbody> 
+          <tr> 
+           <td class="tableblock halign-left valign-top">
+            <div>
+             <div class="paragraph"> 
+              <p>blobsClobs</p> 
+             </div>
+            </div></td> 
+           <td class="tableblock halign-left valign-top">
+            <div>
+             <div class="paragraph"> 
+              <p>yes</p> 
+             </div>
+            </div></td> 
+           <td class="tableblock halign-left valign-top">
+            <div></div></td> 
+          </tr> 
+          <tr> 
+           <td class="tableblock halign-left valign-top">
+            <div>
+             <div class="paragraph"> 
+              <p>deleteObjects</p> 
+             </div>
+            </div></td> 
+           <td class="tableblock halign-left valign-top">
+            <div>
+             <div class="paragraph"> 
+              <p>yes</p> 
+             </div>
+            </div></td> 
+           <td class="tableblock halign-left valign-top">
+            <div></div></td> 
+          </tr> 
+          <tr> 
+           <td class="tableblock halign-left valign-top">
+            <div>
+             <div class="paragraph"> 
+              <p>domainModel</p> 
+             </div>
+            </div></td> 
+           <td class="tableblock halign-left valign-top">
+            <div>
+             <div class="paragraph"> 
+              <p>formal</p> 
+             </div>
+            </div></td> 
+           <td class="tableblock halign-left valign-top">
+            <div>
+             <div class="paragraph"> 
+              <p>The 'simple' scheme is <em>not</em> supported</p> 
+             </div>
+            </div></td> 
+          </tr> 
+          <tr> 
+           <td class="tableblock halign-left valign-top">
+            <div>
+             <div class="paragraph"> 
+              <p>validateOnly</p> 
+             </div>
+            </div></td> 
+           <td class="tableblock halign-left valign-top">
+            <div>
+             <div class="paragraph"> 
+              <p>yes</p> 
+             </div>
+            </div></td> 
+           <td class="tableblock halign-left valign-top">
+            <div></div></td> 
+          </tr> 
+          <tr> 
+           <td class="tableblock halign-left valign-top">
+            <div>
+             <div class="paragraph"> 
+              <p>protoPersistentObjects</p> 
+             </div>
+            </div></td> 
+           <td class="tableblock halign-left valign-top">
+            <div>
+             <div class="paragraph"> 
+              <p>yes</p> 
+             </div>
+            </div></td> 
+           <td class="tableblock halign-left valign-top">
+            <div></div></td> 
+          </tr> 
+         </tbody> 
+        </table> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_ugvro_ro-spec_extensions">2.4. Extensions</h3> 
+        <div class="paragraph"> 
+         <p>The Restful Objects viewer also implements some of the "future ideas" that are out of scope for the RO spec v1.0, but described in section 34, "ideas for future extensions".</p> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_ugvro_ro-spec_extensions_content-negotiation">2.4.1. Content Negotiation (34.1)</h4> 
+         <div class="paragraph"> 
+          <p>Apache Isis provides two levels of support for content negotiation.</p> 
+         </div> 
+         <div class="sect4"> 
+          <h5 id="_ugvro_ro-spec_extensions_content-negotiation_x-ro-domain-type"><code>x-ro-domain-type</code></h5> 
+          <div class="paragraph"> 
+           <p>The first level is very similar to the "Domain Model Agnostic" approach sketched out in the RO spec. The client can send an <code>x-ro-domain-type</code> parameter for either domain object representations (section 14 of the spec) or action invocation results (section 19 of the spec). This can be combined with either <code>application/json</code> or <code>application/xml</code>.</p> 
+          </div> 
+          <div class="paragraph"> 
+           <p>For example, the client could use an <code>Accept</code> header such as:</p> 
+          </div> 
+          <div class="listingblock"> 
+           <div class="content"> 
+            <pre class="CodeRay highlight"><code>Accept: application/xml;x-ro-domain-type="com.mycompany.viewmodels.v2.CustomerViewModel"</code></pre> 
+           </div> 
+          </div> 
+          <div class="paragraph"> 
+           <p>The server will use the <a href="rgsvc.html#_rgsvc_spi_ContentMappingService"><code>ContentMappingService</code></a> to attempt to transform the domain object into the requested <code>x-ro-domain-type</code>. The whole process is discussed in more detail in the <a href="#_ugvro_architecture">architecture</a> chapter.</p> 
+          </div> 
+         </div> 
+         <div class="sect4"> 
+          <h5 id="_ugvro_ro-spec_extensions_content-negotiation_apache-isis-profile">Apache Isis profile</h5> 
+          <div class="paragraph"> 
+           <p>The representations defined by the RO spec are very rich and enable complex client-side applications to be built. However, their sophistication can be an impediment to their use if one wishes to write a simple app using third-party components that expect to consume much simpler representations. Examples of such tools are <a href="http://angular-ui.github.io/bootstrap/">Angular Bootstrap</a>, <a href="http://vitalets.github.io/angular-xeditable/">Angular XEditable</a>, <a href="https://github.com/mgcrea/angular-strap">Angular Strap</a>.</p> 
+          </div> 
+          <div class="paragraph"> 
+           <p>This support is discussed further in the <a href="#_ugvro_simplified-representations">simplified representations</a> chapter.</p> 
+          </div> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_ugvro_ro-spec_extensions_minimizing-round-trips">2.4.2. Minimizing Round-trips (34.4)</h4> 
+         <div class="paragraph"> 
+          <p>The Restful Objects viewer supports the <code>x-ro-follow-links</code> query parameter in a way very similar to that suggested in the RO spec, the main point being to avoid the "N+1" problem of too many (slow) network calls. For example, using this feature one can load a grid of data in a single call. (That said, the <a href="#_ugvro_simplified-representations">simplified representations</a> supported by Restful Objects viewer also support this use case, albeit in way that deviates from the RO spec).</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>This <a href="https://www.youtube.com/watch?v=hSKnqqBQ7Zo">screencast</a> demonstrates the Restful Object viewer\u2019s support for <code>x-ro-follow-links</code> parameter, using the (non-ASF) <a href="http://github.com/isisaddons/isis-app-kitchensink">Isis addons' kitchensink</a> app as the example, This app contains three entities, <code>Grandparent</code>, <code>Parent</code> and <code>Child</code> that define a hierarchy of 1:m relationships.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>The queries that are shown in the screencast include:</p> 
+         </div> 
+         <div class="ulist"> 
+          <ul> 
+           <li> <p>show parent and its children (titles)<br></p> 
+            <div class="paragraph"> 
+             <p></p>
+             <pre>http://localhost:8080/restful/objects/PARENT/0?x-ro-follow-links=members[children].value<p></p>
+</pre>
+            </div> </li> 
+           <li> <p>show parent and its children (full details)<br></p> 
+            <div class="paragraph"> 
+             <p></p>
+             <pre>http://localhost:8080/restful/objects/PARENT/0?x-ro-follow-links=members[children].value.href<p></p>
+</pre>
+            </div> </li> 
+           <li> <p>child\u2019s parent (title)<br></p> 
+            <div class="paragraph"> 
+             <p></p>
+             <pre>http://localhost:8080/restful/objects/CHILD/0?x-ro-follow-links=members[parent].value<p></p>
+</pre>
+            </div> </li> 
+           <li> <p>child\u2019s siblings (up to its parent, down to children)<br></p> 
+            <div class="paragraph"> 
+             <p></p>
+             <pre>http://localhost:8080/restful/objects/CHILD/0?x-ro-follow-links=members[parent].value.members[children].value<p></p>
+</pre>
+            </div> </li> 
+          </ul> 
+         </div> 
+         <div class="sect4"> 
+          <h5 id="_ugvro_ro-spec_extensions_minimizing-round-trips_honor-ui-hints">Honor UI hints</h5> 
+          <div class="paragraph"> 
+           <p>By default the representations generated by Restful Objects ignore any Apache Isis metamodel hints referring to the UI. In particular, if a collection is annotated then <code>Render(EAGERLY)</code> then the contents of the collection are <em>not</em> eagerly embedded in the object representation.</p> 
+          </div> 
+          <div class="paragraph"> 
+           <p>However, this behaviour can be overridden globally using following property (typically added to <code>WEB-INF/viewer_restfulobjects.properties</code>):</p> 
+          </div> 
+          <div class="listingblock"> 
+           <div class="content"> 
+            <pre class="CodeRay highlight"><code data-lang="ini">isis.viewer.restfulobjects.honorUiHints=true</code></pre> 
+           </div> 
+          </div> 
+          <div class="paragraph"> 
+           <p>This means that standard Apache Isis annotations can be used as a simple way to obtain follow-links (driven from the server model, though, rather than the requesting client).</p> 
+          </div> 
+         </div> 
+        </div> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_ugvro_architecture">3. Architecture</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_ugvro_architecture.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>The <a href="#">RestfulObjects viewer</a> implements the <a href="http://restfulobjects.org">Restful Object spec</a>, meaning that it defines a well-defined set of endpoint URLs as resources, and generates a well-defined set of (JSON) representations when these resources are accessed.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>By default, the Restful Objects viewer will automatically handle requests and return representations according to the RO spec. However, its internal architecture provides several hooks for content negotiation, thereby allowing the generated representation to be influenced using the standard HTTP <code>Accept</code> header. In response, the server uses the <code>Content-Type</code> header which the client can use to know how to process the returned representation.</p> 
+       </div> 
+       <div class="ulist"> 
+        <ul> 
+         <li> <p><code>RepresentationService</code><br></p> 
+          <div class="paragraph"> 
+           <p>The <a href="rgfis.html#_rgfis_spi_RepresentationService"><code>RepresentationService</code></a> is an SPI domain service (plugin-point) that allows an arbitrary representation to be generated for any of the resources defined in the RO spec.<br></p> 
+          </div> 
+          <div class="paragraph"> 
+           <p>Normally this SPI service need not be replaced, because the default implementation (<code>RepresentationServiceContentNegotiator</code>) simply uses the HTTP <code>Accept</code> header and delegates onto another service, the (slightly misnamed) <code>ContentNegotiationService</code>, to actually generate the representation. There can be multiple implementations of the <code>ContentNegotiationService</code> and the content negotiator will delegate to each in turn until one is able to handle the request (per the chain of responsibliity pattern).</p> 
+          </div> </li> 
+         <li> <p><code>ContentNegotiationService</code><br></p> 
+          <div class="paragraph"> 
+           <p>As noted above, there can be multiple implementations of the <a href="rgfis.html#_rgfis_spi_ContentNegotiationService"><code>ContentNegotiationService</code></a>, each one handling a particular HTTP <code>Accept</code> header. If the implementation does not recognize the value of the header, if can simply return <code>null</code>.<br></p> 
+          </div> 
+          <div class="paragraph"> 
+           <p>The framework provides a number of implementations; an implementation that handles the <a href="#_ugvro_simplified-representations">simplified representation</a> of the Apache Isis profile; an implementation that provides support for the <code>x-ro-domain-type</code> parameter, and a default/fallback implementation that returns the representations defined by the RO spec.</p> 
+          </div> </li> 
+         <li> <p><code>ContentMappingService</code><br></p> 
+          <div class="paragraph"> 
+           <p>The <a href="rgsvc.html#_rgsvc_spi_ContentMappingService"><code>ContentMappingService</code></a> is used by the implementation of <code>ContentNegotationService</code> that recognizes the <code>x-ro-domain-type</code>, its role being to transform a domain object (usually an entity) into some other form (usually a DTO), as specified by the <code>x-ro-domain-type</code> parameter. There can be many such implementations, each handling a different target domain type.</p> 
+          </div> </li> 
+        </ul> 
+       </div> 
+       <div class="paragraph"> 
+        <p>This diagram shows how these services collaborate:</p> 
+       </div> 
+       <div class="imageblock"> 
+        <div class="content"> 
+         <a class="image" href="images/reference-services-spi/RepresentationService/service-collaborations.png"><img src="images/reference-services-spi/RepresentationService/service-collaborations.png" alt="service collaborations" width="800px"></a> 
+        </div> 
+       </div> 
+       <div class="paragraph"> 
+        <p>Taken together these domain services offer a lot of flexibility in terms of the representations that can be generated from the RestfulObjects viewer.</p> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_ugvro_simplified-representations">4. Simplified Representations</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_ugvro_simplified-representations.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>The representations defined by the RO spec are very rich and enable complex client-side applications to be built. However, their sophistication can be an impediment to their use if one wishes to write a simple app using third-party components that expect to consume much simpler representations. Examples of such tools are <a href="http://angular-ui.github.io/bootstrap/">Angular Bootstrap</a>, <a href="http://vitalets.github.io/angular-xeditable/">Angular XEditable</a>, <a href="https://github.com/mgcrea/angular-strap">Angular Strap</a>.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>As of <code>1.11.0</code>, Apache Isis provides support for its own simplified representation for the most commonly-used representations. This is implemented using the <code>ContentNegotiationService</code> described in the <a href="#_ugvro_architecture">architecture</a> chapter.</p> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_ugvro_simplified-representations_apache-isis-profile">4.1. The Apache Isis "Profile"</h3> 
+        <div class="paragraph"> 
+         <p>The RO spec uses the standard <code>Accept</code> header for content negotiation, and defines its own "profile" for the standard representations; these take the form:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code>Accept: application/json;profile="urn:org.restfulobjects:repr-types/xxx"</code></pre> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>where "xxx" varies by resource. The detail can be found in section 2.4.1 of the RO spec.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The Apache Isis viewer also defines its own "Isis" profile which enables the client to request simplified representations for the most frequently accessed resources. This is done by specifying an <code>Accept</code> header of:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code>Accept: application/json;profile="urn:org.apache.isis/v1"</code></pre> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Not every resource supports this header, but the most commonly accessed ones do. In each case the server will set the <code>Content-Type</code> header so that the client knows how to process the representation.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The <a href="https://www.youtube.com/watch?v=HMSqapQDY_4">screencast</a> demonstrates the feature.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The sections below explain in a little more detail what is returned when this profile is activated.</p> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_ugvro_simplified-representations_domain-object">4.2. Domain Object</h3> 
+        <div class="paragraph"> 
+         <p>If a domain object resource (section 14) is accessed with the Apache Isis profile, the resultant representation is a JSON object with simple key/value pairs for each property.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The contents of any collections are also eagerly returned, consisting of an array of elements of each referenced object. Each such element contains key/value pairs of each property (in other words, a grid of data is returned). Each element also has a special <code>href` property (so that the client can easily navigate to a resource for that object) and a `title</code> property (to use as a label, eg the hyperlink text).</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>In addition, the representation defined by the RO spec is also included, under a special <code>$$ro</code> property.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>For example, using the (non-ASF) <a href="http://github.com/isisaddons/isis-app-todoapp">Isis addons' todoapp</a>, accessing this resource:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code>http://localhost:8080/restful/objects/TODO/45</code></pre> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>with an <code>Accept</code> request header of:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code>Accept: application/json;profile="urn:org.apache.isis/v1"</code></pre> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>returns the following representation:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code>{
   "$$href" : "http://localhost:8080/restful/objects/TODO/45",       <i class="conum" data-value="1"></i><b>(1)</b>
   "$$instanceId" : "45",                                            <i class="conum" data-value="2"></i><b>(2)</b>
   "$$title" : "Buy bread due by 2015-12-04",                        <i class="conum" data-value="3"></i><b>(3)</b>
@@ -1061,81 +940,79 @@ this resource:</p>
     "instanceId" : "45",
     "members" : { ... }
   }
-}</code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td>hyperlink to the representation</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="2"></i><b>2</b></td>
-<td>instance id of the domain object (unique within its type)</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="3"></i><b>3</b></td>
-<td>title of the domain object</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="4"></i><b>4</b></td>
-<td>all the properties of the domain object (to which the caller has access), as key/value pairs</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="5"></i><b>5</b></td>
-<td>contents of each collection</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="6"></i><b>6</b></td>
-<td>special <code>$$ro</code> json-prop, being the normal RO Spec representation for this object</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>with a <code>Content-Type</code> header:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code>Content-Type: application/json;
-              profile="urn:org.apache.isis/v1";repr-type="object"</code></pre>
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_ugvro_simplified-representations_object-collection">4.3. Domain Object Collection</h3>
-<div class="paragraph">
-<p>If a domain object collection (section 17) is accessed with this profile, then the resultant representation is as
-an array of elements of key/value for each referenced object, and again each element the containing the key/value
-pairs of the properties of that object (a grid, again).<br></p>
-</div>
-<div class="paragraph">
-<p>In addition, the representation defined by the RO spec is also included, as a special object with a single <code>$$ro</code>
-property.</p>
-</div>
-<div class="paragraph">
-<p>For example, using the (non-ASF) <a href="http://github.com/isisaddons/isis-app-todoapp">Isis addons' todoapp</a>, accessing
-this resource:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code>http://localhost:8080/restful/objects/TODO/45/collections/similarTo</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>with an <code>Accept</code> request header of:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code>Accept: application/json;profile="urn:org.apache.isis/v1"</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>returns the following representation:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code>[                                                                   <i class="conum" data-value="1"></i><b>(1)</b>
+}</code></pre> 
+         </div> 
+        </div> 
+        <div class="colist arabic"> 
+         <table> 
+          <tbody>
+           <tr> 
+            <td><i class="conum" data-value="1"></i><b>1</b></td> 
+            <td>hyperlink to the representation</td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="2"></i><b>2</b></td> 
+            <td>instance id of the domain object (unique within its type)</td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="3"></i><b>3</b></td> 
+            <td>title of the domain object</td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="4"></i><b>4</b></td> 
+            <td>all the properties of the domain object (to which the caller has access), as key/value pairs</td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="5"></i><b>5</b></td> 
+            <td>contents of each collection</td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="6"></i><b>6</b></td> 
+            <td>special <code>$$ro</code> json-prop, being the normal RO Spec representation for this object</td> 
+           </tr> 
+          </tbody>
+         </table> 
+        </div> 
+        <div class="paragraph"> 
+         <p>with a <code>Content-Type</code> header:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code>Content-Type: application/json;
+              profile="urn:org.apache.isis/v1";repr-type="object"</code></pre> 
+         </div> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_ugvro_simplified-representations_object-collection">4.3. Domain Object Collection</h3> 
+        <div class="paragraph"> 
+         <p>If a domain object collection (section 17) is accessed with this profile, then the resultant representation is as an array of elements of key/value for each referenced object, and again each element the containing the key/value pairs of the properties of that object (a grid, again).<br></p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>In addition, the representation defined by the RO spec is also included, as a special object with a single <code>$$ro</code> property.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>For example, using the (non-ASF) <a href="http://github.com/isisaddons/isis-app-todoapp">Isis addons' todoapp</a>, accessing this resource:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code>http://localhost:8080/restful/objects/TODO/45/collections/similarTo</code></pre> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>with an <code>Accept</code> request header of:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code>Accept: application/json;profile="urn:org.apache.isis/v1"</code></pre> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>returns the following representation:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code>[                                                                   <i class="conum" data-value="1"></i><b>(1)</b>
 {
   "$$href" : "http://localhost:8080/restful/objects/TODO/46",       <i class="conum" data-value="2"></i><b>(2)</b>
   "$$instanceId" : "46",                                            <i class="conum" data-value="3"></i><b>(3)</b>
@@ -1166,80 +1043,80 @@ this resource:</p>
     "value" : [ ... ]
   }
 }
-]</code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td>returns a JSON array, not a JSON object</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="2"></i><b>2</b></td>
-<td>hyperlink to the representation</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="3"></i><b>3</b></td>
-<td>instance id of the domain object (unique within its type)</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="4"></i><b>4</b></td>
-<td>title of the domain object</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="5"></i><b>5</b></td>
-<td>all the properties of the domain object (to which the caller has access), as key/value pairs</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="6"></i><b>6</b></td>
-<td>last element is a special object with a single <code>$$ro</code> json-prop, being the normal RO Spec representation for this object</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>with a <code>Content-Type</code> header:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code>Content-Type: application/json;profile="urn:org.apache.isis/v1";repr-type="object-collection"</code></pre>
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_ugvro_simplified-representations_action-invocation">4.4. Action Invocation</h3>
-<div class="paragraph">
-<p>When an action is invoked, it can return a domain object, a list, a scalar, or return nothing.</p>
-</div>
-<div class="sect3">
-<h4 id="_returning_an_object">4.4.1. Returning an Object</h4>
-<div class="paragraph">
-<p>If the action returned an object, then the domain object representation described
-<a href="#_ugvro_simplified-representations_domain-object">above</a> is returned.</p>
-</div>
-<div class="paragraph">
-<p>For example, using the (non-ASF) <a href="http://github.com/isisaddons/isis-app-todoapp">Isis addons' todoapp</a>, accessing
-this resource:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code>http://localhost:8080/restful/objects/TODO/45/actions/updateCost/invoke</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>with an <code>Accept</code> request header of:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code>Accept: application/json;profile="urn:org.apache.isis/v1"</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>returns the following representation:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code>{
+]</code></pre> 
+         </div> 
+        </div> 
+        <div class="colist arabic"> 
+         <table> 
+          <tbody>
+           <tr> 
+            <td><i class="conum" data-value="1"></i><b>1</b></td> 
+            <td>returns a JSON array, not a JSON object</td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="2"></i><b>2</b></td> 
+            <td>hyperlink to the representation</td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="3"></i><b>3</b></td> 
+            <td>instance id of the domain object (unique within its type)</td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="4"></i><b>4</b></td> 
+            <td>title of the domain object</td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="5"></i><b>5</b></td> 
+            <td>all the properties of the domain object (to which the caller has access), as key/value pairs</td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="6"></i><b>6</b></td> 
+            <td>last element is a special object with a single <code>$$ro</code> json-prop, being the normal RO Spec representation for this object</td> 
+           </tr> 
+          </tbody>
+         </table> 
+        </div> 
+        <div class="paragraph"> 
+         <p>with a <code>Content-Type</code> header:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code>Content-Type: application/json;profile="urn:org.apache.isis/v1";repr-type="object-collection"</code></pre> 
+         </div> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_ugvro_simplified-representations_action-invocation">4.4. Action Invocation</h3> 
+        <div class="paragraph"> 
+         <p>When an action is invoked, it can return a domain object, a list, a scalar, or return nothing.</p> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_returning_an_object">4.4.1. Returning an Object</h4> 
+         <div class="paragraph"> 
+          <p>If the action returned an object, then the domain object representation described <a href="#_ugvro_simplified-representations_domain-object">above</a> is returned.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>For example, using the (non-ASF) <a href="http://github.com/isisaddons/isis-app-todoapp">Isis addons' todoapp</a>, accessing this resource:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code>http://localhost:8080/restful/objects/TODO/45/actions/updateCost/invoke</code></pre> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>with an <code>Accept</code> request header of:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code>Accept: application/json;profile="urn:org.apache.isis/v1"</code></pre> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>returns the following representation:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code>{
   "$$href" : "http://localhost:8080/restful/objects/TODO/45",
   "$$instanceId" : "45",
   "$$title" : "Buy bread due by 2015-12-04",
@@ -1251,52 +1128,48 @@ this resource:</p>
   "similarTo" : [ ... ]
   ...
   "$$ro" : { ... }
-}</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>with a <code>Content-Type</code> of:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code>Content-Type: application/json;profile="urn:org.apache.isis/v1";repr-type="object"</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>... in other words no different to a representation obtained of the returned domain object directly.</p>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_returning_a_list">4.4.2. Returning a List</h4>
-<div class="paragraph">
-<p>On the other hand if the action returned a list (a "standalone" collection, then an array representation is returned.
-This is very similar to that returned by a
-<a href="#_ugvro_simplified-representations_object-collection">(parented) object collection</a>, though with a
-slightly different <code>Content-Type</code> to distinguish.</p>
-</div>
-<div class="paragraph">
-<p>For example, using the (non-ASF) <a href="http://github.com/isisaddons/isis-app-todoapp">Isis addons' todoapp</a>, accessing
-this resource:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code>http://localhost:8080/restful/services/ToDoItems/actions/notYetComplete/invoke</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>with an <code>Accept</code> request header of:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code>Accept: application/json;profile="urn:org.apache.isis/v1"</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>returns the following representation:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code>[ {
+}</code></pre> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>with a <code>Content-Type</code> of:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code>Content-Type: application/json;profile="urn:org.apache.isis/v1";repr-type="object"</code></pre> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>... in other words no different to a representation obtained of the returned domain object directly.</p> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_returning_a_list">4.4.2. Returning a List</h4> 
+         <div class="paragraph"> 
+          <p>On the other hand if the action returned a list (a "standalone" collection, then an array representation is returned. This is very similar to that returned by a <a href="#_ugvro_simplified-representations_object-collection">(parented) object collection</a>, though with a slightly different <code>Content-Type</code> to distinguish.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>For example, using the (non-ASF) <a href="http://github.com/isisaddons/isis-app-todoapp">Isis addons' todoapp</a>, accessing this resource:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code>http://localhost:8080/restful/services/ToDoItems/actions/notYetComplete/invoke</code></pre> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>with an <code>Accept</code> request header of:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code>Accept: application/json;profile="urn:org.apache.isis/v1"</code></pre> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>returns the following representation:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code>[ {
   "$$href" : "http://localhost:8080/restful/objects/TODO/45",
   "$$instanceId" : "45",
   "$$title" : "Buy bread due by 2015-12-04",
@@ -1322,528 +1195,485 @@ this resource:</p>
       "extensions" : { }
     }
   }
-} ]</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>with a <code>Content-Type</code> header:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code>Content-Type: application/json;profile="urn:org.apache.isis/v1";repr-type="list"</code></pre>
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_returning_scalar_nothing">4.4.3. Returning Scalar/Nothing</h4>
-<div class="paragraph">
-<p>Note that actions returning scalar values or nothing (which includes <code>void</code> actions) are not supported; for these the
-regular RO spec representation will be returned.</p>
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_ugvro_simplified-representations_other-representations">4.5. Supporting other Representations</h3>
-<div class="paragraph">
-<p>Sometimes though you may want to extend or change the representations generated.  This might be because you want to
-write a RESTful client that uses a particular library (say a Javascript library or web components) that can only handle representations in a certain form.</p>
-</div>
-<div class="paragraph">
-<p>Or, you might want to have Apache Isis generate representations according to some other "standard", of which there are
-many:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Mike Kelly&#8217;s <a href="http://stateless.co/hal_specification.html">HAL</a> specification</p>
-</li>
-<li>
-<p>Mike Amundsen&#8217;s <a href="http://amundsen.com/media-types/collection/">Collection+JSON</a> specification</p>
-</li>
-<li>
-<p>Kevin Swiber&#8217;s <a href="https://github.com/kevinswiber/siren">Siren</a> specification</p>
-</li>
-<li>
-<p>Steve Klabnik&#8217;s <a href="http://jsonapi.org/">JSON API</a> specification</p>
-</li>
-<li>
-<p>Gregg Cainus' <a href="https://github.com/cainus/hyper-json-spec">Hyper+JSON</a> specification</p>
-</li>
-<li>
-<p>the W3C&#8217;s <a href="https://www.w3.org/TR/json-ld/">JSON-LD</a> specification</p>
-</li>
-<li>
-<p>Markus Lanthaler&#8217;s <a href="http://www.markus-lanthaler.com/hydra/">Hydra</a> specification.</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>A good discussion about the relative merits of several of these different hypermedia formats can be found <a href="https://groups.google.com/forum/#!msg/api-craft/NgjzQYVOE4s/EAB2jxtU_TMJ">here</a>.</p>
-</div>
-<div class="paragraph">
-<p>Or, of course, you may have your own internal specification that you wish to use.</p>
-</div>
-<div class="paragraph">
-<p>Supporting any of these alternative representations can be achieved by providing a suitable implementation of
-<code>ContentNegotiationService</code>.  The existing implementations (eg <code>ContentNegotiationServiceSimplified</code>) can be used as a
-starting point.</p>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>These will, admittedly, need to access the internal APIs for the Apache Isis metamodel, and you should be aware that
-these are not formal API; they may change over time.  That said, they are very stable and have not changed
-significantly over the last few years.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_ugvro_simplified-representations_configuration-properties">4.6. Global Config Props (Deprecated)</h3>
-<div class="paragraph">
-<p>If all that is required is a very simple representations (of objects), you can configure the Restful Objects viewer
-to provide a simplified output, then this can be done with a number of (global) configuration properties.</p>
-</div>
-<div class="paragraph">
-<p>These configuration properties pre-date the support, introduced in <code>1.11.0</code>, for the Apache Isis profile, and
-are limited by the fact that they are global configuration settings, so cannot be influenced on a request-by-request
-basis (as is the case with the <code>Accept</code> header used for the Apache Isis profile). They have therefore been
-deprecated, and may be removed in the future.</p>
-</div>
-<div class="paragraph">
-<p>Details can be found in <a href="#_ugvro_configuration-properties_deprecated">here</a>.</p>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_ugvro_configuration-properties">5. Configuration Properties</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>The Restful Objects viewer provides a couple of configuration option that extend/simplify/alter the representations
-generated from the Restful Objects specification.</p>
-</div>
-<div class="paragraph">
-<p>These configuration properties are typically stored in <code>WEB-INF/viewer_restfulobjects.properties</code>.  However, you can
-place all configuration properties into <code>WEB-INF/isis.properties</code> if you wish (the configuration properties from all
-config files are merged together).</p>
-</div>
-<div class="sect2">
-<h3 id="_ugvro_configuration-properties_standard">5.1. Standard</h3>
-<div class="paragraph">
-<p>The following configuration properties are supported:</p>
-</div>
-<table class="tableblock frame-all grid-all spread">
-<caption class="title">Table 1. Restful Objects Viewer Configuration Properties</caption>
-<colgroup>
-<col style="width: 33.3333%;">
-<col style="width: 16.6666%;">
-<col style="width: 50.0001%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">Property</th>
-<th class="tableblock halign-left valign-top">Value<br>
-(<em>default value</em>)</th>
-<th class="tableblock halign-left valign-top">Description</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.viewer.restfulobjects.</code><br>
-<code>honorUiHints</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>true</code>,<code>false</code> (<code><em>false</em></code>)</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">A mechanism for reducing the number of round-trips by eagerly rendering collections; discussed <a href="#_ugvro_ro-spec_extensions_minimizing-round-trips_honor-ui-hints">here</a>.</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.viewer.restfulobjects.</code><br>
-<code>strictAcceptChecking</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>true</code>,<code>false</code> (<code><em>false</em></code>)</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Whether to strictly enforce the <code>Accept</code> header checking for the default RO-spec representations (by the
-<code>ContentNegotiationServiceForRestfulObjectsV1_0</code> service). Will otherwise accept anything. <br>
-</p><p class="tableblock">This is convenient because it allows the <code>Accept</code> header to be set to that of the
-<a href="#_ugvro_simplified-representations">Apache Isis profile</a> for all resources, rather than simply the
-handful of resources that supported that profile.</p></td>
-</tr>
-</tbody>
-</table>
-</div>
-<div class="sect2">
-<h3 id="_ugvro_configuration-properties_deprecated">5.2. Deprecated</h3>
-<div class="paragraph">
-<p>There are also a number of configuration properties that can be used to suppress or simplify the default RO-spec
-representations.</p>
-</div>
-<div class="paragraph">
-<p>These configuration properties pre-date the support, introduced in <code>1.11.0</code>, for the Apache Isis profile, and
-are limited by the fact that they are global configuration settings, so cannot be influenced on a request-by-request
-basis (as is the case with the <code>Accept</code> header used for the Apache Isis profile). They have therefore been
-deprecated, and may be removed in the future.</p>
-</div>
-<div class="paragraph">
-<p>Nevertheless, those configuration properties are:</p>
-</div>
-<table class="tableblock frame-all grid-all spread">
-<caption class="title">Table 2. Deprecated Configuration Properties</caption>
-<colgroup>
-<col style="width: 33.3333%;">
-<col style="width: 16.6666%;">
-<col style="width: 50.0001%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">Property</th>
-<th class="tableblock halign-left valign-top">Value<br>
-(<em>default value</em>)</th>
-<th class="tableblock halign-left valign-top">Description</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.viewer.restfulobjects.</code><br>
-<code>suppressDescribedByLinks</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>true</code>,<code>false</code> (<code><em>false</em></code>)</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Suppresses the "describedby" links (on all representations)</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.viewer.restfulobjects.</code><br>
-<code>suppressUpdateLink</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>true</code>,<code>false</code> (<code><em>false</em></code>)</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">suppresses the  "update" link (on object representation)</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.viewer.restfulobjects.</code><br>
-<code>sup

<TRUNCATED>

[28/44] isis-site git commit: ISIS-1594: provide an 'edit' button

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/guides/rgmvn.pdf
----------------------------------------------------------------------
diff --git a/content/guides/rgmvn.pdf b/content/guides/rgmvn.pdf
index d3a6e23..310ae0d 100644
--- a/content/guides/rgmvn.pdf
+++ b/content/guides/rgmvn.pdf
@@ -4,16 +4,16 @@
 << /Title (Apache Isis Maven plugin)
 /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:20170219155042+00'00')
-/ModDate (D:20170219155042+00'00')
+/CreationDate (D:20170307234041+00'00')
+/ModDate (D:20170307234041+00'00')
 >>
 endobj
 2 0 obj
 << /Type /Catalog
 /Pages 3 0 R
 /Names 14 0 R
-/Outlines 175 0 R
-/PageLabels 194 0 R
+/Outlines 174 0 R
+/PageLabels 193 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 22
-/Kids [7 0 R 10 0 R 12 0 R 34 0 R 50 0 R 55 0 R 61 0 R 64 0 R 70 0 R 74 0 R 77 0 R 79 0 R 87 0 R 89 0 R 93 0 R 107 0 R 113 0 R 116 0 R 118 0 R 120 0 R 123 0 R 126 0 R]
+/Kids [7 0 R 10 0 R 12 0 R 34 0 R 50 0 R 54 0 R 60 0 R 63 0 R 69 0 R 73 0 R 76 0 R 78 0 R 86 0 R 88 0 R 92 0 R 106 0 R 112 0 R 115 0 R 117 0 R 119 0 R 122 0 R 125 0 R]
 >>
 endobj
 4 0 obj
@@ -78,13 +78,13 @@ endobj
 endobj
 8 0 obj
 << /Type /Font
-/BaseFont /AAAABZ+NotoSerif
+/BaseFont /AAAABT+NotoSerif
 /Subtype /TrueType
-/FontDescriptor 196 0 R
+/FontDescriptor 195 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 198 0 R
-/ToUnicode 197 0 R
+/Widths 197 0 R
+/ToUnicode 196 0 R
 >>
 endobj
 9 0 obj
@@ -903,7 +903,7 @@ endobj
 /F3.0 36 0 R
 >>
 >>
-/Annots [129 0 R 130 0 R 131 0 R 132 0 R 133 0 R 134 0 R 135 0 R 136 0 R 137 0 R 138 0 R 139 0 R 140 0 R 141 0 R 142 0 R 143 0 R 144 0 R 145 0 R 146 0 R 147 0 R 148 0 R 149 0 R 150 0 R 151 0 R 152 0 R 153 0 R 154 0 R 155 0 R 156 0 R 157 0 R 158 0 R 159 0 R 160 0 R 161 0 R 162 0 R 163 0 R 164 0 R 165 0 R 166 0 R 167 0 R 168 0 R 169 0 R 170 0 R 171 0 R 172 0 R 173 0 R]
+/Annots [128 0 R 129 0 R 130 0 R 131 0 R 132 0 R 133 0 R 134 0 R 135 0 R 136 0 R 137 0 R 138 0 R 139 0 R 140 0 R 141 0 R 142 0 R 143 0 R 144 0 R 145 0 R 146 0 R 147 0 R 148 0 R 149 0 R 150 0 R 151 0 R 152 0 R 153 0 R 154 0 R 155 0 R 156 0 R 157 0 R 158 0 R 159 0 R 160 0 R 161 0 R 162 0 R 163 0 R 164 0 R 165 0 R 166 0 R 167 0 R 168 0 R 169 0 R 170 0 R 171 0 R 172 0 R]
 >>
 endobj
 11 0 obj
@@ -1480,7 +1480,7 @@ endobj
 /Font << /F2.0 16 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 174 0 R
+/XObject << /Stamp1 173 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 31 0 R 32 0 R]
@@ -1495,18 +1495,18 @@ endobj
 >>
 endobj
 15 0 obj
-<< /Names [(1-9-0-version) 75 0 R (_rgmvn) 13 0 R (_rgmvn_intro) 35 0 R (_rgmvn_intro_app-manifest) 46 0 R (_rgmvn_swagger) 80 0 R (_rgmvn_validate) 56 0 R (_rgmvn_xsd) 103 0 R (_rgmvn_xsd) 94 0 R (code-dom-code-submodule) 58 0 R (code-integtest-code-submodule) 85 0 R (custom-validation-rules) 71 0 R (example-of-failure) 67 0 R (other-guides) 17 0 R (to-run) 66 0 R (to-run-2) 91 0 R (to-run-3) 128 0 R (xjc-profile) 121 0 R (xsd-profile) 114 0 R]
+<< /Names [(1-9-0-version) 74 0 R (_rgmvn) 13 0 R (_rgmvn_intro) 35 0 R (_rgmvn_intro_app-manifest) 46 0 R (_rgmvn_swagger) 79 0 R (_rgmvn_validate) 55 0 R (_rgmvn_xsd) 102 0 R (_rgmvn_xsd) 93 0 R (code-dom-code-submodule) 57 0 R (code-integtest-code-submodule) 84 0 R (custom-validation-rules) 70 0 R (example-of-failure) 66 0 R (other-guides) 17 0 R (to-run) 65 0 R (to-run-2) 90 0 R (to-run-3) 127 0 R (xjc-profile) 120 0 R (xsd-profile) 113 0 R]
 >>
 endobj
 16 0 obj
 << /Type /Font
-/BaseFont /AAAACA+NotoSerif-Bold
+/BaseFont /AAAABU+NotoSerif-Bold
 /Subtype /TrueType
-/FontDescriptor 200 0 R
+/FontDescriptor 199 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 202 0 R
-/ToUnicode 201 0 R
+/Widths 201 0 R
+/ToUnicode 200 0 R
 >>
 endobj
 17 0 obj
@@ -2817,7 +2817,7 @@ endobj
 /F1.0 8 0 R
 /F3.0 36 0 R
 >>
-/XObject << /Stamp1 174 0 R
+/XObject << /Stamp1 173 0 R
 >>
 >>
 /Annots [37 0 R 38 0 R 39 0 R 40 0 R 41 0 R 42 0 R 43 0 R 44 0 R 45 0 R 47 0 R 48 0 R]
@@ -2828,13 +2828,13 @@ endobj
 endobj
 36 0 obj
 << /Type /Font
-/BaseFont /AAAACB+mplus1mn-regular
+/BaseFont /AAAABV+mplus1mn-regular
 /Subtype /TrueType
-/FontDescriptor 204 0 R
+/FontDescriptor 203 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 206 0 R
-/ToUnicode 205 0 R
+/Widths 205 0 R
+/ToUnicode 204 0 R
 >>
 endobj
 37 0 obj
@@ -2962,7 +2962,7 @@ endobj
 >>
 endobj
 49 0 obj
-<< /Length 37595
+<< /Length 39637
 >>
 stream
 q
@@ -2996,13 +2996,13 @@ h
 S
 Q
 /DeviceRGB cs
-0.000 0.533 0.000 scn
+0.000 0.400 0.600 scn
 /DeviceRGB CS
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 SCN
 
 BT
 59.24 783.0649999999999 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <7061636b616765> Tj
 ET
 
@@ -3019,13 +3019,13 @@ 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
+0.000 0.800 1.000 scn
+0.000 0.800 1.000 SCN
 
 BT
 103.24000000000001 783.0649999999999 Td
 /F3.0 11 Tf
-<646f6d61696e617070> Tj
+<646f6d61696e6170702e646f6d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3034,20 +3034,20 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-152.74 783.0649999999999 Td
+174.74 783.0649999999999 Td
 /F3.0 11 Tf
-<2e> Tj
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-158.24 783.0649999999999 Td
+59.24 768.3249999999999 Td
 /F3.0 11 Tf
-<646f6d> Tj
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3056,9 +3056,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-174.74 783.0649999999999 Td
+64.74000000000001 768.3249999999999 Td
 /F3.0 11 Tf
-<3b> Tj
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3067,19 +3067,19 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24 768.3249999999999 Td
+70.24000000000001 768.3249999999999 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 59.24 753.585 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -3096,12 +3096,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74000000000001 753.585 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -3118,12 +3118,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 130.74 753.585 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <446f6d61696e417070446f6d4d616e6966657374> Tj
 ET
 
@@ -3140,12 +3140,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 246.24 753.585 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <696d706c656d656e7473> Tj
 ET
 
@@ -3206,8 +3206,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 738.845 Td
@@ -3228,12 +3228,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 724.105 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -3250,8 +3250,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 724.105 Td
@@ -3272,8 +3272,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 147.24 724.105 Td
@@ -3289,7 +3289,40 @@ ET
 BT
 174.74 724.105 Td
 /F3.0 11 Tf
-<3c3f3e3e> Tj
+<3c> 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
+180.24 724.105 Td
+/F3.0 11 Tf
+<3f> 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
+185.74 724.105 Td
+/F3.0 11 Tf
+<3e> 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
+191.24 724.105 Td
+/F3.0 11 Tf
+<3e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3322,7 +3355,18 @@ ET
 BT
 257.24 724.105 Td
 /F3.0 11 Tf
-<2829> Tj
+<28> 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
+262.74 724.105 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3360,12 +3404,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 103.24000000000001 709.365 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <72657475726e> Tj
 ET
 
@@ -3382,8 +3426,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 141.74 709.365 Td
@@ -3404,8 +3448,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 180.24 709.365 Td
@@ -3459,8 +3503,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 268.24 694.625 Td
@@ -3481,8 +3525,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.600 0.600 0.600 scn
+0.600 0.600 0.600 SCN
 
 BT
 306.74 694.625 Td
@@ -3509,7 +3553,18 @@ ET
 BT
 103.24000000000001 679.885 Td
 /F3.0 11 Tf
-<293b> Tj
+<29> 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
+108.74000000000001 679.885 Td
+/F3.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3547,8 +3602,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 650.405 Td
@@ -3569,12 +3624,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 635.665 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -3591,8 +3646,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 635.665 Td
@@ -3613,8 +3668,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 147.24 635.665 Td
@@ -3630,7 +3685,40 @@ ET
 BT
 174.74 635.665 Td
 /F3.0 11 Tf
-<3c3f3e3e> Tj
+<3c> 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
+180.24 635.665 Td
+/F3.0 11 Tf
+<3f> 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
+185.74 635.665 Td
+/F3.0 11 Tf
+<3e> 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
+191.24 635.665 Td
+/F3.0 11 Tf
+<3e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3663,7 +3751,18 @@ ET
 BT
 317.74 635.665 Td
 /F3.0 11 Tf
-<2829> Tj
+<28> 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
+323.24 635.665 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3701,12 +3800,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 345.24 635.665 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <72657475726e> Tj
 ET
 
@@ -3723,8 +3822,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 383.74 635.665 Td
@@ -3745,8 +3844,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 449.74 635.665 Td
@@ -3762,7 +3861,29 @@ ET
 BT
 499.24 635.665 Td
 /F3.0 11 Tf
-<28293b> Tj
+<28> 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
+504.74 635.665 Td
+/F3.0 11 Tf
+<29> 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
+510.24 635.665 Td
+/F3.0 11 Tf
+<3b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3800,8 +3921,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 620.925 Td
@@ -3822,12 +3943,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 606.185 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -3844,8 +3965,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 606.185 Td
@@ -3883,7 +4004,18 @@ ET
 BT
 301.24 606.185 Td
 /F3.0 11 Tf
-<2829> Tj
+<28> 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
+306.74 606.185 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3921,12 +4053,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 328.74 606.185 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <72657475726e> Tj
 ET
 
@@ -3943,12 +4075,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 367.24 606.185 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <6e756c6c> Tj
 ET
 
@@ -3998,8 +4130,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 591.4449999999999 Td
@@ -4020,12 +4152,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 576.7049999999999 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -4042,8 +4174,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 576.7049999999999 Td
@@ -4081,7 +4213,18 @@ ET
 BT
 295.74 576.7049999999999 Td
 /F3.0 11 Tf
-<2829> Tj
+<28> 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
+301.24 576.7049999999999 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4119,12 +4262,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 323.24 576.7049999999999 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <72657475726e> Tj
 ET
 
@@ -4141,12 +4284,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 361.74 576.7049999999999 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <6e756c6c> Tj
 ET
 
@@ -4196,8 +4339,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 561.9649999999999 Td
@@ -4218,12 +4361,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 547.2249999999999 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -4240,8 +4383,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 547.2249999999999 Td
@@ -4262,8 +4405,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 147.24 547.2249999999999 Td
@@ -4279,7 +4422,18 @@ ET
 BT
 174.74 547.2249999999999 Td
 /F3.0 11 Tf
-<3c3f> Tj
+<3c> 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
+180.24 547.2249999999999 Td
+/F3.0 11 Tf
+<3f> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4295,12 +4449,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 191.24 547.2249999999999 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <657874656e6473> Tj
 ET
 
@@ -4334,7 +4488,18 @@ ET
 BT
 306.74 547.2249999999999 Td
 /F3.0 11 Tf
-<3e3e> Tj
+<3e> 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
+312.24 547.2249999999999 Td
+/F3.0 11 Tf
+<3e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4367,7 +4532,18 @@ ET
 BT
 383.74 547.2249999999999 Td
 /F3.0 11 Tf
-<2829> Tj
+<28> 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
+389.24 547.2249999999999 Td
+/F3.0 11 Tf
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4405,12 +4581,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 411.24 547.2249999999999 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <72657475726e> Tj
 ET
 
@@ -4427,12 +4603,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 449.74 547.2249999999999 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <6e756c6c> Tj
 ET
 
@@ -4482,8 +4658,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.333 0.333 0.333 scn
-0.333 0.333 0.333 SCN
+0.600 0.600 1.000 scn
+0.600 0.600 1.000 SCN
 
 BT
 81.24000000000001 532.4849999999999 Td
@@ -4504,12 +4680,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 81.24000000000001 517.7449999999999 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -4526,8 +4702,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 119.74000000000001 517.7449999999999 Td
@@ -4548,8 +4724,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 141.74 517.7449999999999 Td
@@ -4581,8 +4757,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 185.74 517.7449999999999 Td
@@ -4631,7 +4807,7 @@ ET
 BT
 372.74 517.7449999999999 Td
 /F3.0 11 Tf
-<2829> Tj
+<28> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4640,9 +4816,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-383.74 517.7449999999999 Td
+378.24 517.7449999999999 Td
 /F3.0 11 Tf
-<20> Tj
+<29> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4651,7 +4827,18 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-389.24 517.7449999999999 Td
+383.74 517.7449999999999 Td
+/F3.0 11 Tf
+<20> 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
+389.24 517.7449999999999 Td
 /F3.0 11 Tf
 <7b> Tj
 ET
@@ -4669,12 +4856,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 400.24 517.7449999999999 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <72657475726e> Tj
 ET
 
@@ -4691,12 +4878,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 438.74 517.7449999999999 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <6e756c6c> Tj
 ET
 
@@ -4806,12 +4993,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24 426.48499999999996 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <7061636b616765> Tj
 ET
 
@@ -4828,35 +5015,13 @@ 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
+0.000 0.800 1.000 scn
+0.000 0.800 1.000 SCN
 
 BT
 103.24000000000001 426.48499999999996 Td
 /F3.0 11 Tf
-<646f6d61696e617070> 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
-152.74 426.48499999999996 Td
-/F3.0 11 Tf
-<2e> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-158.24 426.48499999999996 Td
-/F3.0 11 Tf
-<646f6d> Tj
+<646f6d61696e6170702e646f6d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4872,12 +5037,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.24 411.74499999999995 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -4894,12 +5059,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 97.74000000000001 411.74499999999995 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <66696e616c> Tj
 ET
 
@@ -4916,12 +5081,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 130.74 411.74499999999995 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <636c617373> Tj
 ET
 
@@ -4938,12 +5103,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.000 0.667 0.533 scn
+0.000 0.667 0.533 SCN
 
 BT
 163.74 411.74499999999995 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <446f6d61696e417070446f6d61696e4d6f64756c65> Tj
 ET
 
@@ -5628,28 +5793,16 @@ endobj
 /MediaBox [0 0 595.28 841.89]
 /Contents 49 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F4.0 51 0 R
-/F3.0 36 0 R
+/Font << /F3.0 36 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 174 0 R
+/XObject << /Stamp1 173 0 R
 >>
 >>
-/Annots [52 0 R 53 0 R]
+/Annots [51 0 R 52 0 R]
 >>
 endobj
 51 0 obj
-<< /Type /Font
-/BaseFont /AAAACC+mplus1mn-bold
-/Subtype /TrueType
-/FontDescriptor 208 0 R
-/FirstChar 32
-/LastChar 255
-/Widths 210 0 R
-/ToUnicode 209 0 R
->>
-endobj
-52 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -5660,7 +5813,7 @@ endobj
 /Type /Annot
 >>
 endobj
-53 0 obj
+52 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -5671,7 +5824,7 @@ endobj
 /Type /Annot
 >>
 endobj
-54 0 obj
+53 0 obj
 << /Length 10770
 >>
 stream
@@ -6116,7 +6269,7 @@ Q
 
 BT
 76.73933333333335 439.7800000000003 Td
-/F5.1 24 Tf
+/F4.1 24 Tf
 <21> Tj
 ET
 
@@ -6342,41 +6495,41 @@ Q
 
 endstream
 endobj
-55 0 obj
+54 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 54 0 R
+/Contents 53 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 16 0 R
 /F3.0 36 0 R
 /F1.0 8 0 R
-/F5.1 57 0 R
+/F4.1 56 0 R
 >>
-/XObject << /Stamp1 174 0 R
+/XObject << /Stamp1 173 0 R
 >>
 >>
-/Annots [59 0 R]
+/Annots [58 0 R]
 >>
 endobj
-56 0 obj
-[55 0 R /XYZ 0 841.89 null]
+55 0 obj
+[54 0 R /XYZ 0 841.89 null]
 endobj
-57 0 obj
+56 0 obj
 << /Type /Font
-/BaseFont /AAAACD+FontAwesome
+/BaseFont /AAAABW+FontAwesome
 /Subtype /TrueType
-/FontDescriptor 212 0 R
+/FontDescriptor 207 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 214 0 R
-/ToUnicode 213 0 R
+/Widths 209 0 R
+/ToUnicode 208 0 R
 >>
 endobj
-58 0 obj
-[55 0 R /XYZ 0 408.6900000000003 null]
+57 0 obj
+[54 0 R /XYZ 0 408.6900000000003 null]
 endobj
-59 0 obj
+58 0 obj
 << /Border [0 0 0]
 /Dest (_rgmvn_intro_app-manifest)
 /Subtype /Link
@@ -6384,7 +6537,7 @@ endobj
 /Type /Annot
 >>
 endobj
-60 0 obj
+59 0 obj
 << /Length 21652
 >>
 stream
@@ -6419,13 +6572,13 @@ h
 S
 Q
 /DeviceRGB cs
-0.733 0.000 0.400 scn
+0.184 0.435 0.624 scn
 /DeviceRGB CS
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 SCN
 
 BT
 59.24 783.0649999999999 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c70726f66696c653e> Tj
 ET
 
@@ -6442,12 +6595,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 81.24000000000001 768.3249999999999 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c69643e> Tj
 ET
 
@@ -6464,12 +6617,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 174.74 768.3249999999999 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f69643e> Tj
 ET
 
@@ -6486,12 +6639,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 81.24000000000001 753.585 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c61637469766174696f6e3e> Tj
 ET
 
@@ -6508,12 +6661,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 103.24000000000001 738.845 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c70726f70657274793e> Tj
 ET
 
@@ -6530,12 +6683,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 125.24000000000001 724.105 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c6e616d653e> Tj
 ET
 
@@ -6552,12 +6705,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 262.74 724.105 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f6e616d653e> Tj
 ET
 
@@ -6594,12 +6747,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 103.24000000000001 694.625 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f70726f70657274793e> Tj
 ET
 
@@ -6616,12 +6769,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 81.24000000000001 679.885 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f61637469766174696f6e3e> Tj
 ET
 
@@ -6638,12 +6791,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 81.24000000000001 665.145 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c6275696c643e> Tj
 ET
 
@@ -6660,12 +6813,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 103.24000000000001 650.405 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c706c7567696e733e> Tj
 ET
 
@@ -6682,12 +6835,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 125.24000000000001 635.665 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c706c7567696e3e> Tj
 ET
 
@@ -6704,12 +6857,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 147.24 620.925 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c67726f757049643e> Tj
 ET
 
@@ -6726,12 +6879,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 306.74 620.925 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f67726f757049643e> Tj
 ET
 
@@ -6748,12 +6901,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 147.24 606.185 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c617274696661637449643e> Tj
 ET
 
@@ -6770,12 +6923,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 306.74 606.185 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f617274696661637449643e> Tj
 ET
 
@@ -6792,12 +6945,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 147.24 591.4449999999999 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c76657273696f6e3e> Tj
 ET
 
@@ -6814,12 +6967,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 279.24 591.4449999999999 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f76657273696f6e3e> Tj
 ET
 
@@ -6856,12 +7009,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 147.24 561.9649999999999 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c636f6e66696775726174696f6e3e> Tj
 ET
 
@@ -6878,12 +7031,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 169.24 547.2249999999999 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c6170704d616e69666573743e> Tj
 ET
 
@@ -6900,12 +7053,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 427.74 547.2249999999999 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f6170704d616e69666573743e> Tj
 ET
 
@@ -6942,12 +7095,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 147.24 517.7449999999999 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f636f6e66696775726174696f6e3e> Tj
 ET
 
@@ -6964,12 +7117,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 147.24 503.00499999999994 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c646570656e64656e636965733e> Tj
 ET
 
@@ -6986,12 +7139,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 169.24 488.26499999999993 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c646570656e64656e63793e> Tj
 ET
 
@@ -7008,12 +7161,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 191.24 473.5249999999999 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c67726f757049643e> Tj
 ET
 
@@ -7030,12 +7183,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 339.74 473.5249999999999 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f67726f757049643e> Tj
 ET
 
@@ -7052,12 +7205,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 191.24 458.7849999999999 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c617274696661637449643e> Tj
 ET
 
@@ -7074,12 +7227,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 328.74 458.7849999999999 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f617274696661637449643e> Tj
 ET
 
@@ -7116,12 +7269,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 191.24 429.3049999999999 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c76657273696f6e3e> Tj
 ET
 
@@ -7138,12 +7291,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 339.74 429.3049999999999 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f76657273696f6e3e> Tj
 ET
 
@@ -7160,12 +7313,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 169.24 414.5649999999999 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f646570656e64656e63793e> Tj
 ET
 
@@ -7182,8 +7335,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.600 0.600 0.600 scn
+0.600 0.600 0.600 SCN
 
 BT
 169.24 399.8249999999999 Td
@@ -7204,12 +7357,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 169.24 385.08499999999987 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c646570656e64656e63793e> Tj
 ET
 
@@ -7226,12 +7379,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 191.24 370.34499999999986 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c67726f757049643e> Tj
 ET
 
@@ -7248,12 +7401,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 328.74 370.34499999999986 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f67726f757049643e> Tj
 ET
 
@@ -7270,12 +7423,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 191.24 355.60499999999985 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c617274696661637449643e> Tj
 ET
 
@@ -7292,12 +7445,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 284.74 355.60499999999985 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f617274696661637449643e> Tj
 ET
 
@@ -7314,12 +7467,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 191.24 340.86499999999984 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c76657273696f6e3e> Tj
 ET
 
@@ -7336,12 +7489,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 273.74 340.86499999999984 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f76657273696f6e3e> Tj
 ET
 
@@ -7358,12 +7511,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 169.24 326.12499999999983 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f646570656e64656e63793e> Tj
 ET
 
@@ -7380,12 +7533,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 147.24 311.3849999999998 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f646570656e64656e636965733e> Tj
 ET
 
@@ -7402,12 +7555,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 147.24 296.6449999999998 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c657865637574696f6e733e> Tj
 ET
 
@@ -7424,12 +7577,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 169.24 281.9049999999998 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c657865637574696f6e3e> Tj
 ET
 
@@ -7446,12 +7599,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 191.24 267.16499999999985 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c70686173653e> Tj
 ET
 
@@ -7468,12 +7621,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 251.74 267.16499999999985 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f70686173653e> Tj
 ET
 
@@ -7490,12 +7643,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 191.24 252.42499999999984 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c676f616c733e> Tj
 ET
 
@@ -7512,12 +7665,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 213.24 237.68499999999983 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c676f616c3e> Tj
 ET
 
@@ -7534,12 +7687,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 290.24 237.68499999999983 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f676f616c3e> Tj
 ET
 
@@ -7576,12 +7729,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 191.24 208.2049999999998 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f676f616c733e> Tj
 ET
 
@@ -7598,12 +7751,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 169.24 193.4649999999998 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f657865637574696f6e3e> Tj
 ET
 
@@ -7620,12 +7773,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 147.24 178.7249999999998 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f657865637574696f6e733e> Tj
 ET
 
@@ -7642,12 +7795,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 125.24000000000001 163.9849999999998 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f706c7567696e3e> Tj
 ET
 
@@ -7664,12 +7817,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 103.24000000000001 149.24499999999978 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f706c7567696e733e> Tj
 ET
 
@@ -7686,23 +7839,23 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 81.24000000000001 134.50499999999977 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f6275696c643e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 59.24 119.76499999999976 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f70726f66696c653e> Tj
 ET
 
@@ -7809,35 +7962,34 @@ Q
 
 endstream
 endobj
-61 0 obj
+60 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 60 0 R
+/Contents 59 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F4.0 51 0 R
-/F3.0 36 0 R
-/F3.1 62 0 R
+/Font << /F3.0 36 0 R
+/F3.1 61 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 174 0 R
+/XObject << /Stamp1 173 0 R
 >>
 >>
 >>
 endobj
-62 0 obj
+61 0 obj
 << /Type /Font
-/BaseFont /AAAACE+mplus1mn-regular
+/BaseFont /AAAABX+mplus1mn-regular
 /Subtype /TrueType
-/FontDescriptor 216 0 R
+/FontDescriptor 211 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 218 0 R
-/ToUnicode 217 0 R
+/Widths 213 0 R
+/ToUnicode 212 0 R
 >>
 endobj
-63 0 obj
-<< /Length 17832
+62 0 obj
+<< /Length 18544
 >>
 stream
 q
@@ -8103,18 +8255,7 @@ Q
 BT
 59.239999999999995 628.0850000000002 Td
 /F3.0 11 Tf
-<6d766e20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.200 0.533 scn
-0.000 0.200 0.533 SCN
-
-BT
-81.24 628.0850000000002 Td
-/F3.0 11 Tf
-<74657374> Tj
+<6d766e2074657374> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -8263,29 +8404,7 @@ Q
 BT
 59.239999999999995 508.0050000000003 Td
 /F3.0 11 Tf
-<6d766e20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.200 0.533 scn
-0.000 0.200 0.533 SCN
-
-BT
-81.24 508.0050000000003 Td
-/F3.0 11 Tf
-<74657374> 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
-103.24 508.0050000000003 Td
-/F3.0 11 Tf
-<202d44736b69702e697369732d76616c6964617465> Tj
+<6d766e2074657374202d44736b69702e697369732d76616c6964617465> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -8444,12 +8563,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.239999999999995 375.6250000000002 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -8488,12 +8607,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.400 0.733 scn
-0.000 0.400 0.733 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 169.24 375.6250000000002 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <7570646174654e616d65> Tj
 ET
 
@@ -8527,7 +8646,29 @@ ET
 BT
 235.24 375.6250000000002 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+240.74 375.6250000000002 Td
+/F3.0 11 Tf
+<2e> 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
+246.24 375.6250000000002 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -8593,7 +8734,29 @@ ET
 BT
 279.24 375.6250000000002 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+284.74 375.6250000000002 Td
+/F3.0 11 Tf
+<2e> 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
+290.24 375.6250000000002 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -8620,12 +8783,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.239999999999995 360.8850000000002 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -8642,8 +8805,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74 360.8850000000002 Td
@@ -8664,12 +8827,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.400 0.733 scn
-0.000 0.400 0.733 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 136.24 360.8850000000002 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <64656661756c74305570646174654e616d65> Tj
 ET
 
@@ -8736,7 +8899,29 @@ ET
 BT
 262.74 360.8850000000002 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> 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
+268.24 360.8850000000002 Td
+/F3.0 11 Tf
+<2e> 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
+273.74 360.8850000000002 Td
+/F3.0 11 Tf
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -8801,12 +8986,12 @@ f
 h
 S
 Q
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
+0.000 0.400 0.600 scn
+0.000 0.400 0.600 SCN
 
 BT
 59.239999999999995 284.3650000000001 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <7075626c6963> Tj
 ET
 
@@ -8823,8 +9008,8 @@ 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
+0.000 0.467 0.533 scn
+0.000 0.467 0.533 SCN
 
 BT
 97.74 284.3650000000001 Td
@@ -8845,12 +9030,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.000 0.400 0.733 scn
-0.000 0.400 0.733 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 136.24 284.3650000000001 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <64656661756c7430585570646174654e616d65> Tj
 ET
 
@@ -8917,7 +9102,7 @@ ET
 BT
 268.24 284.3650000000001 Td
 /F3.0 11 Tf
-<2e2e2e> Tj
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -8926,9 +9111,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-284.74 284.3650000000001 Td
+273.74 284.3650000000001 Td
 /F3.0 11 Tf
-<20> Tj
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -8937,9 +9122,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-290.24 284.3650000000001 Td
+279.24 284.3650000000001 Td
 /F3.0 11 Tf
-<7d> Tj
+<2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -8948,18 +9133,40 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.239999999999995 246.48600000000016 Td
-/F1.0 10.5 Tf
-<52756e6e696e6720> Tj
+284.74 284.3650000000001 Td
+/F3.0 11 Tf
+<20> Tj
 ET
 
 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
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-93.81 246.48600000000016 Td
+290.24 284.3650000000001 Td
+/F3.0 11 Tf
+<7d> 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.239999999999995 246.48600000000016 Td
+/F1.0 10.5 Tf
+<52756e6e696e6720> Tj
+ET
+
+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
+
+BT
+93.81 246.48600000000016 Td
 /F3.0 10.5 Tf
 <6d766e2074657374> Tj
 ET
@@ -9001,25 +9208,24 @@ Q
 
 endstream
 endobj
-64 0 obj
+63 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 63 0 R
+/Contents 62 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F3.1 62 0 R
+/Font << /F3.1 61 0 R
 /F1.0 8 0 R
 /F3.0 36 0 R
 /F2.0 16 0 R
-/F4.0 51 0 R
 >>
-/XObject << /Stamp1 174 0 R
+/XObject << /Stamp1 173 0 R
 >>
 >>
-/Annots [65 0 R 68 0 R]
+/Annots [64 0 R 67 0 R]
 >>
 endobj
-65 0 obj
+64 0 obj
 << /Border [0 0 0]
 /Dest (_rgmvn_intro_app-manifest)
 /Subtype /Link
@@ -9027,13 +9233,13 @@ endobj
 /Type /Annot
 >>
 endobj
+65 0 obj
+[63 0 R /XYZ 0 718.7700000000001 null]
+endobj
 66 0 obj
-[64 0 R /XYZ 0 718.7700000000001 null]
+[63 0 R /XYZ 0 482.09000000000026 null]
 endobj
 67 0 obj
-[64 0 R /XYZ 0 482.09000000000026 null]
-endobj
-68 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -9044,8 +9250,8 @@ endobj
 /Type /Annot
 >>
 endobj
-69 0 obj
-<< /Length 23451
+68 0 obj
+<< /Length 12277
 >>
 stream
 q
@@ -9086,18 +9292,7 @@ Q
 BT
 59.24 783.0649999999999 Td
 /F3.0 11 Tf
-<5b> 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
-64.74000000000001 783.0649999999999 Td
-/F3.0 11 Tf
-<6572726f725d> Tj
+<5b6572726f725d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9108,18 +9303,7 @@ ET
 BT
 59.24 768.3249999999999 Td
 /F3.0 11 Tf
-<5b> 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
-64.74000000000001 768.3249999999999 Td
-/F3.0 11 Tf
-<6572726f725d> Tj
+<5b6572726f725d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9130,18 +9314,7 @@ ET
 BT
 59.24 753.585 Td
 /F3.0 11 Tf
-<5b> 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
-64.74000000000001 753.585 Td
-/F3.0 11 Tf
-<6572726f725d> Tj
+<5b6572726f725d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9152,18 +9325,7 @@ ET
 BT
 59.24 738.845 Td
 /F3.0 11 Tf
-<5b> 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
-64.74000000000001 738.845 Td
-/F3.0 11 Tf
-<6572726f725d20646f6d61696e6170702e646f6d2e73696d706c652e53696d706c654f626a6563742364656661756c7430585570646174654e616d653a20686173207072656669782064656661756c742c206973> Tj
+<5b6572726f725d20646f6d61696e6170702e646f6d2e73696d706c652e53696d706c654f626a6563742364656661756c7430585570646174654e616d653a20686173207072656669782064656661756c742c206973> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9174,29 +9336,7 @@ ET
 BT
 59.24 724.105 Td
 /F3.0 11 Tf
-<70726f6261626c79206120737570706f7274696e67206d6574686f6420> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
-
-BT
-218.74 724.105 Td
-/F4.0 11 Tf
-<666f7220> 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
-240.74 724.105 Td
-/F3.0 11 Tf
-<612070726f70657274792c20636f6c6c656374696f6e206f7220616374696f6e2e2020496620746865206d6574686f64206973> Tj
+<70726f6261626c79206120737570706f7274696e67206d6574686f6420666f7220612070726f70657274792c20636f6c6c656374696f6e206f7220616374696f6e2e2020496620746865206d6574686f64206973> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9207,95 +9347,7 @@ ET
 BT
 59.24 709.365 Td
 /F3.0 11 Tf
-<696e74656e64656420746f20626520616e20616374696f6e2c20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.000 0.533 0.000 scn
-0.000 0.533 0.000 SCN
-
-BT
-202.24 709.365 Td
-/F4.0 11 Tf
-<7468656e20> 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
-229.74 709.365 Td
-/F3.0 11 Tf
-<72656e616d6520616e64207573652040416374696f6e4c61796f7574> 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
-383.74 709.365 Td
-/F3.0 11 Tf
-<28> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-389.24 709.365 Td
-/F3.0 11 Tf
-<6e616d6564> 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
-416.74 709.365 Td
-/F3.0 11 Tf
-<3d> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-422.24 709.365 Td
-/F3.0 11 Tf
-<222e2e2e22> 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
-449.74 709.365 Td
-/F3.0 11 Tf
-<29> 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
-455.24 709.365 Td
-/F3.0 11 Tf
-<206f722069676e6f7265> Tj
+<696e74656e64656420746f20626520616e20616374696f6e2c207468656e2072656e616d6520616e64207573652040416374696f6e4c61796f7574286e616d65643d222e2e2e2229206f722069676e6f7265> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9317,18 +9369,7 @@ ET
 BT
 59.24 679.885 Td
 /F3.0 11 Tf
-<5b> 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
-64.74000000000001 679.885 Td
-/F3.0 11 Tf
-<6572726f725d> Tj
+<5b6572726f725d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9339,18 +9380,7 @@ ET
 BT
 59.24 665.145 Td
 /F3.0 11 Tf
-<5b> 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
-64.74000000000001 665.145 Td
-/F3.0 11 Tf
-<6572726f725d> Tj
+<5b6572726f725d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9361,18 +9391,7 @@ ET
 BT
 59.24 650.405 Td
 /F3.0 11 Tf
-<5b> 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
-64.74000000000001 650.405 Td
-/F3.0 11 Tf
-<6572726f725d> Tj
+<5b6572726f725d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9383,18 +9402,7 @@ ET
 BT
 59.24 635.665 Td
 /F3.0 11 Tf
-<5b> 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
-64.74000000000001 635.665 Td
-/F3.0 11 Tf
-<494e464f5d202d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d> Tj
+<5b494e464f5d202d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9405,18 +9413,7 @@ ET
 BT
 59.24 620.925 Td
 /F3.0 11 Tf
-<5b> 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
-64.74000000000001 620.925 Td
-/F3.0 11 Tf
-<494e464f5d2052656163746f722053756d6d6172793a> Tj
+<5b494e464f5d2052656163746f722053756d6d6172793a> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9427,18 +9424,7 @@ ET
 BT
 59.24 606.185 Td
 /F3.0 11 Tf
-<5b> 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
-64.74000000000001 606.185 Td
-/F3.0 11 Tf
-<494e464f5d> Tj
+<5b494e464f5d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9449,40 +9435,7 @@ ET
 BT
 59.24 591.4449999999999 Td
 /F3.0 11 Tf
-<5b> 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
-64.74000000000001 591.4449999999999 Td
-/F3.0 11 Tf
-<494e464f5d2053696d706c6520417070202e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e205355434345535320> 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
-433.24 591.4449999999999 Td
-/F3.0 11 Tf
-<5b> 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
-438.74 591.4449999999999 Td
-/F3.0 11 Tf
-<2020302e30383720735d> Tj
+<5b494e464f5d2053696d706c6520417070202e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2053554343455353205b2020302e30383720735d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9493,7 +9446,7 @@ ET
 BT
 59.24 576.7049999999999 Td
 /F3.0 11 Tf
-<5b> Tj
+<5b494e464f5d2053696d706c652041707020444f4d202e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e204641494c555245205b2020342e31383220735d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9502,9 +9455,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-64.74000000000001 576.7049999999999 Td
+59.24 561.9649999999999 Td
 /F3.0 11 Tf
-<494e464f5d2053696d706c652041707020444f4d202e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e204641494c55524520> Tj
+<5b494e464f5d2053696d706c6520417070204669787475726573202e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e20534b4950504544> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9513,9 +9466,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-433.24 576.7049999999999 Td
+59.24 547.2249999999999 Td
 /F3.0 11 Tf
-<5b> Tj
+<5b494e464f5d2053696d706c6520417070204170706c69636174696f6e202e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e20534b4950504544> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9524,9 +9477,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-438.74 576.7049999999999 Td
+59.24 532.4849999999999 Td
 /F3.0 11 Tf
-<2020342e31383220735d> Tj
+<5b494e464f5d2053696d706c652041707020496e746567726174696f6e205465737473202e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e20534b4950504544> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9535,9 +9488,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24 561.9649999999999 Td
+59.24 517.7449999999999 Td
 /F3.0 11 Tf
-<5b> Tj
+<5b494e464f5d2053696d706c652041707020576562617070202e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e20534b4950504544> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9546,9 +9499,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-64.74000000000001 561.9649999999999 Td
+59.24 503.00499999999994 Td
 /F3.0 11 Tf
-<494e464f5d2053696d706c6520417070204669787475726573202e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e20534b4950504544> Tj
+<5b494e464f5d202d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9557,9 +9510,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24 547.2249999999999 Td
+59.24 488.26499999999993 Td
 /F3.0 11 Tf
-<5b> Tj
+<5b494e464f5d204255494c44204641494c555245> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9568,9 +9521,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-64.74000000000001 547.2249999999999 Td
+59.24 473.5249999999999 Td
 /F3.0 11 Tf
-<494e464f5d2053696d706c6520417070204170706c69636174696f6e202e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e20534b4950504544> Tj
+<5b494e464f5d202d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9579,9 +9532,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24 532.4849999999999 Td
+59.24 458.7849999999999 Td
 /F3.0 11 Tf
-<5b> Tj
+<5b494e464f5d202e2e2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9590,9 +9543,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-64.74000000000001 532.4849999999999 Td
+59.24 444.0449999999999 Td
 /F3.0 11 Tf
-<494e464f5d2053696d706c652041707020496e746567726174696f6e205465737473202e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e20534b4950504544> Tj
+<5b4552524f525d204661696c656420746f206578656375746520676f616c206f72672e6170616368652e697369732e746f6f6c3a697369732d6d6176656e2d706c7567696e3a312e31332e303a76616c6964617465> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9601,196 +9554,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24 517.7449999999999 Td
+59.24 429.3049999999999 Td
 /F3.0 11 Tf
-<5b> 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
-64.74000000000001 517.7449999999999 Td
-/F3.0 11 Tf
-<494e464f5d2053696d706c652041707020576562617070202e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e20534b4950504544> 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
-59.24 503.00499999999994 Td
-/F3.0 11 Tf
-<5b> 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
-64.74000000000001 503.00499999999994 Td
-/F3.0 11 Tf
-<494e464f5d202d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d> 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
-59.24 488.26499999999993 Td
-/F3.0 11 Tf
-<5b> 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
-64.74000000000001 488.26499999999993 Td
-/F3.0 11 Tf
-<494e464f5d204255494c44204641494c555245> 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
-59.24 473.5249999999999 Td
-/F3.0 11 Tf
-<5b> 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
-64.74000000000001 473.5249999999999 Td
-/F3.0 11 Tf
-<494e464f5d202d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d> 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
-59.24 458.7849999999999 Td
-/F3.0 11 Tf
-<5b> 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
-64.74000000000001 458.7849999999999 Td
-/F3.0 11 Tf
-<494e464f5d202e2e2e> 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
-59.24 444.0449999999999 Td
-/F3.0 11 Tf
-<5b> 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
-64.74000000000001 444.0449999999999 Td
-/F3.0 11 Tf
-<4552524f525d204661696c656420746f206578656375746520676f616c206f72672e6170616368652e697369732e746f6f6c3a697369732d6d6176656e2d706c7567696e3a312e31332e303a76616c6964617465> 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
-59.24 429.3049999999999 Td
-/F3.0 11 Tf
-<28> 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
-64.74000000000001 429.3049999999999 Td
-/F3.0 11 Tf
-<64656661756c74> 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
-103.24000000000001 429.3049999999999 Td
-/F3.0 11 Tf
-<29> 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
-108.74000000000001 429.3049999999999 Td
-/F3.0 11 Tf
-<206f6e2070726f6a6563742073696d706c656170702d646f6d3a20312070726f626c656d7320666f756e642e202d3e20> 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
-372.74 429.3049999999999 Td
-/F3.0 11 Tf
-<5b> 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
-378.24 429.3049999999999 Td
-/F3.0 11 Tf
-<48656c7020315d> Tj
+<2864656661756c7429206f6e2070726f6a6563742073696d706c656170702d646f6d3a20312070726f626c656d7320666f756e642e202d3e205b48656c7020315d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9801,469 +9567,33 @@ ET
 2.036 Tw
 
 BT
-48.24 391.4259999999999 Td
-/F1.0 10.5 Tf
-<4966206f6e65207765726520746f20617474656d707420746f2072756e20746865206170706c69636174696f6e2c207468652073616d65206572726f7220776f756c642061707065617220696e20746865206c6f672066696c6573206f6e> 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
-48.24 375.64599999999984 Td
-/F1.0 10.5 Tf
-<737461727475702028616e6420746865206170706c69636174696f6e20776f756c64206e6f7420626f6f74292e> 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 335.80599999999987 Td
-/F2.0 18 Tf
-<332e342e20437573746f6d2076616c69646174696f6e2072756c6573> 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
-
-2.047 Tw
-
-BT
-48.24 307.78599999999983 Td
-/F1.0 10.5 Tf
-<497420697320616c736f20706f737369626c6520746f20637573746f6d697a65207468652076616c69646174696f6e2c206578706c61696e656420> 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.047 Tw
-
-BT
-346.51224609375 307.78599999999983 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.047 Tw
-
-BT
-369.34974609374996 307.78599999999983 Td
-/F1.0 10.5 Tf
-[<2e202046> 40.0390625 <6f72206578616d706c652c20796f7520636f756c6420656e666f726365>] 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
-
-0.628 Tw
-
-BT
-48.24 292.00599999999986 Td
-/F1.0 10.5 Tf
-[<70726f6a6563742d737065636966696320636f6e76656e74696f6e732062> 20.01953125 <7920696d706c656d656e74696e67206120637573746f6d20>] TJ
-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
-
-0.628 Tw
-
-BT
-330.02481796874997 292.00599999999986 Td
-/F3.0 10.5 Tf
-<4d6574614d6f64656c56616c696461746f72> 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
-
-0.628 Tw
-
-BT
-424.52481796874997 292.00599999999986 Td
-/F1.0 10.5 Tf
-<2c20616e64207265676973746572696e67207573696e672061> 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
-48.24 276.22599999999983 Td
-/F1.0 10.5 Tf
-[<636f6e6669677572> 20.01953125 <6174696f6e2070726f7065727479> 89.84375 <2e>] 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 248.44599999999986 Td
-/F1.0 10.5 Tf
-[<54> 29.78515625 <6f20737570706f72742074686973207573696e6720>] TJ
-ET
-
-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
-
-BT
-155.856755859375 248.44599999999986 Td
-/F3.0 10.5 Tf
-<4170704d616e696665737460732c206f76657272696465206974732060676574436f6e66696775726174696f6e50726f706572746965732829> 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
-455.106755859375 248.44599999999986 Td
-/F1.0 10.5 Tf
-<206d6574686f643a> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-q
-0.961 0.961 0.961 scn
-52.240 232.630 m
-543.040 232.630 l
-545.249 232.630 547.040 230.839 547.040 228.630 c
-547.040 81.970 l
-547.040 79.761 545.249 77.970 543.040 77.970 c
-52.240 77.970 l
-50.031 77.970 48.240 79.761 48.240 81.970 c
-48.240 228.630 l
-48.240 230.839 50.031 232.630 52.240 232.630 c
-h
-f
-0.800 0.800 0.800 SCN
-0.75 w
-52.240 232.630 m
-543.040 232.630 l
-545.249 232.630 547.040 230.839 547.040 228.630 c
-547.040 81.970 l
-547.040 79.761 545.249 77.970 543.040 77.970 c
-52.240 77.970 l
-50.031 77.970 48.240 79.761 48.240 81.970 c
-48.240 228.630 l
-48.240 230.839 50.031 232.630 52.240 232.630 c
-h
-S
-Q
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
-
-BT
-59.24 209.80499999999984 Td
-/F3.0 11 Tf
-<7075626c6963> 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
-92.24000000000001 209.80499999999984 Td
-/F3.0 11 Tf
-<20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
-
-BT
-97.74000000000001 209.80499999999984 Td
-/F3.0 11 Tf
-<636c617373> 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
-125.24000000000001 209.80499999999984 Td
-/F3.0 11 Tf
-<20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
-
-BT
-130.74 209.80499999999984 Td
-/F3.0 11 Tf
-<446f6d61696e417070446f6d4d616e6966657374> 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
-240.74 209.80499999999984 Td
-/F3.0 11 Tf
-<20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
-
-BT
-246.24 209.80499999999984 Td
-/F3.0 11 Tf
-<696d706c656d656e7473> 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
-301.24 209.80499999999984 Td
-/F3.0 11 Tf
-<20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
-
-BT
-306.74 209.80499999999984 Td
-/F3.0 11 Tf
-<4170704d616e6966657374> 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
-367.24 209.80499999999984 Td
-/F3.0 11 Tf
-<20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
-
-BT
-372.74 209.80499999999984 Td
-/F3.0 11 Tf
-<7b> 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
-59.24 195.06499999999986 Td
-/F3.0 11 Tf
-<ca202020> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
-
-BT
-81.24000000000001 195.06499999999986 Td
-/F3.0 11 Tf
-<2e2e2e> 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
-59.24 180.32499999999985 Td
-/F3.0 11 Tf
-<ca202020> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
-
-BT
-81.24000000000001 180.32499999999985 Td
-/F3.0 11 Tf
-<7075626c6963> 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
-114.24000000000001 180.32499999999985 Td
-/F3.0 11 Tf
-<20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
-
-BT
-119.74000000000001 180.32499999999985 Td
-/F3.0 11 Tf
-<4d61703c537472696e672c> 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
-180.24 180.32499999999985 Td
-/F3.0 11 Tf
-<20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
-
-BT
-185.74 180.32499999999985 Td
-/F3.0 11 Tf
-<537472696e673e> 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
-224.24 180.32499999999985 Td
-/F3.0 11 Tf
-<20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
-
-BT
-229.74 180.32499999999985 Td
-/F3.0 11 Tf
-<676574436f6e66696775726174696f6e50726f706572746965732829> 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
-383.74 180.32499999999985 Td
-/F3.0 11 Tf
-<20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
-
-BT
-389.24 180.32499999999985 Td
-/F3.0 11 Tf
-<7b> Tj
+48.24 391.4259999999999 Td
+/F1.0 10.5 Tf
+<4966206f6e65207765726520746f20617474656d707420746f2072756e20746865206170706c69636174696f6e2c207468652073616d65206572726f7220776f756c642061707065617220696e20746865206c6f672066696c6573206f6e> 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
-59.24 165.58499999999984 Td
-/F3.0 11 Tf
-<ca20202020202020> Tj
+48.24 375.64599999999984 Td
+/F1.0 10.5 Tf
+<737461727475702028616e6420746865206170706c69636174696f6e20776f756c64206e6f7420626f6f74292e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-103.24000000000001 165.58499999999984 Td
-/F3.0 11 Tf
-<66696e616c> Tj
+48.24 335.80599999999987 Td
+/F2.0 18 Tf
+<332e342e20437573746f6d2076616c69646174696f6e2072756c6573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -10271,87 +9601,100 @@ ET
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
+2.047 Tw
+
 BT
-130.74 165.58499999999984 Td
-/F3.0 11 Tf
-<20> Tj
+48.24 307.78599999999983 Td
+/F1.0 10.5 Tf
+<497420697320616c736f20706f737369626c6520746f20637573746f6d697a65207468652076616c69646174696f6e2c206578706c61696e656420> Tj
 ET
 
+
+0.000 Tw
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+2.047 Tw
 
 BT
-136.24 165.58499999999984 Td
-/F3.0 11 Tf
-<4d61703c537472696e672c> Tj
+346.51224609375 307.78599999999983 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
 
-BT
-196.74 165.58499999999984 Td
-/F3.0 11 Tf
-<20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+2.047 Tw
 
 BT
-202.24 165.58499999999984 Td
-/F3.0 11 Tf
-<537472696e673e> Tj
+369.34974609374996 307.78599999999983 Td
+/F1.0 10.5 Tf
+[<2e202046> 40.0390625 <6f72206578616d706c652c20796f7520636f756c6420656e666f726365>] 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
 
+0.628 Tw
+
 BT
-240.74 165.58499999999984 Td
-/F3.0 11 Tf
-<20> Tj
+48.24 292.00599999999986 Td
+/F1.0 10.5 Tf
+[<70726f6a6563742d737065636966696320636f6e76656e74696f6e732062> 20.01953125 <7920696d706c656d656e74696e67206120637573746f6d20>] TJ
 ET
 
+
+0.000 Tw
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+0.628 Tw
 
 BT
-246.24 165.58499999999984 Td
-/F4.0 11 Tf
-<6d6170> Tj
+330.02481796874997 292.00599999999986 Td
+/F3.0 10.5 Tf
+<4d6574614d6f64656c56616c696461746f72> 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
 
+0.628 Tw
+
 BT
-262.74 165.58499999999984 Td
-/F3.0 11 Tf
-<20> Tj
+424.52481796874997 292.00599999999986 Td
+/F1.0 10.5 Tf
+<2c20616e64207265676973746572696e67207573696e672061> 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
-268.24 165.58499999999984 Td
-/F3.0 11 Tf
-<3d> Tj
+48.24 276.22599999999983 Td
+/F1.0 10.5 Tf
+[<636f6e6669677572> 20.01953125 <6174696f6e2070726f7065727479> 89.84375 <2e>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -10360,20 +9703,20 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-273.74 165.58499999999984 Td
-/F3.0 11 Tf
-<20> Tj
+48.24 248.44599999999986 Td
+/F1.0 10.5 Tf
+[<54> 29.78515625 <6f20737570706f72742074686973207573696e6720>] TJ
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
 
 BT
-279.24 165.58499999999984 Td
-/F3.0 11 Tf
-<4d6170732e6e6577547265654d617028293b> Tj
+155.856755859375 248.44599999999986 Td
+/F3.0 10.5 Tf
+<4170704d616e696665737460732c206f76657272696465206974732060676574436f6e66696775726174696f6e50726f706572746965732829> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -10382,31 +9725,58 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24 150.84499999999986 Td
-/F3.0 11 Tf
-<ca> Tj
+455.106755859375 248.44599999999986 Td
+/F1.0 10.5 Tf
+<206d6574686f643a> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+q
+0.961 0.961 0.961 scn
+52.240 232.630 m
+543.040 232.630 l
+545.249 232.630 547.040 230.839 547.040 228.630 c
+547.040 81.970 l
+547.040 79.761 545.249 77.970 543.040 77.970 c
+52.240 77.970 l
+50.031 77.970 48.240 79.761 48.240 81.970 c
+48.240 228.630 l
+48.240 230.839 50.031 232.630 52.240 232.630 c
+h
+f
+0.800 0.800 0.800 SCN
+0.75 w
+52.240 232.630 m
+543.040 232.630 l
+545.249 232.630 547.040 230.839 547.040 228.630 c
+547.040 81.970 l
+547.040 79.761 545.249 77.970 543.040 77.970 c
+52.240 77.970 l
+50.031 77.970 48.240 79.761 48.240 81.970 c
+48.240 228.630 l
+48.240 230.839 50.031 232.630 52.240 232.630 c
+h
+S
+Q
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-59.24 136.10499999999985 Td
+59.24 209.80499999999984 Td
 /F3.0 11 Tf
-<6d61702e7075742822697369732e7265666c6563746f722e76616c696461746f72222c22636f6d2e6d79636f6d70616e792e6d796170702e4d794d6574614d6f64656c56616c696461746f722229> Tj
+<7075626c696320636c61737320446f6d61696e417070446f6d4d616e696665737420696d706c656d656e7473204170704d616e6966657374207b> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-488.24 136.10499999999985 Td
+59.24 195.06499999999986 Td
 /F3.0 11 Tf
-<3b> Tj
+<ca2020202e2e2e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -10415,20 +9785,20 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-59.24 121.36499999999985 Td
+59.24 180.32499999999985 Td
 /F3.0 11 Tf
-<ca20202020202020> Tj
+<ca2020207075626c6963204d61703c537472696e672c20537472696e673e20676574436f6e66696775726174696f6e50726f706572746965732829207b> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-103.24000000000001 121.36499999999985 Td
+59.24 165.58499999999984 Td
 /F3.0 11 Tf
-<72657475726e> Tj
+<ca2020202020202066696e616c204d61703c537472696e672c20537472696e673e206d6170203d204d6170732e6e6577547265654d617028293b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -10437,31 +9807,31 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-136.24 121.36499999999985 Td
+59.24 150.84499999999986 Td
 /F3.0 11 Tf
-<20> Tj
+<ca> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-141.74 121.36499999999985 Td
+59.24 136.10499999999985 Td
 /F3.0 11 Tf
-<6d6170> Tj
+<6d61702e7075742822697369732e7265666c6563746f722e76616c696461746f72222c22636f6d2e6d79636f6d70616e792e6d796170702e4d794d6574614d6f64656c56616c696461746f7222293b> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-158.24 121.36499999999985 Td
+59.24 121.36499999999985 Td
 /F3.0 11 Tf
-<3b> Tj
+<ca2020202020202072657475726e206d61703b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -10472,24 +9842,13 @@ ET
 BT
 59.24 106.62499999999986 Td
 /F3.0 11 Tf
-<ca202020> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
-
-BT
-81.24000000000001 106.62499999999986 Td
-/F3.0 11 Tf
-<7d> Tj
+<ca2020207d> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.651 0.090 0.090 scn
-0.651 0.090 0.090 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
 59.24 91.88499999999986 Td
@@ -10523,27 +9882,26 @@ Q
 
 endstream
 endobj
-70 0 obj
+69 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 69 0 R
+/Contents 68 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F3.0 36 0 R
-/F4.0 51 0 R
 /F1.0 8 0 R
 /F2.0 16 0 R
 >>
-/XObject << /Stamp1 174 0 R
+/XObject << /Stamp1 173 0 R
 >>
 >>
-/Annots [72 0 R]
+/Annots [71 0 R]
 >>
 endobj
-71 0 obj
-[70 0 R /XYZ 0 359.82999999999987 null]
+70 0 obj
+[69 0 R /XYZ 0 359.82999999999987 null]
 endobj
-72 0 obj
+71 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -10554,7 +9912,7 @@ endobj
 /Type /Annot
 >>
 endobj
-73 0 obj
+72 0 obj
 << /Length 22363
 >>
 stream
@@ -10688,12 +10046,12 @@ f
 h
 S
 Q
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 59.24 704.225 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c70726f66696c653e> Tj
 ET
 
@@ -10710,12 +10068,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 81.24000000000001 689.485 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c69643e> Tj
 ET
 
@@ -10732,12 +10090,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 174.74 689.485 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f69643e> Tj
 ET
 
@@ -10754,12 +10112,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 81.24000000000001 674.7450000000001 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c61637469766174696f6e3e> Tj
 ET
 
@@ -10776,12 +10134,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 103.24000000000001 660.0050000000001 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c616374697665427944656661756c743e> Tj
 ET
 
@@ -10798,12 +10156,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 224.24 660.0050000000001 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f616374697665427944656661756c743e> Tj
 ET
 
@@ -10840,12 +10198,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 81.24000000000001 630.5250000000001 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f61637469766174696f6e3e> Tj
 ET
 
@@ -10862,12 +10220,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 81.24000000000001 615.7850000000001 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c6275696c643e> Tj
 ET
 
@@ -10884,12 +10242,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 103.24000000000001 601.0450000000001 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c706c7567696e733e> Tj
 ET
 
@@ -10906,12 +10264,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 125.24000000000001 586.3050000000001 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c706c7567696e3e> Tj
 ET
 
@@ -10928,12 +10286,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 147.24 571.565 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c67726f757049643e> Tj
 ET
 
@@ -10950,12 +10308,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 306.74 571.565 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f67726f757049643e> Tj
 ET
 
@@ -10972,12 +10330,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 147.24 556.825 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c617274696661637449643e> Tj
 ET
 
@@ -10994,12 +10352,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 306.74 556.825 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f617274696661637449643e> Tj
 ET
 
@@ -11016,12 +10374,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 147.24 542.085 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c76657273696f6e3e> Tj
 ET
 
@@ -11038,12 +10396,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 224.24 542.085 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f76657273696f6e3e> Tj
 ET
 
@@ -11060,12 +10418,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 147.24 527.345 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c636f6e66696775726174696f6e3e> Tj
 ET
 
@@ -11082,12 +10440,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 169.24 512.605 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c69736973436f6e6669674469723e> Tj
 ET
 
@@ -11104,12 +10462,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 433.24 512.605 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f69736973436f6e6669674469723e> Tj
 ET
 
@@ -11146,12 +10504,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 147.24 483.125 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f636f6e66696775726174696f6e3e> Tj
 ET
 
@@ -11168,12 +10526,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 147.24 468.385 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c646570656e64656e636965733e> Tj
 ET
 
@@ -11190,12 +10548,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 169.24 453.64500000000004 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c646570656e64656e63793e> Tj
 ET
 
@@ -11212,12 +10570,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 191.24 438.90500000000003 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c67726f757049643e> Tj
 ET
 
@@ -11234,12 +10592,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 433.24 438.90500000000003 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f67726f757049643e> Tj
 ET
 
@@ -11256,12 +10614,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 191.24 424.165 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c617274696661637449643e> Tj
 ET
 
@@ -11278,12 +10636,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 328.74 424.165 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f617274696661637449643e> Tj
 ET
 
@@ -11300,12 +10658,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 191.24 409.425 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c76657273696f6e3e> Tj
 ET
 
@@ -11322,12 +10680,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 268.24 409.425 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f76657273696f6e3e> Tj
 ET
 
@@ -11344,12 +10702,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 169.24 394.685 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f646570656e64656e63793e> Tj
 ET
 
@@ -11366,8 +10724,8 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.600 0.600 0.600 scn
+0.600 0.600 0.600 SCN
 
 BT
 169.24 379.945 Td
@@ -11388,12 +10746,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 169.24 365.205 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c646570656e64656e63793e> Tj
 ET
 
@@ -11410,12 +10768,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 191.24 350.465 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c67726f757049643e> Tj
 ET
 
@@ -11432,12 +10790,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 328.74 350.465 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f67726f757049643e> Tj
 ET
 
@@ -11454,12 +10812,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 191.24 335.72499999999997 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c617274696661637449643e> Tj
 ET
 
@@ -11476,12 +10834,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 284.74 335.72499999999997 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f617274696661637449643e> Tj
 ET
 
@@ -11498,12 +10856,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 191.24 320.98499999999996 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c76657273696f6e3e> Tj
 ET
 
@@ -11520,12 +10878,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 273.74 320.98499999999996 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f76657273696f6e3e> Tj
 ET
 
@@ -11542,12 +10900,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 169.24 306.24499999999995 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f646570656e64656e63793e> Tj
 ET
 
@@ -11564,12 +10922,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 147.24 291.50499999999994 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f646570656e64656e636965733e> Tj
 ET
 
@@ -11586,12 +10944,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 147.24 276.76499999999993 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c657865637574696f6e733e> Tj
 ET
 
@@ -11608,12 +10966,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 169.24 262.0249999999999 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c657865637574696f6e3e> Tj
 ET
 
@@ -11630,12 +10988,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 191.24 247.2849999999999 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c70686173653e> Tj
 ET
 
@@ -11652,12 +11010,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 251.74 247.2849999999999 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f70686173653e> Tj
 ET
 
@@ -11674,12 +11032,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 191.24 232.5449999999999 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c676f616c733e> Tj
 ET
 
@@ -11696,12 +11054,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 213.24 217.8049999999999 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c676f616c3e> Tj
 ET
 
@@ -11718,12 +11076,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 290.24 217.8049999999999 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f676f616c3e> Tj
 ET
 
@@ -11740,12 +11098,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 191.24 203.06499999999988 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f676f616c733e> Tj
 ET
 
@@ -11762,12 +11120,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 169.24 188.32499999999993 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f657865637574696f6e3e> Tj
 ET
 
@@ -11784,12 +11142,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 147.24 173.58499999999992 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f657865637574696f6e733e> Tj
 ET
 
@@ -11806,12 +11164,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 125.24000000000001 158.8449999999999 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f706c7567696e3e> Tj
 ET
 
@@ -11828,12 +11186,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 103.24000000000001 144.1049999999999 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f706c7567696e733e> Tj
 ET
 
@@ -11850,23 +11208,23 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 81.24000000000001 129.3649999999999 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f6275696c643e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 59.24 114.62499999999989 Td
-/F4.0 11 Tf
+/F3.0 11 Tf
 <3c2f70726f66696c653e> Tj
 ET
 
@@ -12028,28 +11386,27 @@ Q
 
 endstream
 endobj
-74 0 obj
+73 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 73 0 R
+/Contents 72 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 16 0 R
 /F1.0 8 0 R
 /F3.0 36 0 R
-/F

<TRUNCATED>

[31/44] isis-site git commit: ISIS-1594: provide an 'edit' button

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/guides/rgfis.html
----------------------------------------------------------------------
diff --git a/content/guides/rgfis.html b/content/guides/rgfis.html
index c363240..8e42879 100644
--- a/content/guides/rgfis.html
+++ b/content/guides/rgfis.html
@@ -1,12 +1,10 @@
 <!doctype html>
 <html class="no-js" lang="en">
-<head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-
-    <title>Framework Internal Services</title>
-
-    <!--
+ <head> 
+  <meta charset="utf-8"> 
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"> 
+  <title>Framework Internal Services</title> 
+  <!--
         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
@@ -23,31 +21,21 @@
         KIND, either express or implied.  See the License for the
         specific language governing permissions and limitations
         under the License.
-    -->
-
-    <!-- No caching headers -->
-    <meta http-equiv="cache-control" content="no-cache" />
-    <meta http-equiv="pragma" content="no-cache" />
-    <meta http-equiv="expires" content="-1" />
-
-
-    <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
-    <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet" />
-    <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script>
-    <link href="../css/asciidoctor/colony.css" rel="stylesheet">
-    <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-
-
-
-    <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
-    <!--[if lt IE 9]>
+    --> 
+  <!-- No caching headers --> 
+  <meta http-equiv="cache-control" content="no-cache"> 
+  <meta http-equiv="pragma" content="no-cache"> 
+  <meta http-equiv="expires" content="-1"> 
+  <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line --> 
+  <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet"> 
+  <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script> 
+  <link href="../css/asciidoctor/colony.css" rel="stylesheet"> 
+  <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet"> 
+  <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet"> 
+  <!--[if lt IE 9]>
       <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
-    <![endif]-->
-
-
-
-    <style type="text/css">
+    <![endif]--> 
+  <style type="text/css">
         pre code {
             background-color: inherit;
             border-style: none;
@@ -192,9 +180,8 @@ table.CodeRay td.code>pre{padding:0}
         color:#fff;
         font-size: 1.1em;
     }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         @media only screen and (min-width: 40.063em) {
           .top-bar {
             .contain-to-grid .top-bar {
@@ -205,9 +192,8 @@ table.CodeRay td.code>pre{padding:0}
         .row {
             max-width: 80rem;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .extended-quote,
         .extended-quote-first {
             margin-left: 40px;
@@ -231,9 +217,8 @@ table.CodeRay td.code>pre{padding:0}
             text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
         }
         
-    </style>
-
-    <style>
+    </style> 
+  <style>
         body {
           position: relative;
         }
@@ -255,6 +240,7 @@ table.CodeRay td.code>pre{padding:0}
 
         div#doc-content {
             margin-top: 30px;
+            padding-top: 30px;
         }
 
         div.documentation-page table.frame-all {
@@ -286,9 +272,8 @@ table.CodeRay td.code>pre{padding:0}
             min-height: 2000px;
         }
 
-    </style>
-
-    <style>
+    </style> 
+  <style>
 
         @media only screen and (min-width: 768px) {
           #toc.toc2 ul ul { margin-left: -10px; }
@@ -316,15 +301,13 @@ table.CodeRay td.code>pre{padding:0}
         body div#toc2 li.tocify-item.active a {
             color: red;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         footer {
             margin-top: 1000px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* overriding colony.css stylesheet */
         .literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
            /*padding: 1.25em 1.5625em 1.125em 1.5625em;*/
@@ -372,9 +355,8 @@ table.CodeRay td.code>pre{padding:0}
         .imageblock img {
             margin-bottom: 10px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* from http://ben.balter.com/2014/03/13/pages-anchor-links/ */
         .header-link {
           position: absolute;
@@ -395,9 +377,8 @@ table.CodeRay td.code>pre{padding:0}
         h6:hover .header-link {
           opacity: 1;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .top-bar
         {
             -webkit-transition-duration: .5s;
@@ -425,314 +406,234 @@ table.CodeRay td.code>pre{padding:0}
             -webkit-transition-property: -webkit-transform;
             transition-property: transform;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         #doc-content a.guide {
             color: white;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
+        .tocify {
+            margin-top: 80px;
+        }
+    </style> 
+  <style>
         .tocify {
             margin-top: 80px;
         }
-    </style>
-
-
-</script>
-
-</head>
-<body>
-
-<<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
-    <div class="github-fork-ribbon">
-        <a href="https://github.com/apache/isis#fork-destination-box">Fork me on GitHub</a>
-    </div>
-</div>
-
-
-<div class="row">
-
-    <div class="fixed contain-to-grid header">
-        <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
-            <ul class="title-area">
-                <li class="name">
-                    <h1>
-                        <a href="/index.html">Apache Isis&trade;</a>
-                    </h1>
-                </li>
-                <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
-                <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
-            </ul>
-
-            <section class="top-bar-section">
-                <ul class="right">
-
-                    <li class="has-form">
-                       <FORM class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
-                        <div class="row collapse">
-                            <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
-                            <INPUT type="hidden" name="cof" value="FORID:0">
-                            <INPUT class="form-control" name="q" type="text" placeholder="Search">
-                        </div>
-                    </FORM>
-                     </li>
-
-                </ul>
-
-                <!-- Left Nav Section -->
-                <ul class="left">
-
-                    <li><a href="/documentation.html">Documentation</a></li>
-                    <li><a href="/downloads.html">Downloads</a></li>
-                    <li><a href="/help.html">Help</a></li>
-                    <li><a href="/asf.html">@ASF</a></li>
-
-                </ul>
-
-            </section>
-        </nav>
-    </div>
-</div>
-
-<div class="row">
-
-    <div id="doc-content-left" class="large-9 medium-9 columns">
-
-
-        <div id="doc-content">
-          <div class="sect1">
-<h2 id="_rgfis">1. Framework Internal Services</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>This guide documents a number of domain services that are not part of the framework&#8217;s formal API, they use classes that are outside of the applib.  They should be
-thought of as part of the internal design of the framework, and are liable to change from release to release.</p>
-</div>
-<div class="admonitionblock warning">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-warning" title="Warning"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>We do not guarantee that <a href="http://semver.org">semantic versioning</a> will be honoured for these services.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="sect2">
-<h3 id="_other_guides">1.1. Other Guides</h3>
-<div class="paragraph">
-<p>Apache Isis documentation is broken out into a number of user, reference and "supporting procedures" guides.</p>
-</div>
-<div class="paragraph">
-<p>The user guides available are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="ugfun.html">Fundamentals</a></p>
-</li>
-<li>
-<p><a href="ugvw.html">Wicket viewer</a></p>
-</li>
-<li>
-<p><a href="ugvro.html">Restful Objects viewer</a></p>
-</li>
-<li>
-<p><a href="ugdno.html">DataNucleus object store</a></p>
-</li>
-<li>
-<p><a href="ugsec.html">Security</a></p>
-</li>
-<li>
-<p><a href="ugtst.html">Testing</a></p>
-</li>
-<li>
-<p><a href="ugbtb.html">Beyond the Basics</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The reference guides are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="rgant.html">Annotations</a></p>
-</li>
-<li>
-<p><a href="rgsvc.html">Domain Services</a></p>
-</li>
-<li>
-<p><a href="rgcfg.html">Configuration Properties</a></p>
-</li>
-<li>
-<p><a href="rgcms.html">Classes, Methods and Schema</a></p>
-</li>
-<li>
-<p><a href="rgmvn.html">Apache Isis Maven plugin</a></p>
-</li>
-<li>
-<p><a href="#">Framework Internal Services</a> (this guide)</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The remaining guides are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="dg.html">Developers' Guide</a> (how to set up a development environment for Apache Isis and contribute back to the project)</p>
-</li>
-<li>
-<p><a href="cgcom.html">Committers' Guide</a> (release procedures and related practices)</p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_rgfis_presentation-layer">2. Presentation Layer</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>These domain services are internal to the framework, controlling various aspects of the presentation layer.</p>
-</div>
-<div class="paragraph">
-<p>The table below summarizes the presentation layer internal SPIs defined by Apache Isis.  It also lists their
-corresponding implementation, either a default implementation provided by Apache Isis itself, or provided by one of the
-(non-ASF) <a href="http://www.isisaddons.org">Isis Addons</a> modules.</p>
-</div>
-<table class="tableblock frame-all grid-all spread">
-<caption class="title">Table 1. Internal Services</caption>
-<colgroup>
-<col style="width: 30%;">
-<col style="width: 30%;">
-<col style="width: 20%;">
-<col style="width: 20%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">SPI</th>
-<th class="tableblock halign-left valign-top">Maven Module<br>
-Impl&#8217;n (g: a:)</th>
-<th class="tableblock halign-left valign-top">Implementation</th>
-<th class="tableblock halign-left valign-top">Notes</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgfis_spi_ContentNegotiationService"><code>o.a.i.v.ro.</code><br>
-<code>rendering.service.conneg.</code><br>
-<code>ContentNegotiationService</code></a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Encodes the algorithm that delegates to any registered <a href="rgsvc.html#_rgsvc_spi_ContentMappingService"><code>ContentMappingService</code></a>s.</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>ContentNegotiationService-</code><br>
-<code>XRoDomainType</code><br>
-<code>o.a.i.core</code><br>
-<code>isis-core-viewer-restfulobjects-rendering</code></p></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgfis_spi_RepresentationService"><code>o.a.i.v.ro.</code><br>
-<code>rendering.service.</code><br>
-<code>RepresentationService</code></a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Generates the representations, delegating to any registered <a href="#_rgfis_spi_ContentNegotiationService"><code>ContentNegotiationService</code></a>s.</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>RepresentationService-</code><br>
-<code>ForRestfulObjects</code><br>
-<code>o.a.i.core</code><br>
-<code>isis-core-viewer-restfulobjects-rendering</code></p></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-</tbody>
-</table>
-<div class="paragraph">
-<p>Key:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><code>o.a.i</code> is an abbreviation for <code>org.apache.isis</code></p>
-</li>
-<li>
-<p><code>o.ia.m</code> is an abbreviation for <code>org.isisaddons.module</code></p>
-</li>
-<li>
-<p><code>o.a.i.c.m.s</code> is an abbreviation for <code>org.apache.isis.core.metamodel.services</code></p>
-</li>
-<li>
-<p><code>o.a.i.c.r.s</code> is an abbreviation for <code>org.apache.isis.core.runtime.services</code></p>
-</li>
-<li>
-<p><code>o.a.i.v.ro</code> is an abbreviation for <code>org.apache.isis.viewer.restfulobjects</code></p>
-</li>
-</ul>
-</div>
-<div class="sect2">
-<h3 id="_rgfis_spi_ContentNegotiationService">2.1. <code>ContentNegotiationService</code></h3>
-<div class="paragraph">
-<p>The <code>ContentNegotiationService</code> is a plug-in point for the <a href="ugvro.html">RestfulObjects viewer</a> so that it can generate representations according to HTTP <code>Accept</code> header of the request.  This idea is discussed in section 34.1 of the <a href="http://restfulobjects.org">Restful Objects spec</a> v1.0.</p>
-</div>
-<div class="paragraph">
-<p>The principal motivation is to allow more flexible representations to be generated for REST clients that (perhaps through their use of a certain Javascript library, say) expect, or at least works best with, a certain style of representation.</p>
-</div>
-<div class="paragraph">
-<p>Another use case is to support "third party" REST clients over which you have no control.  In this scenario you <em>must not</em> naively expose entities through the RO viewer, because over time those entities will inevitably evolve and change their structure.  If the entities were exposed directly then those REST clients will break.</p>
-</div>
-<div class="paragraph">
-<p>Instead you need to create some sort of stable facade over your domain entities, one which you will preserve even if the domain entities change.  There are three ways in which you can do this:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>first is to solve the problem at the domain layer by defining a regular Apache Isis <a href="ugbtb.html#_ugbtb_view-models">view model</a>.  This is then surfaced over the RO viewer. <br></p>
-<div class="paragraph">
-<p>If the underlying entities change, then care must be taken to ensure that structure of the view model nevertheless is unchanged.</p>
-</div>
-</li>
-<li>
-<p>a second option is to solve the problem at the persistence layer, but defining a (SQL) view in the database and then <a href="ugbtb.html#_ugbtb_other-techniques_mapping-rdbms-views">mapping this</a> to a (read-only) entity.  Again this is surfaced by the RO viewer. <br></p>
-<div class="paragraph">
-<p>If the underlying tables change (as the result of a change in their corresponding domain entities) then once more the view must be refactored so that it still presents the same structure.</p>
-</div>
-</li>
-<li>
-<p>our third option is to solve the problem at the presentation layer, using the <code>ContentNegotiationService</code> described in this section.<br></p>
-<div class="paragraph">
-<p>The <code>ContentNegotiationService</code> is responsible for inspecting the HTTP <code>Accept</code> header, and use this to select the correct representation to render. <br></p>
-</div>
-<div class="paragraph">
-<p>The Apache Isis framework provides three implementations of <code>ContentNegotiationService</code> which inspects different elements of the HTTP <code>Accept</code> header.  One of these implementations, <code>ContentNegotiationServiceXRoDomainType</code> will further delegate down to the companion <a href="rgsvc.html#_rgsvc_spi_ContentMappingService"><code>ContentMappingService</code></a> service (if configured/available), based on the value of the "x-ro-domain-type" parameter of the header.<br></p>
-</div>
-<div class="paragraph">
-<p>A typical implementation of <code>ContentMappingService</code> will convert the domain object into some sort of DTO (data transfer object) as specified by the "x-ro-domaintype".  If this DTO is annotated with JAXB or Jackson mappings, then the RO viewer (courtesy of the underlying <a href="http://resteasy.jboss.org/">RestEasy</a> framework) can serialize these directly.<br></p>
-</div>
-<div class="paragraph">
-<p>What all that means is that, if the underlying entities change, we are required to update the mappings in the <code>ContentMappingService</code> to map to the same DTOs.</p>
-</div>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>This diagram illustrates the three options available:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/reference-services-spi/ContentNegotiationService/facade-choices.png"><img src="images/reference-services-spi/ContentNegotiationService/facade-choices.png" alt="facade choices" width="700px"></a>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_spi">2.1.1. SPI</h4>
-<div class="paragraph">
-<p>The SPI defined by this service is:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">interface</span> <span class="class">ContentNegotiationService</span> {
+    </style>  
+ </head> 
+ <body> 
+  <div class="row"> 
+   <div class="fixed contain-to-grid header"> 
+    <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem"> 
+     <ul class="title-area"> 
+      <li class="name"> <h1> <a href="/index.html">Apache Isis\u2122</a> </h1> </li> 
+      <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone --> 
+      <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li> 
+     </ul> 
+     <section class="top-bar-section"> 
+      <ul class="right"> 
+       <li class="has-form"> 
+        <form class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse"> 
+         <div class="row collapse"> 
+          <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya"> 
+          <input type="hidden" name="cof" value="FORID:0"> 
+          <input class="form-control" name="q" type="text" placeholder="Search"> 
+         </div> 
+        </form> </li> 
+      </ul> 
+      <!-- Left Nav Section --> 
+      <ul class="left"> 
+       <li><a href="/documentation.html">Documentation</a></li> 
+       <li><a href="/downloads.html">Downloads</a></li> 
+       <li><a href="/help.html">Help</a></li> 
+       <li><a href="/asf.html">@ASF</a></li> 
+      </ul> 
+     </section> 
+    </nav> 
+   </div> 
+  </div> 
+  <div class="row"> 
+   <div id="doc-content-left" class="large-9 medium-9 columns"> 
+    <div id="doc-content">
+     <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/rgfis.adoc&quot;" style="float: right; font-size: small; padding: 6px;  "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+     <div class="sect1"> 
+      <h2 id="_rgfis">1. Framework Internal Services</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_rgfis.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>This guide documents a number of domain services that are not part of the framework\u2019s formal API, they use classes that are outside of the applib. They should be thought of as part of the internal design of the framework, and are liable to change from release to release.</p> 
+       </div> 
+       <div class="admonitionblock warning"> 
+        <table> 
+         <tbody>
+          <tr> 
+           <td class="icon"> <i class="fa icon-warning" title="Warning"></i> </td> 
+           <td class="content"> 
+            <div class="paragraph"> 
+             <p>We do not guarantee that <a href="http://semver.org">semantic versioning</a> will be honoured for these services.</p> 
+            </div> </td> 
+          </tr> 
+         </tbody>
+        </table> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_other_guides">1.1. Other Guides</h3> 
+        <div class="paragraph"> 
+         <p>Apache Isis documentation is broken out into a number of user, reference and "supporting procedures" guides.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The user guides available are:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><a href="ugfun.html">Fundamentals</a></p> </li> 
+          <li> <p><a href="ugvw.html">Wicket viewer</a></p> </li> 
+          <li> <p><a href="ugvro.html">Restful Objects viewer</a></p> </li> 
+          <li> <p><a href="ugdno.html">DataNucleus object store</a></p> </li> 
+          <li> <p><a href="ugsec.html">Security</a></p> </li> 
+          <li> <p><a href="ugtst.html">Testing</a></p> </li> 
+          <li> <p><a href="ugbtb.html">Beyond the Basics</a></p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The reference guides are:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><a href="rgant.html">Annotations</a></p> </li> 
+          <li> <p><a href="rgsvc.html">Domain Services</a></p> </li> 
+          <li> <p><a href="rgcfg.html">Configuration Properties</a></p> </li> 
+          <li> <p><a href="rgcms.html">Classes, Methods and Schema</a></p> </li> 
+          <li> <p><a href="rgmvn.html">Apache Isis Maven plugin</a></p> </li> 
+          <li> <p><a href="#">Framework Internal Services</a> (this guide)</p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The remaining guides are:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><a href="dg.html">Developers' Guide</a> (how to set up a development environment for Apache Isis and contribute back to the project)</p> </li> 
+          <li> <p><a href="cgcom.html">Committers' Guide</a> (release procedures and related practices)</p> </li> 
+         </ul> 
+        </div> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_rgfis_presentation-layer">2. Presentation Layer</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_rgfis_presentation-layer.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>These domain services are internal to the framework, controlling various aspects of the presentation layer.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>The table below summarizes the presentation layer internal SPIs defined by Apache Isis. It also lists their corresponding implementation, either a default implementation provided by Apache Isis itself, or provided by one of the (non-ASF) <a href="http://www.isisaddons.org">Isis Addons</a> modules.</p> 
+       </div> 
+       <table class="tableblock frame-all grid-all spread"> 
+        <caption class="title">
+         Table 1. Internal Services
+        </caption> 
+        <colgroup> 
+         <col style="width: 30%;"> 
+         <col style="width: 30%;"> 
+         <col style="width: 20%;"> 
+         <col style="width: 20%;"> 
+        </colgroup> 
+        <thead> 
+         <tr> 
+          <th class="tableblock halign-left valign-top">SPI</th> 
+          <th class="tableblock halign-left valign-top">Maven Module<br> Impl\u2019n (g: a:)</th> 
+          <th class="tableblock halign-left valign-top">Implementation</th> 
+          <th class="tableblock halign-left valign-top">Notes</th> 
+         </tr> 
+        </thead> 
+        <tbody> 
+         <tr> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgfis_spi_ContentNegotiationService"><code>o.a.i.v.ro.</code><br> <code>rendering.service.conneg.</code><br> <code>ContentNegotiationService</code></a></p></td> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock">Encodes the algorithm that delegates to any registered <a href="rgsvc.html#_rgsvc_spi_ContentMappingService"><code>ContentMappingService</code></a>s.</p></td> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock"><code>ContentNegotiationService-</code><br> <code>XRoDomainType</code><br> <code>o.a.i.core</code><br> <code>isis-core-viewer-restfulobjects-rendering</code></p></td> 
+          <td class="tableblock halign-left valign-top">
+           <div></div></td> 
+         </tr> 
+         <tr> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgfis_spi_RepresentationService"><code>o.a.i.v.ro.</code><br> <code>rendering.service.</code><br> <code>RepresentationService</code></a></p></td> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock">Generates the representations, delegating to any registered <a href="#_rgfis_spi_ContentNegotiationService"><code>ContentNegotiationService</code></a>s.</p></td> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock"><code>RepresentationService-</code><br> <code>ForRestfulObjects</code><br> <code>o.a.i.core</code><br> <code>isis-core-viewer-restfulobjects-rendering</code></p></td> 
+          <td class="tableblock halign-left valign-top">
+           <div></div></td> 
+         </tr> 
+        </tbody> 
+       </table> 
+       <div class="paragraph"> 
+        <p>Key:</p> 
+       </div> 
+       <div class="ulist"> 
+        <ul> 
+         <li> <p><code>o.a.i</code> is an abbreviation for <code>org.apache.isis</code></p> </li> 
+         <li> <p><code>o.ia.m</code> is an abbreviation for <code>org.isisaddons.module</code></p> </li> 
+         <li> <p><code>o.a.i.c.m.s</code> is an abbreviation for <code>org.apache.isis.core.metamodel.services</code></p> </li> 
+         <li> <p><code>o.a.i.c.r.s</code> is an abbreviation for <code>org.apache.isis.core.runtime.services</code></p> </li> 
+         <li> <p><code>o.a.i.v.ro</code> is an abbreviation for <code>org.apache.isis.viewer.restfulobjects</code></p> </li> 
+        </ul> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_rgfis_spi_ContentNegotiationService">2.1. <code>ContentNegotiationService</code></h3> 
+        <div class="paragraph"> 
+         <p>The <code>ContentNegotiationService</code> is a plug-in point for the <a href="ugvro.html">RestfulObjects viewer</a> so that it can generate representations according to HTTP <code>Accept</code> header of the request. This idea is discussed in section 34.1 of the <a href="http://restfulobjects.org">Restful Objects spec</a> v1.0.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The principal motivation is to allow more flexible representations to be generated for REST clients that (perhaps through their use of a certain Javascript library, say) expect, or at least works best with, a certain style of representation.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Another use case is to support "third party" REST clients over which you have no control. In this scenario you <em>must not</em> naively expose entities through the RO viewer, because over time those entities will inevitably evolve and change their structure. If the entities were exposed directly then those REST clients will break.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Instead you need to create some sort of stable facade over your domain entities, one which you will preserve even if the domain entities change. There are three ways in which you can do this:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p>first is to solve the problem at the domain layer by defining a regular Apache Isis <a href="ugbtb.html#_ugbtb_view-models">view model</a>. This is then surfaced over the RO viewer. <br></p> 
+           <div class="paragraph"> 
+            <p>If the underlying entities change, then care must be taken to ensure that structure of the view model nevertheless is unchanged.</p> 
+           </div> </li> 
+          <li> <p>a second option is to solve the problem at the persistence layer, but defining a (SQL) view in the database and then <a href="ugbtb.html#_ugbtb_other-techniques_mapping-rdbms-views">mapping this</a> to a (read-only) entity. Again this is surfaced by the RO viewer. <br></p> 
+           <div class="paragraph"> 
+            <p>If the underlying tables change (as the result of a change in their corresponding domain entities) then once more the view must be refactored so that it still presents the same structure.</p> 
+           </div> </li> 
+          <li> <p>our third option is to solve the problem at the presentation layer, using the <code>ContentNegotiationService</code> described in this section.<br></p> 
+           <div class="paragraph"> 
+            <p>The <code>ContentNegotiationService</code> is responsible for inspecting the HTTP <code>Accept</code> header, and use this to select the correct representation to render. <br></p> 
+           </div> 
+           <div class="paragraph"> 
+            <p>The Apache Isis framework provides three implementations of <code>ContentNegotiationService</code> which inspects different elements of the HTTP <code>Accept</code> header. One of these implementations, <code>ContentNegotiationServiceXRoDomainType</code> will further delegate down to the companion <a href="rgsvc.html#_rgsvc_spi_ContentMappingService"><code>ContentMappingService</code></a> service (if configured/available), based on the value of the "x-ro-domain-type" parameter of the header.<br></p> 
+           </div> 
+           <div class="paragraph"> 
+            <p>A typical implementation of <code>ContentMappingService</code> will convert the domain object into some sort of DTO (data transfer object) as specified by the "x-ro-domaintype". If this DTO is annotated with JAXB or Jackson mappings, then the RO viewer (courtesy of the underlying <a href="http://resteasy.jboss.org/">RestEasy</a> framework) can serialize these directly.<br></p> 
+           </div> 
+           <div class="paragraph"> 
+            <p>What all that means is that, if the underlying entities change, we are required to update the mappings in the <code>ContentMappingService</code> to map to the same DTOs.</p> 
+           </div> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>This diagram illustrates the three options available:</p> 
+        </div> 
+        <div class="imageblock"> 
+         <div class="content"> 
+          <a class="image" href="images/reference-services-spi/ContentNegotiationService/facade-choices.png"><img src="images/reference-services-spi/ContentNegotiationService/facade-choices.png" alt="facade choices" width="700px"></a> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_spi">2.1.1. SPI</h4> 
+         <div class="paragraph"> 
+          <p>The SPI defined by this service is:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">interface</span> <span class="class">ContentNegotiationService</span> {
     Response.ResponseBuilder buildResponse(                     <i class="conum" data-value="1"></i><b>(1)</b>
             RepresentationService.Context2 renderContext2,
             ObjectAdapter objectAdapter);
@@ -748,61 +649,59 @@ Impl&#8217;n (g: a:)</th>
     Response.ResponseBuilder buildResponse(                     <i class="conum" data-value="5"></i><b>(5)</b>
             RepresentationService.Context2 renderContext2,
             ObjectAndActionInvocation objectAndActionInvocation);
-}</code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td>representation of a single object, as per section 14.4 of the RO spec, v1.0</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="2"></i><b>2</b></td>
-<td>representation of a single property of an object, as per section 16.4 of the RO spec v1.0</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="3"></i><b>3</b></td>
-<td>representation of a single collection of an object, as per section 17.5 of the RO spec v1.0</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="4"></i><b>4</b></td>
-<td>representation of a single action (prompt) of an object, as per section 18.2 of the RO spec v1.0</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="5"></i><b>5</b></td>
-<td>representation of the results of a single action invocation, as per section 19.5 of the RO spec v1.0</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>These methods provide:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>a <code>RepresentationService.Context2</code> which provides access to request-specific context (eg HTTP headers), session-specific context (eg authentication) and global context (eg configuration settings)</p>
-</li>
-<li>
-<p>an object representing the information to be rendered<br></p>
-<div class="paragraph">
-<p>eg <code>ObjectAdapter</code>, <code>ObjectAndProperty</code>, <code>ObjectAndCollection</code> etc</p>
-</div>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>In all cases, returning <code>null</code> will result in the regular RO spec representation being returned.</p>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_implementation">2.1.2. Implementation</h4>
-<div class="paragraph">
-<p><code>ContentNegotiationServiceAbstract</code> (in <code>o.a.i.v.ro.rendering.service.conneg</code>) provides a no-op implementation of the SPI, along with supporting methods:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="directive">abstract</span> <span class="type">class</span> <span class="class">ContentNegotiationServiceAbstract</span> <span class="directive">implements</span> ContentNegotiationService {
+}</code></pre> 
+          </div> 
+         </div> 
+         <div class="colist arabic"> 
+          <table> 
+           <tbody>
+            <tr> 
+             <td><i class="conum" data-value="1"></i><b>1</b></td> 
+             <td>representation of a single object, as per section 14.4 of the RO spec, v1.0</td> 
+            </tr> 
+            <tr> 
+             <td><i class="conum" data-value="2"></i><b>2</b></td> 
+             <td>representation of a single property of an object, as per section 16.4 of the RO spec v1.0</td> 
+            </tr> 
+            <tr> 
+             <td><i class="conum" data-value="3"></i><b>3</b></td> 
+             <td>representation of a single collection of an object, as per section 17.5 of the RO spec v1.0</td> 
+            </tr> 
+            <tr> 
+             <td><i class="conum" data-value="4"></i><b>4</b></td> 
+             <td>representation of a single action (prompt) of an object, as per section 18.2 of the RO spec v1.0</td> 
+            </tr> 
+            <tr> 
+             <td><i class="conum" data-value="5"></i><b>5</b></td> 
+             <td>representation of the results of a single action invocation, as per section 19.5 of the RO spec v1.0</td> 
+            </tr> 
+           </tbody>
+          </table> 
+         </div> 
+         <div class="paragraph"> 
+          <p>These methods provide:</p> 
+         </div> 
+         <div class="ulist"> 
+          <ul> 
+           <li> <p>a <code>RepresentationService.Context2</code> which provides access to request-specific context (eg HTTP headers), session-specific context (eg authentication) and global context (eg configuration settings)</p> </li> 
+           <li> <p>an object representing the information to be rendered<br></p> 
+            <div class="paragraph"> 
+             <p>eg <code>ObjectAdapter</code>, <code>ObjectAndProperty</code>, <code>ObjectAndCollection</code> etc</p> 
+            </div> </li> 
+          </ul> 
+         </div> 
+         <div class="paragraph"> 
+          <p>In all cases, returning <code>null</code> will result in the regular RO spec representation being returned.</p> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_implementation">2.1.2. Implementation</h4> 
+         <div class="paragraph"> 
+          <p><code>ContentNegotiationServiceAbstract</code> (in <code>o.a.i.v.ro.rendering.service.conneg</code>) provides a no-op implementation of the SPI, along with supporting methods:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="directive">abstract</span> <span class="type">class</span> <span class="class">ContentNegotiationServiceAbstract</span> <span class="directive">implements</span> ContentNegotiationService {
     ...
     protected <span class="predefined-type">Object</span> objectOf(<span class="directive">final</span> ObjectAdapter objectAdapter) { ... }
     <span class="directive">protected</span> <span class="predefined-type">Object</span> returnedObjectOf(ObjectAndActionInvocation objectAndActionInvocation) { ... }
@@ -812,185 +711,164 @@ Impl&#8217;n (g: a:)</th>
     <span class="directive">protected</span> <span class="type">void</span> ensureJaxbAnnotated(<span class="predefined-type">Class</span>&lt;?&gt; domainType) { ... }
     <span class="directive">protected</span> <span class="type">void</span> ensureDomainObjectAssignable(
         <span class="predefined-type">String</span> xRoDomainType, <span class="predefined-type">Class</span>&lt;?&gt; domainType, <span class="predefined-type">Object</span> domainObject) { ... }
-}</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>As discussed in the introduction, the framework also provides three implementation of this service, one of which is <code>o.a.i.v.ro.rendering.service.conneg.ContentNegotiationServiceXRoDomainType</code>.   This implementation handles content negotiation for two of the possible representations, object representations and for action result representations:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>For object representations it will handle requests with HTTP <code>Accept</code> headers of the form:</p>
-<div class="ulist">
-<ul>
-<li>
-<p><code>application/json;profile=urn:org.restfulobjects:repr-types/object;x-ro-domain-type=&#8230;&#8203;</code></p>
-</li>
-<li>
-<p><code>application/xml;profile=urn:org.restfulobjects:repr-types/object;x-ro-domain-type=&#8230;&#8203;</code></p>
-</li>
-</ul>
-</div>
-</li>
-<li>
-<p>for action result representations it will similarly handle requests with HTTP <code>Accept</code> headers of the form:</p>
-<div class="ulist">
-<ul>
-<li>
-<p><code>application/json;profile=urn:org.restfulobjects:repr-types/action-result;x-ro-domain-type=&#8230;&#8203;</code><br></p>
-</li>
-<li>
-<p><code>application/xml;profile=urn:org.restfulobjects:repr-types/action-result;x-ro-domain-type=&#8230;&#8203;</code></p>
-</li>
-</ul>
-</div>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The value of the <code>x-ro-domain-type</code> parameter corresponds to the DTO to be mapped into by the <a href="rgsvc.html#_rgsvc_spi_ContentMappingService"><code>ContentMappingService</code></a>.</p>
-</div>
-<div class="paragraph">
-<p>If the DTO is annotated with JAXB, then also note that the runtime type must be annotated with the JAXB <code>javax.xml.bind.annotation.XmlRootElement</code> so that RestEasy is able to unambiguously serialize it.</p>
-</div>
-<div class="paragraph">
-<p>The other two implementations of <code>ContentNegotiationService</code> are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><code>ContentNegotiationServiceForRestfulObjectsV1_0</code><br></p>
-<div class="paragraph">
-<p>which returns representations according to the <a href="http://restfulobjects.org">Restful Objects</a> spec</p>
-</div>
-</li>
-<li>
-<p><code>ContentNegotiationServiceOrgApacheIsisV1</code><br></p>
-<div class="paragraph">
-<p>which returns <a href="ugvro.html#_ugvro_simplified-representations">simplified representations</a></p>
-</div>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_usage">2.1.3. Usage</h4>
-<div class="paragraph">
-<p>You can find an example of all these services in the (non-ASF) <a href="http://github.com/isisaddons/isis-app-todoapp">Isis addons' todoapp</a>.  This defines a <code>ToDoItemDto</code> class that is JAXB annotated (it is in fact generated from an XSD).</p>
-</div>
-<div class="paragraph">
-<p>The example app also includes an implementation of <code>ContentMappingService</code> that maps <code>todoapp.dom.module.todoitem.ToDoItem</code> entities to <code>todoapp.dto.module.todoitem.ToDoItemDto</code> classes.</p>
-</div>
-<div class="paragraph">
-<p>A REST client can therefore request a DTO representation of an entity by invoking</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code>http://localhost:8080/restful/objects/TODO/0</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>with an <code>Accept</code> header of:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code>application/xml;profile=urn:org.restfulobjects:repr-types/object;x-ro-domain-type=todoapp.dto.module.todoitem.ToDoItemDto</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>will result in an XML serialization of that class:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/reference-services-spi/ContentNegotiationService/accept-xml.png"><img src="images/reference-services-spi/ContentNegotiationService/accept-xml.png" alt="accept xml" width="700px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>while similarly hitting the same URL with an <code>Accept</code> header of:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code>application/json;profile=urn:org.restfulobjects:repr-types/object;x-ro-domain-type=todoapp.dto.module.todoitem.ToDoItemDto</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>will result in the JSON serialization of that class:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/reference-services-spi/ContentNegotiationService/accept-json.png"><img src="images/reference-services-spi/ContentNegotiationService/accept-json.png" alt="accept json" width="700px"></a>
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_configuration">2.1.4. Configuration</h4>
-<div class="paragraph">
-<p>The default <code>ContentNegotiationServiceXRoDomainType</code> implementation provides a <a href="rgcfg.html#_rgcfg_configuring-core">configuration property</a> which controls whether a mapped domain object is pretty-printed (formatted, indented) or not:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="ini">isis.services.ContentNegotiationServiceXRoDomainType.prettyPrint=true</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>If the property is not set, then the default depends on the <a href="rgcfg.html#_rgcfg_deployment-types">deployment type</a>; production mode will disable pretty printing, while prototyping mode will enable it.</p>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_registering_the_services">2.1.5. Registering the Services</h4>
-<div class="paragraph">
-<p>Assuming that the <code>configuration-and-annotation</code> services installer is configured (implicit if using the
-<code>AppManifest</code> to <a href="rgcms.html#_rgcms_classes_AppManifest-bootstrapping">bootstrap the app</a>) then Apache Isis' default
-implementations of <code>ContentNegotiationService</code> service are automatically registered and injected (it is annotated with
-<code>@DomainService</code>) so no further configuration is required.</p>
-</div>
-<div class="paragraph">
-<p>To use an alternative implementation, use
-<a href="rgant.html#_rgant-DomainServiceLayout_menuOrder"><code>@DomainServiceLayout#menuOrder()</code></a> (as explained
-in the <a href="rgsvc.html#_rgsvc_intro_overriding-the-services">introduction</a> to this guide).</p>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_related_services">2.1.6. Related Services</h4>
-<div class="paragraph">
-<p>The default implementation of <code>ContentNegotiationService</code> delegates to <a href="rgsvc.html#_rgsvc_spi_ContentMappingService"><code>ContentMappingService</code></a> (if present) to convert domain entities into a stable form (eg DTO).</p>
-</div>
-<div class="paragraph">
-<p>The <code>ContentNegotiationService</code> is itself called by the (default implementation of) <a href="#_rgfis_spi_RepresentationService"><code>RepresentationService</code></a>.</p>
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_rgfis_spi_RepresentationService">2.2. <code>RepresentationService</code></h3>
-<div class="paragraph">
-<p>The <code>RepresentationService</code> is the main plug-in point for the <a href="ugvro.html">RestfulObjects viewer</a> to generate representations.</p>
-</div>
-<div class="paragraph">
-<p>The default implementation generates representations according to the <a href="http://restfulobjects.org">Restful Objects spec</a> v1.0.  However, it also delegates to the <a href="#_rgfis_spi_ContentNegotiationService"><code>ContentNegotiationService</code></a> which provides a mechanism for altering representations according to the HTTP <code>Accept</code> header.</p>
-</div>
-<div class="paragraph">
-<p>The principal motivation is to allow more flexible representations to be generated for REST clients that (perhaps through their use of a certain Javascript library, say) expect, or at least works best with, a certain style of representation.</p>
-</div>
-<div class="paragraph">
-<p>In all there are three domain services that can influence the representations generated: this service, <a href="#_rgfis_spi_ContentNegotiationService"><code>ContentNegotiationService</code></a>and the <a href="rgsvc.html#_rgsvc_spi_ContentMappingService"><code>ContentMappingService</code></a>.  The diagram below shows how these collaborate:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/reference-services-spi/RepresentationService/service-collaborations.png"><img src="images/reference-services-spi/RepresentationService/service-collaborations.png" alt="service collaborations" width="700px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>The <code>RepresentationServiceForRestfulObjects</code> is the default implementation of this service; likewise <code>ContentNegotiationServiceXRoDomainType</code> is the default implementation of the <code>ContentNegotiationService</code>.  If you inspect the source code you&#8217;ll see that the default implementation of this service&#8217;s primary responsibility is to generate the default Restful Objects representations.  Therefore, if you what you want to do is to generate a <em>different _representation then in many cases replacing either this service _or</em> the <code>ContentNegotiationService</code> will be equivalent (you&#8217;ll notice that their SPIs are very similar).</p>
-</div>
-<div class="sect3">
-<h4 id="_spi_2">2.2.1. SPI</h4>
-<div class="paragraph">
-<p>The SPI defined by this service is:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">interface</span> <span class="class">RepresentationService</span> {
+}</code></pre> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>As discussed in the introduction, the framework also provides three implementation of this service, one of which is <code>o.a.i.v.ro.rendering.service.conneg.ContentNegotiationServiceXRoDomainType</code>. This implementation handles content negotiation for two of the possible representations, object representations and for action result representations:</p> 
+         </div> 
+         <div class="ulist"> 
+          <ul> 
+           <li> <p>For object representations it will handle requests with HTTP <code>Accept</code> headers of the form:</p> 
+            <div class="ulist"> 
+             <ul> 
+              <li> <p><code>application/json;profile=urn:org.restfulobjects:repr-types/object;x-ro-domain-type=\u2026\u200b</code></p> </li> 
+              <li> <p><code>application/xml;profile=urn:org.restfulobjects:repr-types/object;x-ro-domain-type=\u2026\u200b</code></p> </li> 
+             </ul> 
+            </div> </li> 
+           <li> <p>for action result representations it will similarly handle requests with HTTP <code>Accept</code> headers of the form:</p> 
+            <div class="ulist"> 
+             <ul> 
+              <li> <p><code>application/json;profile=urn:org.restfulobjects:repr-types/action-result;x-ro-domain-type=\u2026\u200b</code><br></p> </li> 
+              <li> <p><code>application/xml;profile=urn:org.restfulobjects:repr-types/action-result;x-ro-domain-type=\u2026\u200b</code></p> </li> 
+             </ul> 
+            </div> </li> 
+          </ul> 
+         </div> 
+         <div class="paragraph"> 
+          <p>The value of the <code>x-ro-domain-type</code> parameter corresponds to the DTO to be mapped into by the <a href="rgsvc.html#_rgsvc_spi_ContentMappingService"><code>ContentMappingService</code></a>.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>If the DTO is annotated with JAXB, then also note that the runtime type must be annotated with the JAXB <code>javax.xml.bind.annotation.XmlRootElement</code> so that RestEasy is able to unambiguously serialize it.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>The other two implementations of <code>ContentNegotiationService</code> are:</p> 
+         </div> 
+         <div class="ulist"> 
+          <ul> 
+           <li> <p><code>ContentNegotiationServiceForRestfulObjectsV1_0</code><br></p> 
+            <div class="paragraph"> 
+             <p>which returns representations according to the <a href="http://restfulobjects.org">Restful Objects</a> spec</p> 
+            </div> </li> 
+           <li> <p><code>ContentNegotiationServiceOrgApacheIsisV1</code><br></p> 
+            <div class="paragraph"> 
+             <p>which returns <a href="ugvro.html#_ugvro_simplified-representations">simplified representations</a></p> 
+            </div> </li> 
+          </ul> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_usage">2.1.3. Usage</h4> 
+         <div class="paragraph"> 
+          <p>You can find an example of all these services in the (non-ASF) <a href="http://github.com/isisaddons/isis-app-todoapp">Isis addons' todoapp</a>. This defines a <code>ToDoItemDto</code> class that is JAXB annotated (it is in fact generated from an XSD).</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>The example app also includes an implementation of <code>ContentMappingService</code> that maps <code>todoapp.dom.module.todoitem.ToDoItem</code> entities to <code>todoapp.dto.module.todoitem.ToDoItemDto</code> classes.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>A REST client can therefore request a DTO representation of an entity by invoking</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code>http://localhost:8080/restful/objects/TODO/0</code></pre> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>with an <code>Accept</code> header of:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code>application/xml;profile=urn:org.restfulobjects:repr-types/object;x-ro-domain-type=todoapp.dto.module.todoitem.ToDoItemDto</code></pre> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>will result in an XML serialization of that class:</p> 
+         </div> 
+         <div class="imageblock"> 
+          <div class="content"> 
+           <a class="image" href="images/reference-services-spi/ContentNegotiationService/accept-xml.png"><img src="images/reference-services-spi/ContentNegotiationService/accept-xml.png" alt="accept xml" width="700px"></a> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>while similarly hitting the same URL with an <code>Accept</code> header of:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code>application/json;profile=urn:org.restfulobjects:repr-types/object;x-ro-domain-type=todoapp.dto.module.todoitem.ToDoItemDto</code></pre> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>will result in the JSON serialization of that class:</p> 
+         </div> 
+         <div class="imageblock"> 
+          <div class="content"> 
+           <a class="image" href="images/reference-services-spi/ContentNegotiationService/accept-json.png"><img src="images/reference-services-spi/ContentNegotiationService/accept-json.png" alt="accept json" width="700px"></a> 
+          </div> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_configuration">2.1.4. Configuration</h4> 
+         <div class="paragraph"> 
+          <p>The default <code>ContentNegotiationServiceXRoDomainType</code> implementation provides a <a href="rgcfg.html#_rgcfg_configuring-core">configuration property</a> which controls whether a mapped domain object is pretty-printed (formatted, indented) or not:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="ini">isis.services.ContentNegotiationServiceXRoDomainType.prettyPrint=true</code></pre> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>If the property is not set, then the default depends on the <a href="rgcfg.html#_rgcfg_deployment-types">deployment type</a>; production mode will disable pretty printing, while prototyping mode will enable it.</p> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_registering_the_services">2.1.5. Registering the Services</h4> 
+         <div class="paragraph"> 
+          <p>Assuming that the <code>configuration-and-annotation</code> services installer is configured (implicit if using the <code>AppManifest</code> to <a href="rgcms.html#_rgcms_classes_AppManifest-bootstrapping">bootstrap the app</a>) then Apache Isis' default implementations of <code>ContentNegotiationService</code> service are automatically registered and injected (it is annotated with <code>@DomainService</code>) so no further configuration is required.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>To use an alternative implementation, use <a href="rgant.html#_rgant-DomainServiceLayout_menuOrder"><code>@DomainServiceLayout#menuOrder()</code></a> (as explained in the <a href="rgsvc.html#_rgsvc_intro_overriding-the-services">introduction</a> to this guide).</p> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_related_services">2.1.6. Related Services</h4> 
+         <div class="paragraph"> 
+          <p>The default implementation of <code>ContentNegotiationService</code> delegates to <a href="rgsvc.html#_rgsvc_spi_ContentMappingService"><code>ContentMappingService</code></a> (if present) to convert domain entities into a stable form (eg DTO).</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>The <code>ContentNegotiationService</code> is itself called by the (default implementation of) <a href="#_rgfis_spi_RepresentationService"><code>RepresentationService</code></a>.</p> 
+         </div> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_rgfis_spi_RepresentationService">2.2. <code>RepresentationService</code></h3> 
+        <div class="paragraph"> 
+         <p>The <code>RepresentationService</code> is the main plug-in point for the <a href="ugvro.html">RestfulObjects viewer</a> to generate representations.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The default implementation generates representations according to the <a href="http://restfulobjects.org">Restful Objects spec</a> v1.0. However, it also delegates to the <a href="#_rgfis_spi_ContentNegotiationService"><code>ContentNegotiationService</code></a> which provides a mechanism for altering representations according to the HTTP <code>Accept</code> header.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The principal motivation is to allow more flexible representations to be generated for REST clients that (perhaps through their use of a certain Javascript library, say) expect, or at least works best with, a certain style of representation.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>In all there are three domain services that can influence the representations generated: this service, <a href="#_rgfis_spi_ContentNegotiationService"><code>ContentNegotiationService</code></a>and the <a href="rgsvc.html#_rgsvc_spi_ContentMappingService"><code>ContentMappingService</code></a>. The diagram below shows how these collaborate:</p> 
+        </div> 
+        <div class="imageblock"> 
+         <div class="content"> 
+          <a class="image" href="images/reference-services-spi/RepresentationService/service-collaborations.png"><img src="images/reference-services-spi/RepresentationService/service-collaborations.png" alt="service collaborations" width="700px"></a> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The <code>RepresentationServiceForRestfulObjects</code> is the default implementation of this service; likewise <code>ContentNegotiationServiceXRoDomainType</code> is the default implementation of the <code>ContentNegotiationService</code>. If you inspect the source code you\u2019ll see that the default implementation of this service\u2019s primary responsibility is to generate the default Restful Objects representations. Therefore, if you what you want to do is to generate a <em>different _representation then in many cases replacing either this service _or</em> the <code>ContentNegotiationService</code> will be equivalent (you\u2019ll notice that their SPIs are very similar).</p> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_spi_2">2.2.1. SPI</h4> 
+         <div class="paragraph"> 
+          <p>The SPI defined by this service is:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">interface</span> <span class="class">RepresentationService</span> {
     Response objectRepresentation(                  <i class="conum" data-value="1"></i><b>(1)</b>
             <span class="predefined-type">Context</span> rendererContext,
             ObjectAdapter objectAdapter);
@@ -1012,225 +890,197 @@ in the <a href="rgsvc.html#_rgsvc_intro_overriding-the-services">introduction</a
     <span class="directive">public</span> <span class="directive">static</span> <span class="type">interface</span> <span class="class">Context</span> <span class="directive">extends</span> RendererContext {
         ObjectAdapterLinkTo getAdapterLinkTo();
     }
-}</code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td>representation of a single object, as per section 14.4 of the RO spec, v1.0</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="2"></i><b>2</b></td>
-<td>representation of a single property of an object, as per section 16.4 of the RO spec v1.0</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="3"></i><b>3</b></td>
-<td>representation of a single collection of an object, as per section 17.5 of the RO spec v1.0</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="4"></i><b>4</b></td>
-<td>representation of a single action (prompt) of an object, as per section 18.2 of the RO spec v1.0</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="5"></i><b>5</b></td>
-<td>representation of the results of a single action invocation, as per section 19.5 of the RO spec v1.0</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>These methods provide:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>a <code>RendererContext</code> which provides access to request-specific context (eg HTTP headers), session-specific context (eg authentication) and global context (eg configuration settings)</p>
-</li>
-<li>
-<p>an object representing the information to be rendered<br></p>
-<div class="paragraph">
-<p>eg <code>ObjectAdapter</code>, <code>ObjectAndProperty</code>, <code>ObjectAndCollection</code> etc</p>
-</div>
-</li>
-<li>
-<p>for members, whether the representation is in read/write mode<br></p>
-<div class="paragraph">
-<p>ie <code>MemberReprMode</code></p>
-</div>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_implementation_2">2.2.2. Implementation</h4>
-<div class="paragraph">
-<p>As discussed in the introduction, the framework provides a default implementation, <code>o.a.i.v.ro.rendering.service.RepresentationServiceContentNegotiator</code>.   This delegates to <a href="#_rgfis_spi_ContentNegotiationService"><code>ContentNegotiationService</code></a> to generate an alternative representation; but if none is provided then it falls back on generating the representations as defined in the <a href="http://restfulobjects.org">Restful Objects spec</a> v1.0.</p>
-</div>
-<div class="paragraph">
-<p>To use an alternative implementation, use
-<a href="rgant.html#_rgant-DomainServiceLayout_menuOrder"><code>@DomainServiceLayout#menuOrder()</code></a> (as explained
-in the <a href="rgsvc.html#_rgsvc_intro_overriding-the-services">introduction</a> to this guide).</p>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_registering_the_services_2">2.2.3. Registering the Services</h4>
-<div class="paragraph">
-<p>Assuming that the <code>configuration-and-annotation</code> services installer is configured (implicit if using the
-<code>AppManifest</code> to <a href="rgcms.html#_rgcms_classes_AppManifest-bootstrapping">bootstrap the app</a>) then Apache Isis' default implementation of <code>RepresentationService</code> service is automatically registered and injected (it is annotated with <code>@DomainService</code>) so no further configuration is required.</p>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_related_services_2">2.2.4. Related Services</h4>
-<div class="paragraph">
-<p>The default implementation delegates to <a href="#_rgfis_spi_ContentNegotiationService"><code>ContentNegotiationService</code></a>, whose default implementation may delegate in turn to <a href="rgsvc.html#_rgsvc_spi_ContentMappingService"><code>ContentMappingService</code></a> (if present).</p>
-</div>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_rgfis_application-layer">3. Application Layer</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>These domain services are internal to the framework, controlling various aspects of the application layer.</p>
-</div>
-<div class="paragraph">
-<p>The table below summarizes the application layer internal SPIs defined by Apache Isis.  It also lists their
-corresponding implementation, either a default implementation provided by Apache Isis itself, or provided by one of the
-(non-ASF) <a href="http://www.isisaddons.org">Isis Addons</a> modules.</p>
-</div>
-<table class="tableblock frame-all grid-all spread">
-<caption class="title">Table 2. Internal Services</caption>
-<colgroup>
-<col style="width: 30%;">
-<col style="width: 30%;">
-<col style="width: 20%;">
-<col style="width: 20%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">SPI</th>
-<th class="tableblock halign-left valign-top">Maven Module<br>
-Impl&#8217;n (g: a:)</th>
-<th class="tableblock halign-left valign-top">Implementation</th>
-<th class="tableblock halign-left valign-top">Notes</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgfis_spi_AuthenticationSessionProvider"><code>o.a.i.core.commons.</code><br>
-<code>authentication.</code><br>
-<code>AuthenticationSessionProvider</code></a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Simply responsible for obtaining the current <code>AuthenticationSession</code> (the framework&#8217;s internal representation of the currently logged-in user).</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>AuthenticationSession-</code><br>
-<code>ProviderDefault</code><br>
-<code>isis-core-runtime</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Default implementation looks up from <code>IsisSessionFactory</code> singleton&#8217;s thread-local</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgfis_spi_CommandDtoServiceInternal"><code>o.a.i.c.m.s.command</code><br>
-<code>CommandDtoServiceInternal</code></a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Creates memento of current action invocation, for use as a serializable XML reified command.  The
-most notable usage of this is to allow the execution of the <code>Command</code> to be deferred to run in the background (via
-<a href="rgant.html#_rgant-Action_command"><code>@Action#commandExecuteIn()</code></a> or
-<a href="rgant.html#_rgant-Property_command"><code>@Property#commandExecuteIn()</code></a>.</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>CommandDtoService-</code><br>
-<code>InternalServiceDefault</code><br>
-<code>isis-core-runtime</code></p></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgfis_spi_MessageBrokerServiceInternal"><code>o.a.i.c.m.s.msgbroker</code><br>
-<code>MessageBrokerServiceInternal</code></a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">A wrapper around <a href="rgsvc.html#_rgsvc_api_MessageService"><code>MessageService</code></a>.</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">MessageBrokerService-`<br>
-<code>InternalDefault</code><br>
-<code>isis-core-runtime</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>This service does not provide any additional capabilities over <code>MessageService</code>, and will (most likely) be conflated with that service in the future.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgfis_spi_InteractionDtoServiceInternal"><code>o.a.i.c.m.s.ixn</code><br>
-<code>InteractionDtoServiceInternal</code></a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Creates DTO for the current execution of an action invocation or property edit, for use either as a reified command or for implementations of the <a href="rgsvc.html#_rgsvc_spi_PublishingService"><code>PublishingService</code></a>.</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>CommandDtoService-</code><br>
-<code>InternalServiceDefault</code><br>
-<code>isis-core-metamodel</code></p></td>
-<td class="tableblock halign-left valign-top"><div></div></td>
-</tr>
-</tbody>
-</table>
-<div class="paragraph">
-<p>Key:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><code>o.a.i</code> is an abbreviation for <code>org.apache.isis</code></p>
-</li>
-<li>
-<p><code>o.ia.m</code> is an abbreviation for <code>org.isisaddons.module</code></p>
-</li>
-<li>
-<p><code>o.a.i.c.m.s</code> is an abbreviation for <code>org.apache.isis.core.metamodel.services</code></p>
-</li>
-<li>
-<p><code>o.a.i.c.r.s</code> is an abbreviation for <code>org.apache.isis.core.runtime.services</code></p>
-</li>
-</ul>
-</div>
-<div class="sect2">
-<h3 id="_rgfis_spi_AuthenticationSessionProvider">3.1. <code>AuthenticationSessionProvider</code></h3>
-<div class="paragraph">
-<p>The (internal) <code>AuthenticationSessionProvider</code> domain service is simply responsible for obtaining the <code>AuthenticationSession</code> (being the framework&#8217;s internal representation of the currently logged in user).</p>
-</div>
-<div class="sect3">
-<h4 id="_spi_and_implementation">3.1.1. SPI and Implementation</h4>
-<div class="paragraph">
-<p>The SPI of the service is:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">interface</span> <span class="class">AuthenticationSessionProvider</span> {
+}</code></pre> 
+          </div> 
+         </div> 
+         <div class="colist arabic"> 
+          <table> 
+           <tbody>
+            <tr> 
+             <td><i class="conum" data-value="1"></i><b>1</b></td> 
+             <td>representation of a single object, as per section 14.4 of the RO spec, v1.0</td> 
+            </tr> 
+            <tr> 
+             <td><i class="conum" data-value="2"></i><b>2</b></td> 
+             <td>representation of a single property of an object, as per section 16.4 of the RO spec v1.0</td> 
+            </tr> 
+            <tr> 
+             <td><i class="conum" data-value="3"></i><b>3</b></td> 
+             <td>representation of a single collection of an object, as per section 17.5 of the RO spec v1.0</td> 
+            </tr> 
+            <tr> 
+             <td><i class="conum" data-value="4"></i><b>4</b></td> 
+             <td>representation of a single action (prompt) of an object, as per section 18.2 of the RO spec v1.0</td> 
+            </tr> 
+            <tr> 
+             <td><i class="conum" data-value="5"></i><b>5</b></td> 
+             <td>representation of the results of a single action invocation, as per section 19.5 of the RO spec v1.0</td> 
+            </tr> 
+           </tbody>
+          </table> 
+         </div> 
+         <div class="paragraph"> 
+          <p>These methods provide:</p> 
+         </div> 
+         <div class="ulist"> 
+          <ul> 
+           <li> <p>a <code>RendererContext</code> which provides access to request-specific context (eg HTTP headers), session-specific context (eg authentication) and global context (eg configuration settings)</p> </li> 
+           <li> <p>an object representing the information to be rendered<br></p> 
+            <div class="paragraph"> 
+             <p>eg <code>ObjectAdapter</code>, <code>ObjectAndProperty</code>, <code>ObjectAndCollection</code> etc</p> 
+            </div> </li> 
+           <li> <p>for members, whether the representation is in read/write mode<br></p> 
+            <div class="paragraph"> 
+             <p>ie <code>MemberReprMode</code></p> 
+            </div> </li> 
+          </ul> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_implementation_2">2.2.2. Implementation</h4> 
+         <div class="paragraph"> 
+          <p>As discussed in the introduction, the framework provides a default implementation, <code>o.a.i.v.ro.rendering.service.RepresentationServiceContentNegotiator</code>. This delegates to <a href="#_rgfis_spi_ContentNegotiationService"><code>ContentNegotiationService</code></a> to generate an alternative representation; but if none is provided then it falls back on generating the representations as defined in the <a href="http://restfulobjects.org">Restful Objects spec</a> v1.0.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>To use an alternative implementation, use <a href="rgant.html#_rgant-DomainServiceLayout_menuOrder"><code>@DomainServiceLayout#menuOrder()</code></a> (as explained in the <a href="rgsvc.html#_rgsvc_intro_overriding-the-services">introduction</a> to this guide).</p> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_registering_the_services_2">2.2.3. Registering the Services</h4> 
+         <div class="paragraph"> 
+          <p>Assuming that the <code>configuration-and-annotation</code> services installer is configured (implicit if using the <code>AppManifest</code> to <a href="rgcms.html#_rgcms_classes_AppManifest-bootstrapping">bootstrap the app</a>) then Apache Isis' default implementation of <code>RepresentationService</code> service is automatically registered and injected (it is annotated with <code>@DomainService</code>) so no further configuration is required.</p> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_related_services_2">2.2.4. Related Services</h4> 
+         <div class="paragraph"> 
+          <p>The default implementation delegates to <a href="#_rgfis_spi_ContentNegotiationService"><code>ContentNegotiationService</code></a>, whose default implementation may delegate in turn to <a href="rgsvc.html#_rgsvc_spi_ContentMappingService"><code>ContentMappingService</code></a> (if present).</p> 
+         </div> 
+        </div> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_rgfis_application-layer">3. Application Layer</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_rgfis_application-layer.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>These domain services are internal to the framework, controlling various aspects of the application layer.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>The table below summarizes the application layer internal SPIs defined by Apache Isis. It also lists their corresponding implementation, either a default implementation provided by Apache Isis itself, or provided by one of the (non-ASF) <a href="http://www.isisaddons.org">Isis Addons</a> modules.</p> 
+       </div> 
+       <table class="tableblock frame-all grid-all spread"> 
+        <caption class="title">
+         Table 2. Internal Services
+        </caption> 
+        <colgroup> 
+         <col style="width: 30%;"> 
+         <col style="width: 30%;"> 
+         <col style="width: 20%;"> 
+         <col style="width: 20%;"> 
+        </colgroup> 
+        <thead> 
+         <tr> 
+          <th class="tableblock halign-left valign-top">SPI</th> 
+          <th class="tableblock halign-left valign-top">Maven Module<br> Impl\u2019n (g: a:)</th> 
+          <th class="tableblock halign-left valign-top">Implementation</th> 
+          <th class="tableblock halign-left valign-top">Notes</th> 
+         </tr> 
+        </thead> 
+        <tbody> 
+         <tr> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgfis_spi_AuthenticationSessionProvider"><code>o.a.i.core.commons.</code><br> <code>authentication.</code><br> <code>AuthenticationSessionProvider</code></a></p></td> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock">Simply responsible for obtaining the current <code>AuthenticationSession</code> (the framework\u2019s internal representation of the currently logged-in user).</p></td> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock"><code>AuthenticationSession-</code><br> <code>ProviderDefault</code><br> <code>isis-core-runtime</code></p></td> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="paragraph"> 
+             <p>Default implementation looks up from <code>IsisSessionFactory</code> singleton\u2019s thread-local</p> 
+            </div>
+           </div></td> 
+         </tr> 
+         <tr> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgfis_spi_CommandDtoServiceInternal"><code>o.a.i.c.m.s.command</code><br> <code>CommandDtoServiceInternal</code></a></p></td> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock">Creates memento of current action invocation, for use as a serializable XML reified command. The most notable usage of this is to allow the execution of the <code>Command</code> to be deferred to run in the background (via <a href="rgant.html#_rgant-Action_command"><code>@Action#commandExecuteIn()</code></a> or <a href="rgant.html#_rgant-Property_command"><code>@Property#commandExecuteIn()</code></a>.</p></td> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock"><code>CommandDtoService-</code><br> <code>InternalServiceDefault</code><br> <code>isis-core-runtime</code></p></td> 
+          <td class="tableblock halign-left valign-top">
+           <div></div></td> 
+         </tr> 
+         <tr> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgfis_spi_MessageBrokerServiceInternal"><code>o.a.i.c.m.s.msgbroker</code><br> <code>MessageBrokerServiceInternal</code></a></p></td> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock">A wrapper around <a href="rgsvc.html#_rgsvc_api_MessageService"><code>MessageService</code></a>.</p></td> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock">MessageBrokerService-`<br> <code>InternalDefault</code><br> <code>isis-core-runtime</code></p></td> 
+          <td class="tableblock halign-left valign-top">
+           <div>
+            <div class="paragraph"> 
+             <p>This service does not provide any additional capabilities over <code>MessageService</code>, and will (most likely) be conflated with that service in the future.</p> 
+            </div>
+           </div></td> 
+         </tr> 
+         <tr> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_rgfis_spi_InteractionDtoServiceInternal"><code>o.a.i.c.m.s.ixn</code><br> <code>InteractionDtoServiceInternal</code></a></p></td> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock">Creates DTO for the current execution of an action invocation or property edit, for use either as a reified command or for implementations of the <a href="rgsvc.html#_rgsvc_spi_PublishingService"><code>PublishingService</code></a>.</p></td> 
+          <td class="tableblock halign-left valign-top"><p class="tableblock"><code>CommandDtoService-</code><br> <code>InternalServiceDefault</code><br> <code>isis-core-metamodel</code></p></td> 
+          <td class="tableblock halign-left valign-top">
+           <div></div></td> 
+         </tr> 
+        </tbody> 
+       </table> 
+       <div class="paragraph"> 
+        <p>Key:</p> 
+       </div> 
+       <div class="ulist"> 
+        <ul> 
+         <li> <p><code>o.a.i</code> is an abbreviation for <code>org.apache.isis</code></p> </li> 
+         <li> <p><code>o.ia.m</code> is an abbreviation for <code>org.isisaddons.module</code></p> </li> 
+         <li> <p><code>o.a.i.c.m.s</code> is an abbreviation for <code>org.apache.isis.core.metamodel.services</code></p> </li> 
+         <li> <p><code>o.a.i.c.r.s</code> is an abbreviation for <code>org.apache.isis.core.runtime.services</code></p> </li> 
+        </ul> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_rgfis_spi_AuthenticationSessionProvider">3.1. <code>AuthenticationSessionProvider</code></h3> 
+        <div class="paragraph"> 
+         <p>The (internal) <code>AuthenticationSessionProvider</code> domain service is simply responsible for obtaining the <code>AuthenticationSession</code> (being the framework\u2019s internal representation of the currently logged in user).</p> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_spi_and_implementation">3.1.1. SPI and Implementation</h4> 
+         <div class="paragraph"> 
+          <p>The SPI of the service is:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">interface</span> <span class="class">AuthenticationSessionProvider</span> {
     AuthenticationSession getAuthenticationSession();
-}</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>The framework provides a default implementation of the service, <code>AuthenticationSessionProviderDefault</code>, which looks up
-the current <code>AuthenticationSession</code> from <code>IsisSessionFactory</code> singleton service:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java">isisSessionFactory.getCurrentSession().getAuthenticationSession();</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>If <a href="rgsvc.html#_rgsvc_api_SudoService"><code>SudoService</code></a> has been used to temporarily override the user and/or roles, then this service will report the overridden values.</p>
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_rgfis_spi_CommandDtoServiceInternal">3.2. <code>CommandDtoServiceInternal</code></h3>
-<div class="paragraph">
-<p>The <code>CommandDtoServiceInternal</code> is responsible for creating an memento of the current action
-invocation or property edit, to store in the <code>Command</code> object (from
-<a href="rgsvc.html#_rgsvc_api_CommandContext"><code>CommandContext</code></a>).  This memento is a JAXB DTO being an instance of the
-<a href="rgcms.html#_rgcms_schema-cmd">"cmd" schema</a>, so can be reified so that its execution can be deferred until later,
-as a <a href="rgsvc.html#_rgsvc_spi_BackgroundCommandService">background command</a>.</p>
-</div>
-<div class="sect3">
-<h4 id="_spi_implementation">3.2.1. SPI &amp; Implementation</h4>
-<div class="paragraph">
-<p>The SPI of the service is:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">interface</span> <span class="class">CommandDtoServiceInternal</span> {
+}</code></pre> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>The framework provides a default implementation of the service, <code>AuthenticationSessionProviderDefault</code>, which looks up the current <code>AuthenticationSession</code> from <code>IsisSessionFactory</code> singleton service:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="java">isisSessionFactory.getCurrentSession().getAuthenticationSession();</code></pre> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>If <a href="rgsvc.html#_rgsvc_api_SudoService"><code>SudoService</code></a> has been used to temporarily override the user and/or roles, then this service will report the overridden values.</p> 
+         </div> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_rgfis_spi_CommandDtoServiceInternal">3.2. <code>CommandDtoServiceInternal</code></h3> 
+        <div class="paragraph"> 
+         <p>The <code>CommandDtoServiceInternal</code> is responsible for creating an memento of the current action invocation or property edit, to store in the <code>Command</code> object (from <a href="rgsvc.html#_rgsvc_api_CommandContext"><code>CommandContext</code></a>). This memento is a JAXB DTO being an instance of the <a href="rgcms.html#_rgcms_schema-cmd">"cmd" schema</a>, so can be reified so that its execution can be deferred until later, as a <a href="rgsvc.html#_rgsvc_spi_BackgroundCommandService">background command</a>.</p> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_spi_implementation">3.2.1. SPI &amp; Implementation</h4> 
+         <div class="paragraph"> 
+          <p>The SPI of the service is:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">interface</span> <span class="class">CommandDtoServiceInternal</span> {
     <span class="annotation">@Deprecated</span>
     ActionInvocationMemento asActionInvocationMemento(      <i class="conum" data-value="1"></i><b>(1)</b>
             <span class="predefined-type">Method</span> m,
@@ -1251,118 +1101,108 @@ as a <a href="rgsvc.html#_rgsvc_spi_BackgroundCommandService">background command
             <span class="directive">final</span> OneToOneAssociation property,
             <span class="directive">final</span> PropertyDto propertyDto,
             <span class="directive">final</span> ObjectAdapter valueAdapter);
-}</code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td>Note that this method (more precisely, <code>ActionInvocationMemento</code>) does <em>not</em> support mixins.</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="2"></i><b>2</b></td>
-<td>Returns a JAXB DTO being an instance of the <a href="rgcms.html#_rgcms_schema-cmd">"cmd" schema</a> (hence convertible to
-XML) that represents the <em>intention</em> to invoke an action on a target object (or possibly many targets, for
-bulk actions).  If an action, it can also be either mixin action or a contributed action.</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="3"></i><b>3</b></td>
-<td>Returns a JAXB DTO that represents the intention to edit (set or clear) a property on a target (or possibly many
-targets, for symmetry with actions).</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="4"></i><b>4</b></td>
-<td>add the arguments of an action to an <code>ActionDto</code>.  This is used when the command is actually executed (per <a href="rgsvc.html#_rgsvc_api_InteractionContext"><code>InteractionContext</code></a>) to populate the parameters of the equivalent <code>ActionInvocationDto</code>.</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="5"></i><b>5</b></td>
-<td>add the new value argument of a property to a <code>PropertyDto</code>.  This is used when the command is actually executed (per <a href="rgsvc.html#_rgsvc_api_InteractionContext"><code>InteractionContext</code></a>) to set the the new value of the equivalent <code>PropertyEditDto</code>.</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>The SPI is implemented by <code>o.a.i.c.r.s.command.CommandDtoServiceInternalServiceDefault</code>.</p>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_related_services_3">3.2.2. Related Services</h4>
-<div class="paragraph">
-<p>The design of this service is similar to that of
-<a href="#_rgfis_spi_InteractionDtoServiceInternal"><code>InteractionDtoServiceInternal</code></a>, used to create the
-<code>MemberExecutionDto</code> (from the <a href="rgcms.html#_rgcms_schema-ixn">"ixn" schema</a>).</p>
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="

<TRUNCATED>

[15/44] isis-site git commit: ISIS-1594: provide an 'edit' button

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/guides/ugtst.html
----------------------------------------------------------------------
diff --git a/content/guides/ugtst.html b/content/guides/ugtst.html
index 5465749..df3a996 100644
--- a/content/guides/ugtst.html
+++ b/content/guides/ugtst.html
@@ -1,12 +1,10 @@
 <!doctype html>
 <html class="no-js" lang="en">
-<head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-
-    <title>Testing</title>
-
-    <!--
+ <head> 
+  <meta charset="utf-8"> 
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"> 
+  <title>Testing</title> 
+  <!--
         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
@@ -23,31 +21,21 @@
         KIND, either express or implied.  See the License for the
         specific language governing permissions and limitations
         under the License.
-    -->
-
-    <!-- No caching headers -->
-    <meta http-equiv="cache-control" content="no-cache" />
-    <meta http-equiv="pragma" content="no-cache" />
-    <meta http-equiv="expires" content="-1" />
-
-
-    <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
-    <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet" />
-    <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script>
-    <link href="../css/asciidoctor/colony.css" rel="stylesheet">
-    <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-
-
-
-    <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
-    <!--[if lt IE 9]>
+    --> 
+  <!-- No caching headers --> 
+  <meta http-equiv="cache-control" content="no-cache"> 
+  <meta http-equiv="pragma" content="no-cache"> 
+  <meta http-equiv="expires" content="-1"> 
+  <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line --> 
+  <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet"> 
+  <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script> 
+  <link href="../css/asciidoctor/colony.css" rel="stylesheet"> 
+  <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet"> 
+  <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet"> 
+  <!--[if lt IE 9]>
       <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
-    <![endif]-->
-
-
-
-    <style type="text/css">
+    <![endif]--> 
+  <style type="text/css">
         pre code {
             background-color: inherit;
             border-style: none;
@@ -192,9 +180,8 @@ table.CodeRay td.code>pre{padding:0}
         color:#fff;
         font-size: 1.1em;
     }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         @media only screen and (min-width: 40.063em) {
           .top-bar {
             .contain-to-grid .top-bar {
@@ -205,9 +192,8 @@ table.CodeRay td.code>pre{padding:0}
         .row {
             max-width: 80rem;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .extended-quote,
         .extended-quote-first {
             margin-left: 40px;
@@ -231,9 +217,8 @@ table.CodeRay td.code>pre{padding:0}
             text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
         }
         
-    </style>
-
-    <style>
+    </style> 
+  <style>
         body {
           position: relative;
         }
@@ -255,6 +240,7 @@ table.CodeRay td.code>pre{padding:0}
 
         div#doc-content {
             margin-top: 30px;
+            padding-top: 30px;
         }
 
         div.documentation-page table.frame-all {
@@ -286,9 +272,8 @@ table.CodeRay td.code>pre{padding:0}
             min-height: 2000px;
         }
 
-    </style>
-
-    <style>
+    </style> 
+  <style>
 
         @media only screen and (min-width: 768px) {
           #toc.toc2 ul ul { margin-left: -10px; }
@@ -316,15 +301,13 @@ table.CodeRay td.code>pre{padding:0}
         body div#toc2 li.tocify-item.active a {
             color: red;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         footer {
             margin-top: 1000px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* overriding colony.css stylesheet */
         .literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
            /*padding: 1.25em 1.5625em 1.125em 1.5625em;*/
@@ -372,9 +355,8 @@ table.CodeRay td.code>pre{padding:0}
         .imageblock img {
             margin-bottom: 10px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* from http://ben.balter.com/2014/03/13/pages-anchor-links/ */
         .header-link {
           position: absolute;
@@ -395,9 +377,8 @@ table.CodeRay td.code>pre{padding:0}
         h6:hover .header-link {
           opacity: 1;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .top-bar
         {
             -webkit-transition-duration: .5s;
@@ -425,666 +406,578 @@ table.CodeRay td.code>pre{padding:0}
             -webkit-transition-property: -webkit-transform;
             transition-property: transform;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         #doc-content a.guide {
             color: white;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
+        .tocify {
+            margin-top: 80px;
+        }
+    </style> 
+  <style>
         .tocify {
             margin-top: 80px;
         }
-    </style>
-
-
-</script>
-
-</head>
-<body>
-
-<<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
-    <div class="github-fork-ribbon">
-        <a href="https://github.com/apache/isis#fork-destination-box">Fork me on GitHub</a>
-    </div>
-</div>
-
-
-<div class="row">
-
-    <div class="fixed contain-to-grid header">
-        <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
-            <ul class="title-area">
-                <li class="name">
-                    <h1>
-                        <a href="/index.html">Apache Isis&trade;</a>
-                    </h1>
-                </li>
-                <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
-                <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
-            </ul>
-
-            <section class="top-bar-section">
-                <ul class="right">
-
-                    <li class="has-form">
-                       <FORM class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
-                        <div class="row collapse">
-                            <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
-                            <INPUT type="hidden" name="cof" value="FORID:0">
-                            <INPUT class="form-control" name="q" type="text" placeholder="Search">
-                        </div>
-                    </FORM>
-                     </li>
-
-                </ul>
-
-                <!-- Left Nav Section -->
-                <ul class="left">
-
-                    <li><a href="/documentation.html">Documentation</a></li>
-                    <li><a href="/downloads.html">Downloads</a></li>
-                    <li><a href="/help.html">Help</a></li>
-                    <li><a href="/asf.html">@ASF</a></li>
-
-                </ul>
-
-            </section>
-        </nav>
-    </div>
-</div>
-
-<div class="row">
-
-    <div id="doc-content-left" class="large-9 medium-9 columns">
-
-
-        <div id="doc-content">
-          <div class="sect1">
-<h2 id="_ugtst">1. Testing</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>If you are going to use Apache Isis for developing complex business-critical applications, then being able to write
-automated tests for those applications becomes massively important.  As such Apache Isis treats the topic of testing
-very seriously.  (Though we say it ourselves), the framework has support that goes way above what is provided by other
-application frameworks.</p>
-</div>
-<div class="paragraph">
-<p>This guide describes those features available to you for testing your Apache Isis application.</p>
-</div>
-<div class="sect2">
-<h3 id="_other_guides">1.1. Other Guides</h3>
-<div class="paragraph">
-<p>Apache Isis documentation is broken out into a number of user, reference and "supporting procedures" guides.</p>
-</div>
-<div class="paragraph">
-<p>The user guides available are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="ugfun.html">Fundamentals</a></p>
-</li>
-<li>
-<p><a href="ugvw.html">Wicket viewer</a></p>
-</li>
-<li>
-<p><a href="ugvro.html">Restful Objects viewer</a></p>
-</li>
-<li>
-<p><a href="ugdno.html">DataNucleus object store</a></p>
-</li>
-<li>
-<p><a href="ugsec.html">Security</a></p>
-</li>
-<li>
-<p><a href="#">Testing</a> (this guide)</p>
-</li>
-<li>
-<p><a href="ugbtb.html">Beyond the Basics</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The reference guides are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="rgant.html">Annotations</a></p>
-</li>
-<li>
-<p><a href="rgsvc.html">Domain Services</a></p>
-</li>
-<li>
-<p><a href="rgcfg.html">Configuration Properties</a></p>
-</li>
-<li>
-<p><a href="rgcms.html">Classes, Methods and Schema</a></p>
-</li>
-<li>
-<p><a href="rgmvn.html">Apache Isis Maven plugin</a></p>
-</li>
-<li>
-<p><a href="rgfis.html">Framework Internal Services</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The remaining guides are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="dg.html">Developers' Guide</a> (how to set up a development environment
-for Apache Isis and contribute back to the project)</p>
-</li>
-<li>
-<p><a href="cgcom.html">Committers' Guide</a> (release procedures and related practices)</p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_ugtst_aaa">2. Overview</h2>
-<div class="sectionbody">
-<div class="sect2">
-<h3 id="_unit_tests_vs_integ_tests">2.1. Unit tests vs Integ tests</h3>
-<div class="paragraph">
-<p>We divide automated tests into two broad categories:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>unit tests exercise a single unit (usually a method) of a domain object, in isolation. <br></p>
-<div class="paragraph">
-<p>Dependencies of that object are mocked out.  These are written by a developer and for a developer; they are to ensure that a particular "cog in the machine" works correctly</p>
-</div>
-</li>
-<li>
-<p>integration tests exercise the application as a whole, usually focusing on one particular business operation (action). <br></p>
-<div class="paragraph">
-<p>These are tests that represent the acceptance criteria of some business story; their intent should make sense to the domain expert (even if the domain expert is "non-technical")</p>
-</div>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>To put it another way:</p>
-</div>
-<div class="admonitionblock tip">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-tip" title="Tip"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>Integration tests help ensure that you are <strong><em>building the right system</em></strong></p>
-</div>
-<div class="paragraph">
-<p>Unit tests help ensure that you are <strong><em>building the system right</em></strong>.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_integ_tests_vs_bdd_specs">2.2. Integ tests vs BDD Specs</h3>
-<div class="paragraph">
-<p>We further sub-divide integration tests into:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>those that are implemented in Java and JUnit (we call these simply <em>"integration tests"</em>)<br></p>
-<div class="paragraph">
-<p>Even if a domain expert understands the intent of these tests, the actual implementation will be opaque to them.  Also, the only output from the tests is a (hopefully) green CI job</p>
-</div>
-</li>
-<li>
-<p>tests (or rather, specifications) that are implemented in a <em>behaviour-driven design</em> (BDD) language such as <a href="https://cucumber.io/">Cucumber</a> (we call these <em>"BDD specs"</em>)<br></p>
-<div class="paragraph">
-<p>The natural language specification then maps down onto some glue code that is used to drive the application.  But the benefits of taking a BDD approach include the fact that your domain expert will be able to read the tests/specifications, and that when you run the specs, you also get documentation of the application&#8217;s behaviour ("living documentation").</p>
-</div>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>It&#8217;s up to you whether you use BDD specs for your apps; it will depend on your development process and company culture.  But you if don&#8217;t then you certainly should write integration tests: acceptance criteria for user stories should be automated!</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_simulated_ui_code_wrapperfactory_code">2.3. Simulated UI (<code>WrapperFactory</code>)</h3>
-<div class="paragraph">
-<p>When we talk about integration tests/specs here, we mean tests that exercise the domain object logic, through to the actual database.  But we also want the tests to exercise the app from the users&#8217;s perspective, which means including the user interface.</p>
-</div>
-<div class="paragraph">
-<p>For most other frameworks that would require having to test the application in a very heavy weight/fragile fashion using a tool such as <a href="http://docs.seleniumhq.org/">Selenium</a>, driving a web browser to navigate .  In this regard though, Apache Isis has a significant trick up its sleeve.  Because Apache Isis implements the naked objects pattern, it means that the UI is generated automatically from the UI.  This therefore allows for other implementations of the UI.</p>
-</div>
-<div class="paragraph">
-<p>The <a href="rgsvc.html#_rgsvc_api_WrapperFactory"><code>WrapperFactory</code></a> domain service allows a test to wrap domain objects and thus to interact with said objects "as if" through the UI:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="images/testing/integ-tests.png" alt="integ tests" width="700px">
-</div>
-</div>
-<div class="paragraph">
-<p>If the test invokes an action that is disabled, then the wrapper will throw an appropriate exception.  If the action is ok to invoke, it delegates through.</p>
-</div>
-<div class="paragraph">
-<p>What this means is that an Isis application can be tested end-to-end without having to deploy it onto a webserver; the whole app can be tested while running in-memory.  Although integration tests re (necessarily) slower than unit tests, they are not any harder to write (in fact, in some respects they are easier).</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_dependency_injection">2.4. Dependency Injection</h3>
-<div class="paragraph">
-<p>Isis provides autowiring dependency injection into every domain object.  This is most useful when writing unit tests; simply mock out the service and inject into the domain object.</p>
-</div>
-<div class="paragraph">
-<p>There are a number of syntaxes supported, but the simplest is to use <code>@javax.inject.Inject</code> annotation; for example:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@javax</span>.inject.Inject
-CustomerRepository customers;</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Isis can inject into this even if the field has package-level (or even <code>private</code>) visibility.  We recommend that you use package-level visibility, though, so that your unit tests (in the same package as the class under test) are able to inject mocks.</p>
-</div>
-<div class="paragraph">
-<p>Isis does also support a couple of other syntaxes:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">void</span> setCustomerRepository(CustomerRepository customers) { ... }</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>or</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">void</span> injectCustomerRepository(CustomerRepository customers) { ... }</code></pre>
-</div>
-</div>
-<div class="admonitionblock tip">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-tip" title="Tip"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>Apache Isis also supports automatic dependency injection into integration tests; just declare the service dependency in the usual fashion and it will be automatically injected.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_given_when_then">2.5. Given/When/Then</h3>
-<div class="paragraph">
-<p>Whatever type of test/spec you are writing, we recommend you follow the given/when/then idiom:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><strong>given</strong> the system is in this state (preconditions)</p>
-</li>
-<li>
-<p><strong>when</strong> I poke it with a stick</p>
-</li>
-<li>
-<p><strong>then</strong> it looks like this (postconditions)</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>A good test should be 5 to 10 lines long; the test should be there to help you reason about the behaviour of the system.  Certainly if the test becomes more than 20 lines it&#8217;ll be too difficult to understand.</p>
-</div>
-<div class="paragraph">
-<p>The "when" part is usually a one-liner, and in the "then" part there will often be only two or three assertions that you want to make that the system has changed as it should.</p>
-</div>
-<div class="paragraph">
-<p>For unit test the "given" part shouldn&#8217;t be too difficult either: just instantiate the class under test, wire in the appropriate mocks and set up the expectations.  And if there are too many mock expectations to set up, then "listen to the tests" &#8230;&#8203; they are telling you your design needs some work.</p>
-</div>
-<div class="paragraph">
-<p>Where things get difficult though is the "given" for integration tests; which is the topic of the next section&#8230;&#8203;</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_fixture_management">2.6. Fixture Management</h3>
-<div class="paragraph">
-<p>In the previous section we discussed using given/when/then as a form of organizing tests, and why you should keep your tests small.</p>
-</div>
-<div class="paragraph">
-<p>For integration tests though it can be difficult to keep the "given" short; there could be a lot of prerequisite data that needs to exist before you can actually exercise your system.  Moreover, however we do set up that data, but we also want to do so in a way that is resilient to the system changing over time.</p>
-</div>
-<div class="paragraph">
-<p>The solution that Apache Isis provides is a domain service called <a href="rgcms.html#_rgcms_classes_super_FixtureScripts">Fixture Scripts</a>, that defines a pattern and supporting classes to help ensure that the "data setup" for your tests are reusable and maintainable over time.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_fake_data">2.7. Fake data</h3>
-<div class="paragraph">
-<p>In any given test there are often quite a few variables involved, to initialize the state of the objects, or to act as arguments for invoking a method, or when asserting on post-conditions.  Sometimes those values are important (eg verifying that an `Order&#8217;s state went from PENDING to SHIPPED, say), but often they aren&#8217;t (a customer&#8217;s name, for example) but nevertheless need to be set up (especially in integration tests).</p>
-</div>
-<div class="paragraph">
-<p>We want our tests to be easily understood, and we want the reader&#8217;s eye to be drawn to the values that are significant and ignore those that are not.</p>
-</div>
-<div class="paragraph">
-<p>One way to do this is to use random (or fake) values for any insignificant data.  This in effect tells the reader that "any value will do".  Moreover, if it turns out that any data won&#8217;t do, and that there&#8217;s some behaviour that is sensitive to the value, then the test will start to flicker, passing and then failing depending on inputs.  This is A Good Thing&#8482;.</p>
-</div>
-<div class="paragraph">
-<p>Apache Isis does not, itself, ship with a fake data library.  However, the <a href="http://github.com/isisaddons/isis-module-fakedata">Isis addons' fakedata</a> module (non-ASF) does provide exactly this capability.</p>
-</div>
-<div class="admonitionblock tip">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-tip" title="Tip"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>Using fake data works very well with fixture scripts; the fixture script can invoke the business action with sensible (fake/random) defaults, and only require that the essential information is passed into it by the test.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_feature_toggles">2.8. Feature Toggles</h3>
-<div class="paragraph">
-<p>Writing automated tests is just good development practice.  Also good practice is developing on the mainline (master, trunk); so that your continuous integration system really is integrating all code.  Said another way: <a href="http://martinfowler.com/bliki/FeatureBranch.html">don&#8217;t use branches</a>!</p>
-</div>
-<div class="paragraph">
-<p>Sometimes, though, a feature will take longer to implement than your iteration cycle.  In such a case, how do you use continuous integration to keep everyone working on the mainline without revealing a half-implemented feature on your releases?  One option is to use <a href="http://martinfowler.com/bliki/FeatureToggle.html">feature toggle</a>s.</p>
-</div>
-<div class="paragraph">
-<p>Apache Isis does not, itself, ship with a feature toggle library.  However, the <a href="http://github.com/isisaddons/isis-module-togglz">Isis addons' togglz</a> module (non-ASF) does provide exactly this capability.</p>
-</div>
-<div class="paragraph">
-<p>With all that said, let&#8217;s look in detail at the testing features provided by Apache Isis.</p>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_ugtst_unit-test-support">3. Unit Test Support</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Isis Core provides a number of unit test helpers for you to use (if you wish) to unit test your domain objects.</p>
-</div>
-<div class="sect2">
-<h3 id="_ugtst_unit-test-support_contract-tests">3.1. Contract Tests</h3>
-<div class="paragraph">
-<p>Contract tests ensure that all instances of a particular idiom/pattern that occur within your codebase are implemented correctly.  You could think of them as being a way to enforce a certain type of coding standard.  Implementation-wise they use <a href="https://code.google.com/p/reflections/">Reflections</a> library to scan for classes.</p>
-</div>
-<div class="sect3">
-<h4 id="__code_sortedset_code_s">3.1.1. <code>SortedSet</code>s</h4>
-<div class="paragraph">
-<p>This contract test automatically checks that all fields of type <code>java.util.Collection</code> are declared as <code>java.util.SortedSet</code>. In other words, it precludes either <code>java.util.List</code> or <code>java.util.Set</code> from being used as a collection.</p>
-</div>
-<div class="paragraph">
-<p>For example, the following passes the contract test:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">Department</span> {
+    </style>  
+ </head> 
+ <body> 
+  <div class="row"> 
+   <div class="fixed contain-to-grid header"> 
+    <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem"> 
+     <ul class="title-area"> 
+      <li class="name"> <h1> <a href="/index.html">Apache Isis\u2122</a> </h1> </li> 
+      <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone --> 
+      <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li> 
+     </ul> 
+     <section class="top-bar-section"> 
+      <ul class="right"> 
+       <li class="has-form"> 
+        <form class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse"> 
+         <div class="row collapse"> 
+          <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya"> 
+          <input type="hidden" name="cof" value="FORID:0"> 
+          <input class="form-control" name="q" type="text" placeholder="Search"> 
+         </div> 
+        </form> </li> 
+      </ul> 
+      <!-- Left Nav Section --> 
+      <ul class="left"> 
+       <li><a href="/documentation.html">Documentation</a></li> 
+       <li><a href="/downloads.html">Downloads</a></li> 
+       <li><a href="/help.html">Help</a></li> 
+       <li><a href="/asf.html">@ASF</a></li> 
+      </ul> 
+     </section> 
+    </nav> 
+   </div> 
+  </div> 
+  <div class="row"> 
+   <div id="doc-content-left" class="large-9 medium-9 columns"> 
+    <div id="doc-content">
+     <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/ugtst.adoc&quot;" style="float: right; font-size: small; padding: 6px;  "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+     <div class="sect1"> 
+      <h2 id="_ugtst">1. Testing</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_ugtst.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>If you are going to use Apache Isis for developing complex business-critical applications, then being able to write automated tests for those applications becomes massively important. As such Apache Isis treats the topic of testing very seriously. (Though we say it ourselves), the framework has support that goes way above what is provided by other application frameworks.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>This guide describes those features available to you for testing your Apache Isis application.</p> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_other_guides">1.1. Other Guides</h3> 
+        <div class="paragraph"> 
+         <p>Apache Isis documentation is broken out into a number of user, reference and "supporting procedures" guides.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The user guides available are:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><a href="ugfun.html">Fundamentals</a></p> </li> 
+          <li> <p><a href="ugvw.html">Wicket viewer</a></p> </li> 
+          <li> <p><a href="ugvro.html">Restful Objects viewer</a></p> </li> 
+          <li> <p><a href="ugdno.html">DataNucleus object store</a></p> </li> 
+          <li> <p><a href="ugsec.html">Security</a></p> </li> 
+          <li> <p><a href="#">Testing</a> (this guide)</p> </li> 
+          <li> <p><a href="ugbtb.html">Beyond the Basics</a></p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The reference guides are:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><a href="rgant.html">Annotations</a></p> </li> 
+          <li> <p><a href="rgsvc.html">Domain Services</a></p> </li> 
+          <li> <p><a href="rgcfg.html">Configuration Properties</a></p> </li> 
+          <li> <p><a href="rgcms.html">Classes, Methods and Schema</a></p> </li> 
+          <li> <p><a href="rgmvn.html">Apache Isis Maven plugin</a></p> </li> 
+          <li> <p><a href="rgfis.html">Framework Internal Services</a></p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The remaining guides are:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><a href="dg.html">Developers' Guide</a> (how to set up a development environment for Apache Isis and contribute back to the project)</p> </li> 
+          <li> <p><a href="cgcom.html">Committers' Guide</a> (release procedures and related practices)</p> </li> 
+         </ul> 
+        </div> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_ugtst_aaa">2. Overview</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_ugtst_aaa.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="sect2"> 
+        <h3 id="_unit_tests_vs_integ_tests">2.1. Unit tests vs Integ tests</h3> 
+        <div class="paragraph"> 
+         <p>We divide automated tests into two broad categories:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p>unit tests exercise a single unit (usually a method) of a domain object, in isolation. <br></p> 
+           <div class="paragraph"> 
+            <p>Dependencies of that object are mocked out. These are written by a developer and for a developer; they are to ensure that a particular "cog in the machine" works correctly</p> 
+           </div> </li> 
+          <li> <p>integration tests exercise the application as a whole, usually focusing on one particular business operation (action). <br></p> 
+           <div class="paragraph"> 
+            <p>These are tests that represent the acceptance criteria of some business story; their intent should make sense to the domain expert (even if the domain expert is "non-technical")</p> 
+           </div> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>To put it another way:</p> 
+        </div> 
+        <div class="admonitionblock tip"> 
+         <table> 
+          <tbody>
+           <tr> 
+            <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td> 
+            <td class="content"> 
+             <div class="paragraph"> 
+              <p>Integration tests help ensure that you are <strong><em>building the right system</em></strong></p> 
+             </div> 
+             <div class="paragraph"> 
+              <p>Unit tests help ensure that you are <strong><em>building the system right</em></strong>.</p> 
+             </div> </td> 
+           </tr> 
+          </tbody>
+         </table> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_integ_tests_vs_bdd_specs">2.2. Integ tests vs BDD Specs</h3> 
+        <div class="paragraph"> 
+         <p>We further sub-divide integration tests into:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p>those that are implemented in Java and JUnit (we call these simply <em>"integration tests"</em>)<br></p> 
+           <div class="paragraph"> 
+            <p>Even if a domain expert understands the intent of these tests, the actual implementation will be opaque to them. Also, the only output from the tests is a (hopefully) green CI job</p> 
+           </div> </li> 
+          <li> <p>tests (or rather, specifications) that are implemented in a <em>behaviour-driven design</em> (BDD) language such as <a href="https://cucumber.io/">Cucumber</a> (we call these <em>"BDD specs"</em>)<br></p> 
+           <div class="paragraph"> 
+            <p>The natural language specification then maps down onto some glue code that is used to drive the application. But the benefits of taking a BDD approach include the fact that your domain expert will be able to read the tests/specifications, and that when you run the specs, you also get documentation of the application\u2019s behaviour ("living documentation").</p> 
+           </div> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>It\u2019s up to you whether you use BDD specs for your apps; it will depend on your development process and company culture. But you if don\u2019t then you certainly should write integration tests: acceptance criteria for user stories should be automated!</p> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_simulated_ui_code_wrapperfactory_code">2.3. Simulated UI (<code>WrapperFactory</code>)</h3> 
+        <div class="paragraph"> 
+         <p>When we talk about integration tests/specs here, we mean tests that exercise the domain object logic, through to the actual database. But we also want the tests to exercise the app from the users\u2019s perspective, which means including the user interface.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>For most other frameworks that would require having to test the application in a very heavy weight/fragile fashion using a tool such as <a href="http://docs.seleniumhq.org/">Selenium</a>, driving a web browser to navigate . In this regard though, Apache Isis has a significant trick up its sleeve. Because Apache Isis implements the naked objects pattern, it means that the UI is generated automatically from the UI. This therefore allows for other implementations of the UI.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The <a href="rgsvc.html#_rgsvc_api_WrapperFactory"><code>WrapperFactory</code></a> domain service allows a test to wrap domain objects and thus to interact with said objects "as if" through the UI:</p> 
+        </div> 
+        <div class="imageblock"> 
+         <div class="content"> 
+          <img src="images/testing/integ-tests.png" alt="integ tests" width="700px"> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>If the test invokes an action that is disabled, then the wrapper will throw an appropriate exception. If the action is ok to invoke, it delegates through.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>What this means is that an Isis application can be tested end-to-end without having to deploy it onto a webserver; the whole app can be tested while running in-memory. Although integration tests re (necessarily) slower than unit tests, they are not any harder to write (in fact, in some respects they are easier).</p> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_dependency_injection">2.4. Dependency Injection</h3> 
+        <div class="paragraph"> 
+         <p>Isis provides autowiring dependency injection into every domain object. This is most useful when writing unit tests; simply mock out the service and inject into the domain object.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>There are a number of syntaxes supported, but the simplest is to use <code>@javax.inject.Inject</code> annotation; for example:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@javax</span>.inject.Inject
+CustomerRepository customers;</code></pre> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Isis can inject into this even if the field has package-level (or even <code>private</code>) visibility. We recommend that you use package-level visibility, though, so that your unit tests (in the same package as the class under test) are able to inject mocks.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Isis does also support a couple of other syntaxes:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">void</span> setCustomerRepository(CustomerRepository customers) { ... }</code></pre> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>or</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">void</span> injectCustomerRepository(CustomerRepository customers) { ... }</code></pre> 
+         </div> 
+        </div> 
+        <div class="admonitionblock tip"> 
+         <table> 
+          <tbody>
+           <tr> 
+            <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td> 
+            <td class="content"> 
+             <div class="paragraph"> 
+              <p>Apache Isis also supports automatic dependency injection into integration tests; just declare the service dependency in the usual fashion and it will be automatically injected.</p> 
+             </div> </td> 
+           </tr> 
+          </tbody>
+         </table> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_given_when_then">2.5. Given/When/Then</h3> 
+        <div class="paragraph"> 
+         <p>Whatever type of test/spec you are writing, we recommend you follow the given/when/then idiom:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><strong>given</strong> the system is in this state (preconditions)</p> </li> 
+          <li> <p><strong>when</strong> I poke it with a stick</p> </li> 
+          <li> <p><strong>then</strong> it looks like this (postconditions)</p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>A good test should be 5 to 10 lines long; the test should be there to help you reason about the behaviour of the system. Certainly if the test becomes more than 20 lines it\u2019ll be too difficult to understand.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The "when" part is usually a one-liner, and in the "then" part there will often be only two or three assertions that you want to make that the system has changed as it should.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>For unit test the "given" part shouldn\u2019t be too difficult either: just instantiate the class under test, wire in the appropriate mocks and set up the expectations. And if there are too many mock expectations to set up, then "listen to the tests" \u2026\u200b they are telling you your design needs some work.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Where things get difficult though is the "given" for integration tests; which is the topic of the next section\u2026\u200b</p> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_fixture_management">2.6. Fixture Management</h3> 
+        <div class="paragraph"> 
+         <p>In the previous section we discussed using given/when/then as a form of organizing tests, and why you should keep your tests small.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>For integration tests though it can be difficult to keep the "given" short; there could be a lot of prerequisite data that needs to exist before you can actually exercise your system. Moreover, however we do set up that data, but we also want to do so in a way that is resilient to the system changing over time.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The solution that Apache Isis provides is a domain service called <a href="rgcms.html#_rgcms_classes_super_FixtureScripts">Fixture Scripts</a>, that defines a pattern and supporting classes to help ensure that the "data setup" for your tests are reusable and maintainable over time.</p> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_fake_data">2.7. Fake data</h3> 
+        <div class="paragraph"> 
+         <p>In any given test there are often quite a few variables involved, to initialize the state of the objects, or to act as arguments for invoking a method, or when asserting on post-conditions. Sometimes those values are important (eg verifying that an `Order\u2019s state went from PENDING to SHIPPED, say), but often they aren\u2019t (a customer\u2019s name, for example) but nevertheless need to be set up (especially in integration tests).</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>We want our tests to be easily understood, and we want the reader\u2019s eye to be drawn to the values that are significant and ignore those that are not.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>One way to do this is to use random (or fake) values for any insignificant data. This in effect tells the reader that "any value will do". Moreover, if it turns out that any data won\u2019t do, and that there\u2019s some behaviour that is sensitive to the value, then the test will start to flicker, passing and then failing depending on inputs. This is A Good Thing\u2122.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Apache Isis does not, itself, ship with a fake data library. However, the <a href="http://github.com/isisaddons/isis-module-fakedata">Isis addons' fakedata</a> module (non-ASF) does provide exactly this capability.</p> 
+        </div> 
+        <div class="admonitionblock tip"> 
+         <table> 
+          <tbody>
+           <tr> 
+            <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td> 
+            <td class="content"> 
+             <div class="paragraph"> 
+              <p>Using fake data works very well with fixture scripts; the fixture script can invoke the business action with sensible (fake/random) defaults, and only require that the essential information is passed into it by the test.</p> 
+             </div> </td> 
+           </tr> 
+          </tbody>
+         </table> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_feature_toggles">2.8. Feature Toggles</h3> 
+        <div class="paragraph"> 
+         <p>Writing automated tests is just good development practice. Also good practice is developing on the mainline (master, trunk); so that your continuous integration system really is integrating all code. Said another way: <a href="http://martinfowler.com/bliki/FeatureBranch.html">don\u2019t use branches</a>!</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Sometimes, though, a feature will take longer to implement than your iteration cycle. In such a case, how do you use continuous integration to keep everyone working on the mainline without revealing a half-implemented feature on your releases? One option is to use <a href="http://martinfowler.com/bliki/FeatureToggle.html">feature toggle</a>s.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Apache Isis does not, itself, ship with a feature toggle library. However, the <a href="http://github.com/isisaddons/isis-module-togglz">Isis addons' togglz</a> module (non-ASF) does provide exactly this capability.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>With all that said, let\u2019s look in detail at the testing features provided by Apache Isis.</p> 
+        </div> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_ugtst_unit-test-support">3. Unit Test Support</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_ugtst_unit-test-support.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>Isis Core provides a number of unit test helpers for you to use (if you wish) to unit test your domain objects.</p> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_ugtst_unit-test-support_contract-tests">3.1. Contract Tests</h3> 
+        <div class="paragraph"> 
+         <p>Contract tests ensure that all instances of a particular idiom/pattern that occur within your codebase are implemented correctly. You could think of them as being a way to enforce a certain type of coding standard. Implementation-wise they use <a href="https://code.google.com/p/reflections/">Reflections</a> library to scan for classes.</p> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="__code_sortedset_code_s">3.1.1. <code>SortedSet</code>s</h4> 
+         <div class="paragraph"> 
+          <p>This contract test automatically checks that all fields of type <code>java.util.Collection</code> are declared as <code>java.util.SortedSet</code>. In other words, it precludes either <code>java.util.List</code> or <code>java.util.Set</code> from being used as a collection.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>For example, the following passes the contract test:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">Department</span> {
     <span class="directive">private</span> <span class="predefined-type">SortedSet</span>&lt;Employee&gt; employees = <span class="keyword">new</span> <span class="predefined-type">TreeSet</span>&lt;Employee&gt;();
     ...
-}</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>whereas this would not:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">SomeDomainObject</span> {
+}</code></pre> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>whereas this would not:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">SomeDomainObject</span> {
     <span class="directive">private</span> <span class="predefined-type">List</span>&lt;Employee&gt; employees = <span class="keyword">new</span> <span class="predefined-type">ArrayList</span>&lt;Employee&gt;();
     ...
-}</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>If using DataNucleus against an RDBMS (as you probably are) then we strongly recommend that you implement this test, for several reasons:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>first, <code>Set</code>s align more closely to the relational model than do <code>List</code>s. A <code>List</code> must have an additional index to specify order.</p>
-</li>
-<li>
-<p>second, <code>SortedSet</code> is preferable to <code>Set</code> because then the order is well-defined and predictable (to an end user, to the programmer).<br></p>
-<div class="paragraph">
-<p>The <a href="rgcms.html#_rgcms_classes_utility_ObjectContracts"><code>ObjectContracts</code></a>  utility class substantially simplifies the task of implementing <code>Comparable</code> in your domain classes.</p>
-</div>
-</li>
-<li>
-<p>third, if the relationship is bidirectional then JDO/Objectstore will automatically maintain the relationship.</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>To use the contract test, subclass <code>SortedSetsContractTestAbstract</code>, specifying the root package to search for domain classes.</p>
-</div>
-<div class="paragraph">
-<p>For example:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">SortedSetsContractTestAll</span> <span class="directive">extends</span> SortedSetsContractTestAbstract {
+}</code></pre> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>If using DataNucleus against an RDBMS (as you probably are) then we strongly recommend that you implement this test, for several reasons:</p> 
+         </div> 
+         <div class="ulist"> 
+          <ul> 
+           <li> <p>first, <code>Set</code>s align more closely to the relational model than do <code>List</code>s. A <code>List</code> must have an additional index to specify order.</p> </li> 
+           <li> <p>second, <code>SortedSet</code> is preferable to <code>Set</code> because then the order is well-defined and predictable (to an end user, to the programmer).<br></p> 
+            <div class="paragraph"> 
+             <p>The <a href="rgcms.html#_rgcms_classes_utility_ObjectContracts"><code>ObjectContracts</code></a> utility class substantially simplifies the task of implementing <code>Comparable</code> in your domain classes.</p> 
+            </div> </li> 
+           <li> <p>third, if the relationship is bidirectional then JDO/Objectstore will automatically maintain the relationship.</p> </li> 
+          </ul> 
+         </div> 
+         <div class="paragraph"> 
+          <p>To use the contract test, subclass <code>SortedSetsContractTestAbstract</code>, specifying the root package to search for domain classes.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>For example:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">SortedSetsContractTestAll</span> <span class="directive">extends</span> SortedSetsContractTestAbstract {
 
     <span class="directive">public</span> SortedSetsContractTestAll() {
-        <span class="local-variable">super</span>(<span class="string"><span class="delimiter">&quot;</span><span class="content">org.estatio.dom</span><span class="delimiter">&quot;</span></span>);
+        <span class="local-variable">super</span>(<span class="string"><span class="delimiter">"</span><span class="content">org.estatio.dom</span><span class="delimiter">"</span></span>);
         withLoggingTo(<span class="predefined-type">System</span>.out);
     }
-}</code></pre>
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_bidirectional">3.1.2. Bidirectional</h4>
-<div class="paragraph">
-<p>This contract test automatically checks that bidirectional 1:m or 1:1 associations are being maintained correctly (assuming that they follow the <a href="ugfun.html#_ugfun_how-tos_entity-relationships_managed-1-to-m-bidirectional-relationships">mutual registration pattern</a></p>
-</div>
-<div class="admonitionblock tip">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-tip" title="Tip"></i>
-</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 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>
-</table>
-</div>
-<div class="paragraph">
-<p>For example, suppose that <code>ParentDomainObject</code> and <code>ChildDomainObject</code> have a 1:m relationship (<code>ParentDomainObject#children</code> / <code>ChildDomainObject#parent</code>), and also <code>PeerDomainObject</code> has a 1:1 relationship with itself (<code>PeerDomainObject#next</code> / <code>PeerDomainObject#previous</code>).</p>
-</div>
-<div class="paragraph">
-<p>The following will exercise these relationships:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">BidirectionalRelationshipContractTestAll</span>
+}</code></pre> 
+          </div> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_bidirectional">3.1.2. Bidirectional</h4> 
+         <div class="paragraph"> 
+          <p>This contract test automatically checks that bidirectional 1:m or 1:1 associations are being maintained correctly (assuming that they follow the <a href="ugfun.html#_ugfun_how-tos_entity-relationships_managed-1-to-m-bidirectional-relationships">mutual registration pattern</a></p> 
+         </div> 
+         <div class="admonitionblock tip"> 
+          <table> 
+           <tbody>
+            <tr> 
+             <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </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 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> 
+           </tbody>
+          </table> 
+         </div> 
+         <div class="paragraph"> 
+          <p>For example, suppose that <code>ParentDomainObject</code> and <code>ChildDomainObject</code> have a 1:m relationship (<code>ParentDomainObject#children</code> / <code>ChildDomainObject#parent</code>), and also <code>PeerDomainObject</code> has a 1:1 relationship with itself (<code>PeerDomainObject#next</code> / <code>PeerDomainObject#previous</code>).</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>The following will exercise these relationships:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">BidirectionalRelationshipContractTestAll</span>
         <span class="directive">extends</span> BidirectionalRelationshipContractTestAbstract {
 
     <span class="directive">public</span> BidirectionalRelationshipContractTestAll() {
-        <span class="local-variable">super</span>(<span class="string"><span class="delimiter">&quot;</span><span class="content">org.apache.isis.core.unittestsupport.bidir</span><span class="delimiter">&quot;</span></span>,
+        <span class="local-variable">super</span>(<span class="string"><span class="delimiter">"</span><span class="content">org.apache.isis.core.unittestsupport.bidir</span><span class="delimiter">"</span></span>,
                 ImmutableMap.&lt;<span class="predefined-type">Class</span>&lt;?&gt;,Instantiator&gt;of(
                     ChildDomainObject.class, <span class="keyword">new</span> InstantiatorForChildDomainObject(),
                     PeerDomainObject.class, <span class="keyword">new</span> InstantiatorSimple(PeerDomainObjectForTesting.class)
                 ));
         withLoggingTo(<span class="predefined-type">System</span>.out);
     }
-}</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>The first argument to the constructor scopes the search for domain objects; usually this would be something like <code>&quot;com.mycompany.dom&quot;</code>.</p>
-</div>
-<div class="paragraph">
-<p>The second argument provides a map of <code>Instantiator</code> for certain of the domain object types. This has two main purposes. First, for abstract classes, it nominates an alternative concrete class to be instantiated. Second, for classes (such as <code>ChildDomainObject</code>) that are <code>Comparable</code> and are held in a <code>SortedSet</code>), it provides the ability to ensure that different instances are unique when compared against each other. If no <code>Instantiator</code> is provided, then the contract test simply attempts to instantiates the class.</p>
-</div>
-<div class="paragraph">
-<p>If any of the supporting methods (<code>addToXxx()</code>, <code>removeFromXxx()</code>, <code>modifyXxx()</code> or <code>clearXxx()</code>) are missing, the relationship is skipped.</p>
-</div>
-<div class="paragraph">
-<p>To see what&#8217;s going on (and to identify any skipped relationships), use the <code>withLoggingTo()</code> method call. If any assertion fails then the error should be descriptive enough to figure out the problem (without enabling logging).</p>
-</div>
-<div class="paragraph">
-<p>The example tests can be found <a href="https://github.com/apache/isis/tree/master/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/bidir">here</a>.</p>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_injected_services_method">3.1.3. Injected Services Method</h4>
-<div class="paragraph">
-<p>It is quite common for some basic services to be injected in a project-specific domain object superclass; for example a <code>ClockService</code> might generally be injected everywhere:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="directive">abstract</span> <span class="type">class</span> <span class="class">EstatioDomainObject</span> {
+}</code></pre> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>The first argument to the constructor scopes the search for domain objects; usually this would be something like <code>"com.mycompany.dom"</code>.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>The second argument provides a map of <code>Instantiator</code> for certain of the domain object types. This has two main purposes. First, for abstract classes, it nominates an alternative concrete class to be instantiated. Second, for classes (such as <code>ChildDomainObject</code>) that are <code>Comparable</code> and are held in a <code>SortedSet</code>), it provides the ability to ensure that different instances are unique when compared against each other. If no <code>Instantiator</code> is provided, then the contract test simply attempts to instantiates the class.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>If any of the supporting methods (<code>addToXxx()</code>, <code>removeFromXxx()</code>, <code>modifyXxx()</code> or <code>clearXxx()</code>) are missing, the relationship is skipped.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>To see what\u2019s going on (and to identify any skipped relationships), use the <code>withLoggingTo()</code> method call. If any assertion fails then the error should be descriptive enough to figure out the problem (without enabling logging).</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>The example tests can be found <a href="https://github.com/apache/isis/tree/master/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/bidir">here</a>.</p> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_injected_services_method">3.1.3. Injected Services Method</h4> 
+         <div class="paragraph"> 
+          <p>It is quite common for some basic services to be injected in a project-specific domain object superclass; for example a <code>ClockService</code> might generally be injected everywhere:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="directive">abstract</span> <span class="type">class</span> <span class="class">EstatioDomainObject</span> {
     <span class="annotation">@javax</span>.inject.Inject
     <span class="directive">protected</span> ClockService clockService;
-}</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>If a subclass inadvertantly overrides this method and provides its own <code>ClockService</code> field, then the field in the superclass will never initialized. As you might imagine, <code>NullPointerException</code>s could then arise.</p>
-</div>
-<div class="paragraph">
-<p>This contract test automatically checks that the <code>injectXxx(&#8230;&#8203;)</code> method, to allow for injected services, is not overridable, ie <code>final</code>.</p>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>This contract test is semi-obsolete; most of the time you will want to use <code>@javax.inject.Inject</code> on fields rather than the <code>injectXxx()</code> method.  The feature dates from a time before Apache Isis supported the <code>@Inject</code> annotation.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>To use the contract test, , subclass <code>SortedSetsContractTestAbstract</code>, specifying the root package to search for domain classes.</p>
-</div>
-<div class="paragraph">
-<p>For example:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">InjectServiceMethodMustBeFinalContractTestAll</span> <span class="directive">extends</span> InjectServiceMethodMustBeFinalContractTestAbstract {
+}</code></pre> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>If a subclass inadvertantly overrides this method and provides its own <code>ClockService</code> field, then the field in the superclass will never initialized. As you might imagine, <code>NullPointerException</code>s could then arise.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>This contract test automatically checks that the <code>injectXxx(\u2026\u200b)</code> method, to allow for injected services, is not overridable, ie <code>final</code>.</p> 
+         </div> 
+         <div class="admonitionblock note"> 
+          <table> 
+           <tbody>
+            <tr> 
+             <td class="icon"> <i class="fa icon-note" title="Note"></i> </td> 
+             <td class="content"> 
+              <div class="paragraph"> 
+               <p>This contract test is semi-obsolete; most of the time you will want to use <code>@javax.inject.Inject</code> on fields rather than the <code>injectXxx()</code> method. The feature dates from a time before Apache Isis supported the <code>@Inject</code> annotation.</p> 
+              </div> </td> 
+            </tr> 
+           </tbody>
+          </table> 
+         </div> 
+         <div class="paragraph"> 
+          <p>To use the contract test, , subclass <code>SortedSetsContractTestAbstract</code>, specifying the root package to search for domain classes.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>For example:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">InjectServiceMethodMustBeFinalContractTestAll</span> <span class="directive">extends</span> InjectServiceMethodMustBeFinalContractTestAbstract {
 
     <span class="directive">public</span> InjectServiceMethodMustBeFinalContractTestAll() {
-        <span class="local-variable">super</span>(<span class="string"><span class="delimiter">&quot;</span><span class="content">org.estatio.dom</span><span class="delimiter">&quot;</span></span>);
+        <span class="local-variable">super</span>(<span class="string"><span class="delimiter">"</span><span class="content">org.estatio.dom</span><span class="delimiter">"</span></span>);
         withLoggingTo(<span class="predefined-type">System</span>.out);
     }
-}</code></pre>
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_value_objects">3.1.4. Value Objects</h4>
-<div class="paragraph">
-<p>The <code>ValueTypeContractTestAbstract</code> automatically tests that a custom value type implements <code>equals()</code> and <code>hashCode()</code> correctly.</p>
-</div>
-<div class="paragraph">
-<p>For example, testing JDK&#8217;s own <code>java.math.BigInteger</code> can be done as follows:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">ValueTypeContractTestAbstract_BigIntegerTest</span> <span class="directive">extends</span> ValueTypeContractTestAbstract&lt;<span class="predefined-type">BigInteger</span>&gt; {
+}</code></pre> 
+          </div> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_value_objects">3.1.4. Value Objects</h4> 
+         <div class="paragraph"> 
+          <p>The <code>ValueTypeContractTestAbstract</code> automatically tests that a custom value type implements <code>equals()</code> and <code>hashCode()</code> correctly.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>For example, testing JDK\u2019s own <code>java.math.BigInteger</code> can be done as follows:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">ValueTypeContractTestAbstract_BigIntegerTest</span> <span class="directive">extends</span> ValueTypeContractTestAbstract&lt;<span class="predefined-type">BigInteger</span>&gt; {
 
     <span class="annotation">@Override</span>
     <span class="directive">protected</span> <span class="predefined-type">List</span>&lt;<span class="predefined-type">BigInteger</span>&gt; getObjectsWithSameValue() {
-        <span class="keyword">return</span> <span class="predefined-type">Arrays</span>.asList(<span class="keyword">new</span> <span class="predefined-type">BigInteger</span>(<span class="string"><span class="delimiter">&quot;</span><span class="content">1</span><span class="delimiter">&quot;</span></span>), <span class="keyword">new</span> <span class="predefined-type">BigInteger</span>(<span class="string"><span class="delimiter">&quot;</span><span class="content">1</span><span class="delimiter">&quot;</span></span>));
+        <span class="keyword">return</span> <span class="predefined-type">Arrays</span>.asList(<span class="keyword">new</span> <span class="predefined-type">BigInteger</span>(<span class="string"><span class="delimiter">"</span><span class="content">1</span><span class="delimiter">"</span></span>), <span class="keyword">new</span> <span class="predefined-type">BigInteger</span>(<span class="string"><span class="delimiter">"</span><span class="content">1</span><span class="delimiter">"</span></span>));
     }
 
     <span class="annotation">@Override</span>
     <span class="directive">protected</span> <span class="predefined-type">List</span>&lt;<span class="predefined-type">BigInteger</span>&gt; getObjectsWithDifferentValue() {
-        <span class="keyword">return</span> <span class="predefined-type">Arrays</span>.asList(<span class="keyword">new</span> <span class="predefined-type">BigInteger</span>(<span class="string"><span class="delimiter">&quot;</span><span class="content">2</span><span class="delimiter">&quot;</span></span>));
+        <span class="keyword">return</span> <span class="predefined-type">Arrays</span>.asList(<span class="keyword">new</span> <span class="predefined-type">BigInteger</span>(<span class="string"><span class="delimiter">"</span><span class="content">2</span><span class="delimiter">"</span></span>));
     }
-}</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>The example unit tests can be found <a href="https://github.com/apache/isis/tree/master/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/value">here</a>.</p>
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_ugtst_unit-test-support_jmock-extensions">3.2. JMock Extensions</h3>
-<div class="paragraph">
-<p>As noted earlier, for unit tests we tend to use <a href="http://www.jmock.org">JMock</a> as our mocking library.  The usual given/when/then format gets an extra step:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><strong>given</strong> the system is in this state</p>
-</li>
-<li>
-<p><strong>expecting</strong> these interactions (set up the mock expectations here)</p>
-</li>
-<li>
-<p><strong>when</strong> I poke it with a stick</p>
-</li>
-<li>
-<p><strong>then</strong> these state changes and interactions with Mocks should have occurred.</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>If using JMock then the interactions (in the "then") are checked automatically by a JUnit rule.  However, you probably will still have some state changes to assert upon.</p>
-</div>
-<div class="admonitionblock tip">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-tip" title="Tip"></i>
-</td>
-<td class="content">
-<div class="title">Distinguish between queries vs mutators</div>
-<div class="paragraph">
-<p>For mock interactions that simply retrieve some data, your test should not need to verify that it occurred.  If the system were to be refactored and starts caching some data, you don&#8217;t really want your tests to start breaking because they are no longer performing a query that once they did.  If using JMock API this means using the <code>allowing(..)</code> method to set up the expectation.</p>
-</div>
-<div class="paragraph">
-<p>On the other hand mocks that mutate the state of the system you probably should assert have occurred.  If using JMock this typically means using the <code>oneOf(&#8230;&#8203;)</code> method.</p>
-</div>
-<div class="paragraph">
-<p>For more tips on using JMock and mocking in general, check out the <a href="http://www.growing-object-oriented-software.com/">GOOS</a> book, written by JMock&#8217;s authors, Steve Freeman and Nat Pryce and also <a href="http://natpryce.com/articles.html">Nat&#8217;s blog</a>.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>Apache Isis' unit test support provides <code>JUnitRuleMockery2</code> which is an extension to the <a href="http://www.jmock.org/">JMock</a>'s <code>JunitRuleMockery</code>.  It provides a simpler API and also providing support for autowiring.</p>
-</div>
-<div class="paragraph">
-<p>For example, here we see that the class under test, an instance of <code>CollaboratingUsingSetterInjection</code>, is automatically wired up with its <code>Collaborator</code>:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">JUnitRuleMockery2Test_autoWiring_setterInjection_happyCase</span> {
+}</code></pre> 
+          </div> 
+         </div> 
+         <div class="paragraph"> 
+          <p>The example unit tests can be found <a href="https://github.com/apache/isis/tree/master/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/value">here</a>.</p> 
+         </div> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_ugtst_unit-test-support_jmock-extensions">3.2. JMock Extensions</h3> 
+        <div class="paragraph"> 
+         <p>As noted earlier, for unit tests we tend to use <a href="http://www.jmock.org">JMock</a> as our mocking library. The usual given/when/then format gets an extra step:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><strong>given</strong> the system is in this state</p> </li> 
+          <li> <p><strong>expecting</strong> these interactions (set up the mock expectations here)</p> </li> 
+          <li> <p><strong>when</strong> I poke it with a stick</p> </li> 
+          <li> <p><strong>then</strong> these state changes and interactions with Mocks should have occurred.</p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>If using JMock then the interactions (in the "then") are checked automatically by a JUnit rule. However, you probably will still have some state changes to assert upon.</p> 
+        </div> 
+        <div class="admonitionblock tip"> 
+         <table> 
+          <tbody>
+           <tr> 
+            <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td> 
+            <td class="content"> 
+             <div class="title">
+              Distinguish between queries vs mutators
+             </div> 
+             <div class="paragraph"> 
+              <p>For mock interactions that simply retrieve some data, your test should not need to verify that it occurred. If the system were to be refactored and starts caching some data, you don\u2019t really want your tests to start breaking because they are no longer performing a query that once they did. If using JMock API this means using the <code>allowing(..)</code> method to set up the expectation.</p> 
+             </div> 
+             <div class="paragraph"> 
+              <p>On the other hand mocks that mutate the state of the system you probably should assert have occurred. If using JMock this typically means using the <code>oneOf(\u2026\u200b)</code> method.</p> 
+             </div> 
+             <div class="paragraph"> 
+              <p>For more tips on using JMock and mocking in general, check out the <a href="http://www.growing-object-oriented-software.com/">GOOS</a> book, written by JMock\u2019s authors, Steve Freeman and Nat Pryce and also <a href="http://natpryce.com/articles.html">Nat\u2019s blog</a>.</p> 
+             </div> </td> 
+           </tr> 
+          </tbody>
+         </table> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Apache Isis' unit test support provides <code>JUnitRuleMockery2</code> which is an extension to the <a href="http://www.jmock.org/">JMock</a>'s <code>JunitRuleMockery</code>. It provides a simpler API and also providing support for autowiring.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>For example, here we see that the class under test, an instance of <code>CollaboratingUsingSetterInjection</code>, is automatically wired up with its <code>Collaborator</code>:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">JUnitRuleMockery2Test_autoWiring_setterInjection_happyCase</span> {
 
     <span class="annotation">@Rule</span>
     <span class="directive">public</span> JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(Mode.INTERFACES_AND_CLASSES);
@@ -1099,72 +992,70 @@ CustomerRepository customers;</code></pre>
     <span class="directive">public</span> <span class="type">void</span> wiring() {
         assertThat(collaborating.collaborator, is(not(nullValue())));
     }
-}</code></pre>
-</div>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>Isis also includes (and automatically uses) a <a href="http://www.javassist.org">Javassist</a>-based implementation of JMock&#8217;s <a href="http://www.jmock.org/mocking-classes.html"><code>ClassImposteriser</code></a> interface, so that you can mock out concrete classes as well as interfaces.  We&#8217;ve provided this rather than JMock&#8217;s own cglib-based implementation (which is problematic for us given its own dependencies on <a href="http://asm.ow2.org/">asm</a>).</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>The example tests can be found <a href="https://github.com/apache/isis/tree/master/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking">here</a></p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_ugtst_unit-test-support_soap-fake-server-junit-rule">3.3. SOAP Fake Endpoints</h3>
-<div class="paragraph">
-<p>No man is an island, and neither are most applications.  Chances are that at some point you may need to integrate your Apache Isis application to other external systems, possibly using old-style SOAP web services.  The SOAP client in this case could be a domain service within your app, or it might be externalized, eg invoked through a scheduler or using <a href="http://camel.apache.org">Apache Camel</a>.</p>
-</div>
-<div class="paragraph">
-<p>While you will want to (of course) perform manual system testing/UAT with a test instance of that external system, it&#8217;s also useful to be able to perform unit testing of your SOAP client component.</p>
-</div>
-<div class="paragraph">
-<p>The <code>SoapEndpointPublishingRule</code> is a simple JUnit rule that allows you to run a fake SOAP endpoint within an unit test.</p>
-</div>
-<div class="admonitionblock tip">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-tip" title="Tip"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>The (non-ASF) <a href="http://github.com/isisaddons/isis-module-publishmq">Isis addons' publishmq</a> module provides a full example of how to integrate and test an Apache Isis application with a (faked out) external system.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="sect3">
-<h4 id="__code_soapendpointpublishingrule_code">3.3.1. <code>SoapEndpointPublishingRule</code></h4>
-<div class="paragraph">
-<p>The idea behind this rule is that you write a fake server endpoint that implements the same WSDL contract as the "real" external system does, but which also exposes additional API to specify responses (or throw exceptions) from SOAP calls.  It also typically records the requests and allows these to be queried.</p>
-</div>
-<div class="paragraph">
-<p>In its setup your unit test and gets the rule to instantiate and publish that fake server endpoint, and then obtains a reference to that server endpoint.  It also instantiates the SOAP client, pointing it at the address (that is, a URL) that the fake server endpoint is running on.  This way the unit test has control of both the SOAP client and server: the software under test and its collaborator.</p>
-</div>
-<div class="paragraph">
-<p>In the test methods your unit test sets up expectations on your fake server, and then exercises the SOAP client.  The SOAP client calls the fake server, which then responds accordingly.  The test can then assert that all expected interactions have occurred.</p>
-</div>
-<div class="paragraph">
-<p>So that tests don&#8217;t take too long to run, the rule puts the fake server endpoints onto a thread-local.  Therefore the unit tests should clear up any state on the fake server endpoints.</p>
-</div>
-<div class="paragraph">
-<p>Your unit test uses the rule by specifying the endpoint class (must have a no-arg constructor):</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">FakeExternalSystemEndpointRuleTest</span> {
+}</code></pre> 
+         </div> 
+        </div> 
+        <div class="admonitionblock note"> 
+         <table> 
+          <tbody>
+           <tr> 
+            <td class="icon"> <i class="fa icon-note" title="Note"></i> </td> 
+            <td class="content"> 
+             <div class="paragraph"> 
+              <p>Isis also includes (and automatically uses) a <a href="http://www.javassist.org">Javassist</a>-based implementation of JMock\u2019s <a href="http://www.jmock.org/mocking-classes.html"><code>ClassImposteriser</code></a> interface, so that you can mock out concrete classes as well as interfaces. We\u2019ve provided this rather than JMock\u2019s own cglib-based implementation (which is problematic for us given its own dependencies on <a href="http://asm.ow2.org/">asm</a>).</p> 
+             </div> </td> 
+           </tr> 
+          </tbody>
+         </table> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The example tests can be found <a href="https://github.com/apache/isis/tree/master/core/unittestsupport/src/test/java/org/apache/isis/core/unittestsupport/jmocking">here</a></p> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_ugtst_unit-test-support_soap-fake-server-junit-rule">3.3. SOAP Fake Endpoints</h3> 
+        <div class="paragraph"> 
+         <p>No man is an island, and neither are most applications. Chances are that at some point you may need to integrate your Apache Isis application to other external systems, possibly using old-style SOAP web services. The SOAP client in this case could be a domain service within your app, or it might be externalized, eg invoked through a scheduler or using <a href="http://camel.apache.org">Apache Camel</a>.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>While you will want to (of course) perform manual system testing/UAT with a test instance of that external system, it\u2019s also useful to be able to perform unit testing of your SOAP client component.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The <code>SoapEndpointPublishingRule</code> is a simple JUnit rule that allows you to run a fake SOAP endpoint within an unit test.</p> 
+        </div> 
+        <div class="admonitionblock tip"> 
+         <table> 
+          <tbody>
+           <tr> 
+            <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td> 
+            <td class="content"> 
+             <div class="paragraph"> 
+              <p>The (non-ASF) <a href="http://github.com/isisaddons/isis-module-publishmq">Isis addons' publishmq</a> module provides a full example of how to integrate and test an Apache Isis application with a (faked out) external system.</p> 
+             </div> </td> 
+           </tr> 
+          </tbody>
+         </table> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="__code_soapendpointpublishingrule_code">3.3.1. <code>SoapEndpointPublishingRule</code></h4> 
+         <div class="paragraph"> 
+          <p>The idea behind this rule is that you write a fake server endpoint that implements the same WSDL contract as the "real" external system does, but which also exposes additional API to specify responses (or throw exceptions) from SOAP calls. It also typically records the requests and allows these to be queried.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>In its setup your unit test and gets the rule to instantiate and publish that fake server endpoint, and then obtains a reference to that server endpoint. It also instantiates the SOAP client, pointing it at the address (that is, a URL) that the fake server endpoint is running on. This way the unit test has control of both the SOAP client and server: the software under test and its collaborator.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>In the test methods your unit test sets up expectations on your fake server, and then exercises the SOAP client. The SOAP client calls the fake server, which then responds accordingly. The test can then assert that all expected interactions have occurred.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>So that tests don\u2019t take too long to run, the rule puts the fake server endpoints onto a thread-local. Therefore the unit tests should clear up any state on the fake server endpoints.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>Your unit test uses the rule by specifying the endpoint class (must have a no-arg constructor):</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">class</span> <span class="class">FakeExternalSystemEndpointRuleTest</span> {
     <span class="annotation">@Rule</span>
     <span class="directive">public</span> SoapEndpointPublishingRule serverRule =
         <span class="keyword">new</span> SoapEndpointPublishingRule(FakeExternalSystemEndpoint.class);         <i class="conum" data-value="1"></i><b>(1)</b>
@@ -1201,114 +1092,118 @@ CustomerRepository customers;</code></pre>
             fakeServerEndpoint.control().getUpdates();
         ...
     }
-}</code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td>specify the class that implements the endpoint (must have a no-arg constructor)</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="2"></i><b>2</b></td>
-<td>the SOAP contract as defined in WSDL and generated by wsdl2java</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="3"></i><b>3</b></td>
-<td>get hold of the fake server-side endpoint from the rule&#8230;&#8203;</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="4"></i><b>4</b></td>
-<td>&#8230;&#8203; and its endpoint address</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="5"></i><b>5</b></td>
-<td>use factory (also generated by wsdl2java) to create client-side endpoint</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="6"></i><b>6</b></td>
-<td><code>getWsdl()</code> is a utility method to return a URL for the WSDL (eg from the classpath)</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="7"></i><b>7</b></td>
-<td>create a request object in order to invoke the SOAP web service</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="8"></i><b>8</b></td>
-<td>instruct the fake server endpoint how to respond</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="9"></i><b>9</b></td>
-<td>invoke the web service</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="10"></i><b>10</b></td>
-<td>check the fake server endpoint was correctly invoked etc.</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>The rule can also host multiple endpoints; just provide multiple classes in the constructor:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@Rule</span>
+}</code></pre> 
+          </div> 
+         </div> 
+         <div class="colist arabic"> 
+          <table> 
+           <tbody>
+            <tr> 
+             <td><i class="conum" data-value="1"></i><b>1</b></td> 
+             <td>specify the class that implements the endpoint (must have a no-arg constructor)</td> 
+            </tr> 
+            <tr> 
+             <td><i class="conum" data-value="2"></i><b>2</b></td> 
+             <td>the SOAP contract as defined in WSDL and generated by wsdl2java</td> 
+            </tr> 
+            <tr> 
+             <td><i class="conum" data-value="3"></i><b>3</b></td> 
+             <td>get hold of the fake server-side endpoint from the rule\u2026\u200b</td> 
+            </tr> 
+            <tr> 
+             <td><i class="conum" data-value="4"></i><b>4</b></td> 
+             <td>\u2026\u200b and its endpoint address</td> 
+            </tr> 
+            <tr> 
+             <td><i class="conum" data-value="5"></i><b>5</b></td> 
+             <td>use factory (also generated by wsdl2java) to create client-side endpoint</td> 
+            </tr> 
+            <tr> 
+             <td><i class="conum" data-value="6"></i><b>6</b></td> 
+             <td><code>getWsdl()</code> is a utility method to return a URL for the WSDL (eg from the classpath)</td> 
+            </tr> 
+            <tr> 
+             <td><i class="conum" data-value="7"></i><b>7</b></td> 
+             <td>create a request object in order to invoke the SOAP web service</td> 
+            </tr> 
+            <tr> 
+             <td><i class="conum" data-value="8"></i><b>8</b></td> 
+             <td>instruct the fake server endpoint how to respond</td> 
+            </tr> 
+            <tr> 
+             <td><i class="conum" data-value="9"></i><b>9</b></td> 
+             <td>invoke the web service</td> 
+            </tr> 
+            <tr> 
+             <td><i class="conum" data-value="10"></i><b>10</b></td> 
+             <td>check the fake server endpoint was correctly invoked etc.</td> 
+            </tr> 
+           

<TRUNCATED>

[34/44] isis-site git commit: ISIS-1594: provide an 'edit' button

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/guides/rgcfg.pdf
----------------------------------------------------------------------
diff --git a/content/guides/rgcfg.pdf b/content/guides/rgcfg.pdf
index f3cfba8..afe5897 100644
--- a/content/guides/rgcfg.pdf
+++ b/content/guides/rgcfg.pdf
@@ -4,16 +4,16 @@
 << /Title <feff0043006f0072006500200043006f006e0066006900672019006e002000500072006f0070006500720074006900650073>
 /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:20170219154956+00'00')
-/ModDate (D:20170219154956+00'00')
+/CreationDate (D:20170307233952+00'00')
+/ModDate (D:20170307233952+00'00')
 >>
 endobj
 2 0 obj
 << /Type /Catalog
 /Pages 3 0 R
 /Names 14 0 R
-/Outlines 215 0 R
-/PageLabels 234 0 R
+/Outlines 214 0 R
+/PageLabels 233 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 21
-/Kids [7 0 R 10 0 R 12 0 R 39 0 R 43 0 R 51 0 R 62 0 R 67 0 R 76 0 R 81 0 R 96 0 R 107 0 R 119 0 R 126 0 R 131 0 R 141 0 R 147 0 R 157 0 R 166 0 R 173 0 R 180 0 R]
+/Kids [7 0 R 10 0 R 12 0 R 39 0 R 43 0 R 50 0 R 61 0 R 66 0 R 75 0 R 80 0 R 95 0 R 106 0 R 118 0 R 125 0 R 130 0 R 140 0 R 146 0 R 156 0 R 165 0 R 172 0 R 179 0 R]
 >>
 endobj
 4 0 obj
@@ -78,13 +78,13 @@ endobj
 endobj
 8 0 obj
 << /Type /Font
-/BaseFont /AAAABA+NotoSerif
+/BaseFont /AAAAAX+NotoSerif
 /Subtype /TrueType
-/FontDescriptor 236 0 R
+/FontDescriptor 235 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 238 0 R
-/ToUnicode 237 0 R
+/Widths 237 0 R
+/ToUnicode 236 0 R
 >>
 endobj
 9 0 obj
@@ -759,7 +759,7 @@ endobj
 /F1.0 8 0 R
 >>
 >>
-/Annots [182 0 R 183 0 R 184 0 R 185 0 R 186 0 R 187 0 R 188 0 R 189 0 R 190 0 R 191 0 R 192 0 R 193 0 R 194 0 R 195 0 R 196 0 R 197 0 R 198 0 R 199 0 R 200 0 R 201 0 R 202 0 R 203 0 R 204 0 R 205 0 R 206 0 R 207 0 R 208 0 R 209 0 R 210 0 R 211 0 R 212 0 R 213 0 R]
+/Annots [181 0 R 182 0 R 183 0 R 184 0 R 185 0 R 186 0 R 187 0 R 188 0 R 189 0 R 190 0 R 191 0 R 192 0 R 193 0 R 194 0 R 195 0 R 196 0 R 197 0 R 198 0 R 199 0 R 200 0 R 201 0 R 202 0 R 203 0 R 204 0 R 205 0 R 206 0 R 207 0 R 208 0 R 209 0 R 210 0 R 211 0 R 212 0 R]
 >>
 endobj
 11 0 obj
@@ -1580,7 +1580,7 @@ endobj
 /F3.0 17 0 R
 /F4.1 18 0 R
 >>
-/XObject << /Stamp1 214 0 R
+/XObject << /Stamp1 213 0 R
 >>
 >>
 /Annots [19 0 R 20 0 R 21 0 R 22 0 R 23 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 33 0 R 34 0 R 35 0 R 36 0 R 37 0 R]
@@ -1595,40 +1595,40 @@ endobj
 >>
 endobj
 15 0 obj
-<< /Names [(_rgcfg) 13 0 R (_rgcfg_configuration-files) 63 0 R (_rgcfg_configuring-components) 68 0 R (_rgcfg_configuring-core) 82 0 R (_rgcfg_configuring-core_domain-events) 87 0 R (_rgcfg_configuring-core_filterVisibility) 171 0 R (_rgcfg_configuring-core_isis-objects-editing) 178 0 R (_rgcfg_configuring-core_isis-viewers-propertyLayout-labelPosition) 181 0 R (_rgcfg_configuring-core_lifecycle-events) 91 0 R (_rgcfg_configuring-core_metamodel-validation) 139 0 R (_rgcfg_configuring-core_other) 153 0 R (_rgcfg_configuring-core_services) 105 0 R (_rgcfg_configuring-core_ui-events) 101 0 R (_rgcfg_deployment-types) 44 0 R (other-guides) 24 0 R (overriding-the-deployment-type) 57 0 R (restful-objects-viewer-only) 52 0 R (using-the-wicket-viewer) 46 0 R (viewer-configuration) 78 0 R]
+<< /Names [(_rgcfg) 13 0 R (_rgcfg_configuration-files) 62 0 R (_rgcfg_configuring-components) 67 0 R (_rgcfg_configuring-core) 81 0 R (_rgcfg_configuring-core_domain-events) 86 0 R (_rgcfg_configuring-core_filterVisibility) 170 0 R (_rgcfg_configuring-core_isis-objects-editing) 177 0 R (_rgcfg_configuring-core_isis-viewers-propertyLayout-labelPosition) 180 0 R (_rgcfg_configuring-core_lifecycle-events) 90 0 R (_rgcfg_configuring-core_metamodel-validation) 138 0 R (_rgcfg_configuring-core_other) 152 0 R (_rgcfg_configuring-core_services) 104 0 R (_rgcfg_configuring-core_ui-events) 100 0 R (_rgcfg_deployment-types) 44 0 R (other-guides) 24 0 R (overriding-the-deployment-type) 56 0 R (restful-objects-viewer-only) 51 0 R (using-the-wicket-viewer) 46 0 R (viewer-configuration) 77 0 R]
 >>
 endobj
 16 0 obj
 << /Type /Font
-/BaseFont /AAAABB+NotoSerif-Bold
+/BaseFont /AAAAAY+NotoSerif-Bold
 /Subtype /TrueType
-/FontDescriptor 240 0 R
+/FontDescriptor 239 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 242 0 R
-/ToUnicode 241 0 R
+/Widths 241 0 R
+/ToUnicode 240 0 R
 >>
 endobj
 17 0 obj
 << /Type /Font
-/BaseFont /AAAABC+mplus1mn-regular
+/BaseFont /AAAAAZ+mplus1mn-regular
 /Subtype /TrueType
-/FontDescriptor 244 0 R
+/FontDescriptor 243 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 246 0 R
-/ToUnicode 245 0 R
+/Widths 245 0 R
+/ToUnicode 244 0 R
 >>
 endobj
 18 0 obj
 << /Type /Font
-/BaseFont /AAAABD+FontAwesome
+/BaseFont /AAAABA+FontAwesome
 /Subtype /TrueType
-/FontDescriptor 248 0 R
+/FontDescriptor 247 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 250 0 R
-/ToUnicode 249 0 R
+/Widths 249 0 R
+/ToUnicode 248 0 R
 >>
 endobj
 19 0 obj
@@ -1961,7 +1961,7 @@ endobj
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 >>
-/XObject << /Stamp1 214 0 R
+/XObject << /Stamp1 213 0 R
 >>
 >>
 /Annots [40 0 R 41 0 R]
@@ -2839,12 +2839,12 @@ f
 h
 S
 Q
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 77.24000000000001 293.22500000000014 Td
-/F6.0 11 Tf
+/F3.0 11 Tf
 <3c636f6e746578742d706172616d3e> Tj
 ET
 
@@ -2861,12 +2861,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 99.24000000000001 278.4850000000002 Td
-/F6.0 11 Tf
+/F3.0 11 Tf
 <3c706172616d2d6e616d653e> Tj
 ET
 
@@ -2883,12 +2883,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 236.74 278.4850000000002 Td
-/F6.0 11 Tf
+/F3.0 11 Tf
 <3c2f706172616d2d6e616d653e> Tj
 ET
 
@@ -2905,12 +2905,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 99.24000000000001 263.7450000000002 Td
-/F6.0 11 Tf
+/F3.0 11 Tf
 <3c706172616d2d76616c75653e> Tj
 ET
 
@@ -2927,23 +2927,23 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 225.74 263.7450000000002 Td
-/F6.0 11 Tf
+/F3.0 11 Tf
 <3c2f706172616d2d76616c75653e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 77.24000000000001 249.00500000000017 Td
-/F6.0 11 Tf
+/F3.0 11 Tf
 <3c2f636f6e746578742d706172616d3e> Tj
 ET
 
@@ -3035,12 +3035,12 @@ f
 h
 S
 Q
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 77.24000000000001 156.48500000000018 Td
-/F6.0 11 Tf
+/F3.0 11 Tf
 <3c636f6e746578742d706172616d3e> Tj
 ET
 
@@ -3057,12 +3057,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 99.24000000000001 141.74500000000018 Td
-/F6.0 11 Tf
+/F3.0 11 Tf
 <3c706172616d2d6e616d653e> Tj
 ET
 
@@ -3079,12 +3079,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 236.74 141.74500000000018 Td
-/F6.0 11 Tf
+/F3.0 11 Tf
 <3c2f706172616d2d6e616d653e> Tj
 ET
 
@@ -3101,12 +3101,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 99.24000000000001 127.00500000000017 Td
-/F6.0 11 Tf
+/F3.0 11 Tf
 <3c706172616d2d76616c75653e> Tj
 ET
 
@@ -3123,23 +3123,23 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 231.24 127.00500000000017 Td
-/F6.0 11 Tf
+/F3.0 11 Tf
 <3c2f706172616d2d76616c75653e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 77.24000000000001 112.26500000000016 Td
-/F6.0 11 Tf
+/F3.0 11 Tf
 <3c2f636f6e746578742d706172616d3e> Tj
 ET
 
@@ -3179,9 +3179,8 @@ endobj
 /F1.0 8 0 R
 /F3.0 17 0 R
 /F5.0 48 0 R
-/F6.0 49 0 R
 >>
-/XObject << /Stamp1 214 0 R
+/XObject << /Stamp1 213 0 R
 >>
 >>
 /Annots [45 0 R 47 0 R]
@@ -3217,27 +3216,16 @@ endobj
 endobj
 48 0 obj
 << /Type /Font
-/BaseFont /AAAABE+NotoSerif-Italic
+/BaseFont /AAAABB+NotoSerif-Italic
 /Subtype /TrueType
-/FontDescriptor 252 0 R
+/FontDescriptor 251 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 254 0 R
-/ToUnicode 253 0 R
+/Widths 253 0 R
+/ToUnicode 252 0 R
 >>
 endobj
 49 0 obj
-<< /Type /Font
-/BaseFont /AAAABF+mplus1mn-bold
-/Subtype /TrueType
-/FontDescriptor 256 0 R
-/FirstChar 32
-/LastChar 255
-/Widths 258 0 R
-/ToUnicode 257 0 R
->>
-endobj
-50 0 obj
 << /Length 15199
 >>
 stream
@@ -3555,12 +3543,12 @@ f
 h
 S
 Q
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 77.24000000000001 525.9850000000001 Td
-/F6.0 11 Tf
+/F3.0 11 Tf
 <3c636f6e746578742d706172616d3e> Tj
 ET
 
@@ -3577,12 +3565,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 99.24000000000001 511.24500000000006 Td
-/F6.0 11 Tf
+/F3.0 11 Tf
 <3c706172616d2d6e616d653e> Tj
 ET
 
@@ -3599,12 +3587,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 269.74 511.24500000000006 Td
-/F6.0 11 Tf
+/F3.0 11 Tf
 <3c2f706172616d2d6e616d653e> Tj
 ET
 
@@ -3621,12 +3609,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 99.24000000000001 496.50500000000005 Td
-/F6.0 11 Tf
+/F3.0 11 Tf
 <3c706172616d2d76616c75653e> Tj
 ET
 
@@ -3643,23 +3631,23 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 203.74 496.50500000000005 Td
-/F6.0 11 Tf
+/F3.0 11 Tf
 <3c2f706172616d2d76616c75653e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 77.24000000000001 481.76500000000004 Td
-/F6.0 11 Tf
+/F3.0 11 Tf
 <3c2f636f6e746578742d706172616d3e> Tj
 ET
 
@@ -3751,12 +3739,12 @@ f
 h
 S
 Q
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 77.24000000000001 389.24500000000006 Td
-/F6.0 11 Tf
+/F3.0 11 Tf
 <3c636f6e746578742d706172616d3e> Tj
 ET
 
@@ -3773,12 +3761,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 99.24000000000001 374.50500000000005 Td
-/F6.0 11 Tf
+/F3.0 11 Tf
 <3c706172616d2d6e616d653e> Tj
 ET
 
@@ -3795,12 +3783,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 269.74 374.50500000000005 Td
-/F6.0 11 Tf
+/F3.0 11 Tf
 <3c2f706172616d2d6e616d653e> Tj
 ET
 
@@ -3817,12 +3805,12 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 99.24000000000001 359.76500000000004 Td
-/F6.0 11 Tf
+/F3.0 11 Tf
 <3c706172616d2d76616c75653e> Tj
 ET
 
@@ -3839,23 +3827,23 @@ ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 258.74 359.76500000000004 Td
-/F6.0 11 Tf
+/F3.0 11 Tf
 <3c2f706172616d2d76616c75653e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.733 0.000 0.400 scn
-0.733 0.000 0.400 SCN
+0.184 0.435 0.624 scn
+0.184 0.435 0.624 SCN
 
 BT
 77.24000000000001 345.02500000000003 Td
-/F6.0 11 Tf
+/F3.0 11 Tf
 <3c2f636f6e746578742d706172616d3e> Tj
 ET
 
@@ -4126,27 +4114,26 @@ Q
 
 endstream
 endobj
-51 0 obj
+50 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 50 0 R
+/Contents 49 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 16 0 R
 /F1.0 8 0 R
 /F3.0 17 0 R
-/F6.0 49 0 R
 >>
-/XObject << /Stamp1 214 0 R
+/XObject << /Stamp1 213 0 R
 >>
 >>
-/Annots [53 0 R 54 0 R 55 0 R 56 0 R 58 0 R 59 0 R 60 0 R]
+/Annots [52 0 R 53 0 R 54 0 R 55 0 R 57 0 R 58 0 R 59 0 R]
 >>
 endobj
-52 0 obj
-[51 0 R /XYZ 0 841.89 null]
+51 0 obj
+[50 0 R /XYZ 0 841.89 null]
 endobj
-53 0 obj
+52 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -4157,7 +4144,7 @@ endobj
 /Type /Annot
 >>
 endobj
-54 0 obj
+53 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -4168,7 +4155,7 @@ endobj
 /Type /Annot
 >>
 endobj
-55 0 obj
+54 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -4179,7 +4166,7 @@ endobj
 /Type /Annot
 >>
 endobj
-56 0 obj
+55 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -4190,10 +4177,10 @@ endobj
 /Type /Annot
 >>
 endobj
-57 0 obj
-[51 0 R /XYZ 0 313.11 null]
+56 0 obj
+[50 0 R /XYZ 0 313.11 null]
 endobj
-58 0 obj
+57 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -4204,7 +4191,7 @@ endobj
 /Type /Annot
 >>
 endobj
-59 0 obj
+58 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -4215,7 +4202,7 @@ endobj
 /Type /Annot
 >>
 endobj
-60 0 obj
+59 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -4226,7 +4213,7 @@ endobj
 /Type /Annot
 >>
 endobj
-61 0 obj
+60 0 obj
 << /Length 13150
 >>
 stream
@@ -5009,26 +4996,26 @@ Q
 
 endstream
 endobj
-62 0 obj
+61 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 61 0 R
+/Contents 60 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 16 0 R
 /F1.0 8 0 R
 /F3.0 17 0 R
 >>
-/XObject << /Stamp1 214 0 R
+/XObject << /Stamp1 213 0 R
 >>
 >>
-/Annots [64 0 R 65 0 R]
+/Annots [63 0 R 64 0 R]
 >>
 endobj
-63 0 obj
-[62 0 R /XYZ 0 841.89 null]
+62 0 obj
+[61 0 R /XYZ 0 841.89 null]
 endobj
-64 0 obj
+63 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -5039,7 +5026,7 @@ endobj
 /Type /Annot
 >>
 endobj
-65 0 obj
+64 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -5050,7 +5037,7 @@ endobj
 /Type /Annot
 >>
 endobj
-66 0 obj
+65 0 obj
 << /Length 23400
 >>
 stream
@@ -6133,7 +6120,7 @@ ET
 
 BT
 221.13950040000003 199.08300000000017 Td
-/F7.0 10.5 Tf
+/F6.0 10.5 Tf
 <736869726f> Tj
 ET
 
@@ -6384,7 +6371,7 @@ ET
 
 BT
 221.13950040000003 104.40300000000016 Td
-/F7.0 10.5 Tf
+/F6.0 10.5 Tf
 <736869726f> Tj
 ET
 
@@ -6534,28 +6521,28 @@ Q
 
 endstream
 endobj
-67 0 obj
+66 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 66 0 R
+/Contents 65 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 16 0 R
 /F1.0 8 0 R
 /F3.0 17 0 R
 /F5.0 48 0 R
-/F7.0 72 0 R
+/F6.0 71 0 R
 >>
-/XObject << /Stamp1 214 0 R
+/XObject << /Stamp1 213 0 R
 >>
 >>
-/Annots [69 0 R 70 0 R 71 0 R 73 0 R 74 0 R]
+/Annots [68 0 R 69 0 R 70 0 R 72 0 R 73 0 R]
 >>
 endobj
-68 0 obj
-[67 0 R /XYZ 0 841.89 null]
+67 0 obj
+[66 0 R /XYZ 0 841.89 null]
 endobj
-69 0 obj
+68 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -6566,7 +6553,7 @@ endobj
 /Type /Annot
 >>
 endobj
-70 0 obj
+69 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -6577,7 +6564,7 @@ endobj
 /Type /Annot
 >>
 endobj
-71 0 obj
+70 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -6588,18 +6575,18 @@ endobj
 /Type /Annot
 >>
 endobj
-72 0 obj
+71 0 obj
 << /Type /Font
-/BaseFont /AAAABG+mplus1mn-italic
+/BaseFont /AAAABC+mplus1mn-italic
 /Subtype /TrueType
-/FontDescriptor 260 0 R
+/FontDescriptor 255 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 262 0 R
-/ToUnicode 261 0 R
+/Widths 257 0 R
+/ToUnicode 256 0 R
 >>
 endobj
-73 0 obj
+72 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -6610,7 +6597,7 @@ endobj
 /Type /Annot
 >>
 endobj
-74 0 obj
+73 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -6621,7 +6608,7 @@ endobj
 /Type /Annot
 >>
 endobj
-75 0 obj
+74 0 obj
 << /Length 21216
 >>
 stream
@@ -6884,7 +6871,7 @@ ET
 
 BT
 221.13950040000003 738.3029999999999 Td
-/F7.0 10.5 Tf
+/F6.0 10.5 Tf
 <646174616e75636c657573> Tj
 ET
 
@@ -7139,7 +7126,7 @@ ET
 
 BT
 221.13950040000003 634.362 Td
-/F7.0 10.5 Tf
+/F6.0 10.5 Tf
 <636f6e66696775726174696f6e> Tj
 ET
 
@@ -8066,26 +8053,26 @@ Q
 
 endstream
 endobj
-76 0 obj
+75 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 75 0 R
+/Contents 74 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 16 0 R
 /F5.0 48 0 R
 /F3.0 17 0 R
 /F1.0 8 0 R
-/F7.0 72 0 R
+/F6.0 71 0 R
 /F4.1 18 0 R
 >>
-/XObject << /Stamp1 214 0 R
+/XObject << /Stamp1 213 0 R
 >>
 >>
-/Annots [77 0 R 79 0 R]
+/Annots [76 0 R 78 0 R]
 >>
 endobj
-77 0 obj
+76 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -8096,10 +8083,10 @@ endobj
 /Type /Annot
 >>
 endobj
-78 0 obj
-[76 0 R /XYZ 0 238.054 null]
+77 0 obj
+[75 0 R /XYZ 0 238.054 null]
 endobj
-79 0 obj
+78 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -8110,7 +8097,7 @@ endobj
 /Type /Annot
 >>
 endobj
-80 0 obj
+79 0 obj
 << /Length 29718
 >>
 stream
@@ -10107,11 +10094,11 @@ Q
 
 endstream
 endobj
-81 0 obj
+80 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 80 0 R
+/Contents 79 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 16 0 R
 /F1.0 8 0 R
@@ -10119,16 +10106,16 @@ endobj
 /F5.0 48 0 R
 /F3.0 17 0 R
 >>
-/XObject << /Stamp1 214 0 R
+/XObject << /Stamp1 213 0 R
 >>
 >>
-/Annots [83 0 R 84 0 R 85 0 R 86 0 R 88 0 R 89 0 R 90 0 R 92 0 R 93 0 R 94 0 R]
+/Annots [82 0 R 83 0 R 84 0 R 85 0 R 87 0 R 88 0 R 89 0 R 91 0 R 92 0 R 93 0 R]
 >>
 endobj
-82 0 obj
-[81 0 R /XYZ 0 841.89 null]
+81 0 obj
+[80 0 R /XYZ 0 841.89 null]
 endobj
-83 0 obj
+82 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -10139,7 +10126,7 @@ endobj
 /Type /Annot
 >>
 endobj
-84 0 obj
+83 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -10150,7 +10137,7 @@ endobj
 /Type /Annot
 >>
 endobj
-85 0 obj
+84 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -10161,7 +10148,7 @@ endobj
 /Type /Annot
 >>
 endobj
-86 0 obj
+85 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -10172,10 +10159,10 @@ endobj
 /Type /Annot
 >>
 endobj
-87 0 obj
-[81 0 R /XYZ 0 654.2700000000001 null]
+86 0 obj
+[80 0 R /XYZ 0 654.2700000000001 null]
 endobj
-88 0 obj
+87 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -10186,7 +10173,7 @@ endobj
 /Type /Annot
 >>
 endobj
-89 0 obj
+88 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -10197,7 +10184,7 @@ endobj
 /Type /Annot
 >>
 endobj
-90 0 obj
+89 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -10208,10 +10195,10 @@ endobj
 /Type /Annot
 >>
 endobj
-91 0 obj
-[81 0 R /XYZ 0 375.0500000000002 null]
+90 0 obj
+[80 0 R /XYZ 0 375.0500000000002 null]
 endobj
-92 0 obj
+91 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -10222,7 +10209,7 @@ endobj
 /Type /Annot
 >>
 endobj
-93 0 obj
+92 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -10233,7 +10220,7 @@ endobj
 /Type /Annot
 >>
 endobj
-94 0 obj
+93 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -10244,7 +10231,7 @@ endobj
 /Type /Annot
 >>
 endobj
-95 0 obj
+94 0 obj
 << /Length 29757
 >>
 stream
@@ -12346,24 +12333,24 @@ Q
 
 endstream
 endobj
-96 0 obj
+95 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 95 0 R
+/Contents 94 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 16 0 R
 /F3.0 17 0 R
 /F1.0 8 0 R
 /F5.0 48 0 R
 >>
-/XObject << /Stamp1 214 0 R
+/XObject << /Stamp1 213 0 R
 >>
 >>
-/Annots [97 0 R 98 0 R 99 0 R 100 0 R 102 0 R 103 0 R 104 0 R]
+/Annots [96 0 R 97 0 R 98 0 R 99 0 R 101 0 R 102 0 R 103 0 R]
 >>
 endobj
-97 0 obj
+96 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -12374,7 +12361,7 @@ endobj
 /Type /Annot
 >>
 endobj
-98 0 obj
+97 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -12385,7 +12372,7 @@ endobj
 /Type /Annot
 >>
 endobj
-99 0 obj
+98 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -12396,7 +12383,7 @@ endobj
 /Type /Annot
 >>
 endobj
-100 0 obj
+99 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -12407,10 +12394,10 @@ endobj
 /Type /Annot
 >>
 endobj
-101 0 obj
-[96 0 R /XYZ 0 477.5699999999998 null]
+100 0 obj
+[95 0 R /XYZ 0 477.5699999999998 null]
 endobj
-102 0 obj
+101 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -12421,7 +12408,7 @@ endobj
 /Type /Annot
 >>
 endobj
-103 0 obj
+102 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -12432,7 +12419,7 @@ endobj
 /Type /Annot
 >>
 endobj
-104 0 obj
+103 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -12443,10 +12430,10 @@ endobj
 /Type /Annot
 >>
 endobj
-105 0 obj
-[96 0 R /XYZ 0 198.34999999999982 null]
+104 0 obj
+[95 0 R /XYZ 0 198.34999999999982 null]
 endobj
-106 0 obj
+105 0 obj
 << /Length 28226
 >>
 stream
@@ -14451,23 +14438,23 @@ Q
 
 endstream
 endobj
-107 0 obj
+106 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 106 0 R
+/Contents 105 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 16 0 R
 /F3.0 17 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 214 0 R
+/XObject << /Stamp1 213 0 R
 >>
 >>
-/Annots [108 0 R 109 0 R 110 0 R 111 0 R 112 0 R 113 0 R 114 0 R 115 0 R 116 0 R 117 0 R]
+/Annots [107 0 R 108 0 R 109 0 R 110 0 R 111 0 R 112 0 R 113 0 R 114 0 R 115 0 R 116 0 R]
 >>
 endobj
-108 0 obj
+107 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -14478,7 +14465,7 @@ endobj
 /Type /Annot
 >>
 endobj
-109 0 obj
+108 0 obj
 << /Border [0 0 0]
 /Dest (_rgcfg_configuring-components)
 /Subtype /Link
@@ -14486,7 +14473,7 @@ endobj
 /Type /Annot
 >>
 endobj
-110 0 obj
+109 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -14497,7 +14484,7 @@ endobj
 /Type /Annot
 >>
 endobj
-111 0 obj
+110 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -14508,7 +14495,7 @@ endobj
 /Type /Annot
 >>
 endobj
-112 0 obj
+111 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -14519,7 +14506,7 @@ endobj
 /Type /Annot
 >>
 endobj
-113 0 obj
+112 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -14530,7 +14517,7 @@ endobj
 /Type /Annot
 >>
 endobj
-114 0 obj
+113 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -14541,7 +14528,7 @@ endobj
 /Type /Annot
 >>
 endobj
-115 0 obj
+114 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -14552,7 +14539,7 @@ endobj
 /Type /Annot
 >>
 endobj
-116 0 obj
+115 0 obj
 << /Border [0 0 0]
 /Dest (_rgcfg_deployment-types)
 /Subtype /Link
@@ -14560,7 +14547,7 @@ endobj
 /Type /Annot
 >>
 endobj
-117 0 obj
+116 0 obj
 << /Border [0 0 0]
 /Dest (_rgcfg_deployment-types)
 /Subtype /Link
@@ -14568,7 +14555,7 @@ endobj
 /Type /Annot
 >>
 endobj
-118 0 obj
+117 0 obj
 << /Length 27800
 >>
 stream
@@ -14985,7 +14972,7 @@ ET
 
 BT
 459.4835012 695.4630000000001 Td
-/F8.0 10.5 Tf
+/F7.0 10.5 Tf
 <c9> Tj
 ET
 
@@ -15255,7 +15242,7 @@ ET
 
 BT
 459.4835012 586.503 Td
-/F8.0 10.5 Tf
+/F7.0 10.5 Tf
 <c9> Tj
 ET
 
@@ -15525,7 +15512,7 @@ ET
 
 BT
 459.4835012 477.543 Td
-/F8.0 10.5 Tf
+/F7.0 10.5 Tf
 <c9> Tj
 ET
 
@@ -15717,7 +15704,7 @@ ET
 
 BT
 221.13950040000003 397.14300000000003 Td
-/F7.0 10.5 Tf
+/F6.0 10.5 Tf
 <353837> Tj
 ET
 
@@ -16188,7 +16175,7 @@ ET
 
 BT
 221.13950040000003 236.34299999999988 Td
-/F7.0 10.5 Tf
+/F6.0 10.5 Tf
 <736d74702e676d61696c2e636f6d> Tj
 ET
 
@@ -16573,36 +16560,36 @@ Q
 
 endstream
 endobj
-119 0 obj
+118 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 118 0 R
+/Contents 117 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 16 0 R
 /F3.0 17 0 R
 /F1.0 8 0 R
-/F8.0 120 0 R
-/F7.0 72 0 R
+/F7.0 119 0 R
+/F6.0 71 0 R
 >>
-/XObject << /Stamp1 214 0 R
+/XObject << /Stamp1 213 0 R
 >>
 >>
-/Annots [121 0 R 122 0 R 123 0 R 124 0 R]
+/Annots [120 0 R 121 0 R 122 0 R 123 0 R]
 >>
 endobj
-120 0 obj
+119 0 obj
 << /Type /Font
-/BaseFont /AAAABH+mplus-1p-regular
+/BaseFont /AAAABD+mplus-1p-regular
 /Subtype /TrueType
-/FontDescriptor 264 0 R
+/FontDescriptor 259 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 266 0 R
-/ToUnicode 265 0 R
+/Widths 261 0 R
+/ToUnicode 260 0 R
 >>
 endobj
-121 0 obj
+120 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -16613,7 +16600,7 @@ endobj
 /Type /Annot
 >>
 endobj
-122 0 obj
+121 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -16624,7 +16611,7 @@ endobj
 /Type /Annot
 >>
 endobj
-123 0 obj
+122 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -16635,7 +16622,7 @@ endobj
 /Type /Annot
 >>
 endobj
-124 0 obj
+123 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -16646,7 +16633,7 @@ endobj
 /Type /Annot
 >>
 endobj
-125 0 obj
+124 0 obj
 << /Length 31608
 >>
 stream
@@ -18007,7 +17994,7 @@ ET
 
 BT
 252.28250040000003 402.4229999999998 Td
-/F7.0 10.5 Tf
+/F6.0 10.5 Tf
 <6775617661> Tj
 ET
 
@@ -18860,24 +18847,24 @@ Q
 
 endstream
 endobj
-126 0 obj
+125 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 125 0 R
+/Contents 124 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 16 0 R
 /F3.0 17 0 R
 /F1.0 8 0 R
-/F7.0 72 0 R
+/F6.0 71 0 R
 >>
-/XObject << /Stamp1 214 0 R
+/XObject << /Stamp1 213 0 R
 >>
 >>
-/Annots [127 0 R 128 0 R 129 0 R]
+/Annots [126 0 R 127 0 R 128 0 R]
 >>
 endobj
-127 0 obj
+126 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -18888,7 +18875,7 @@ endobj
 /Type /Annot
 >>
 endobj
-128 0 obj
+127 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -18899,7 +18886,7 @@ endobj
 /Type /Annot
 >>
 endobj
-129 0 obj
+128 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -18910,7 +18897,7 @@ endobj
 /Type /Annot
 >>
 endobj
-130 0 obj
+129 0 obj
 << /Length 27483
 >>
 stream
@@ -19342,7 +19329,7 @@ ET
 
 BT
 332.1395012 724.0229999999999 Td
-/F8.0 10.5 Tf
+/F7.0 10.5 Tf
 <c9> Tj
 ET
 
@@ -19623,7 +19610,7 @@ ET
 
 BT
 519.112796121875 643.6229999999998 Td
-/F8.0 10.5 Tf
+/F7.0 10.5 Tf
 <c9> Tj
 ET
 
@@ -20873,25 +20860,25 @@ Q
 
 endstream
 endobj
-131 0 obj
+130 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 130 0 R
+/Contents 129 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 16 0 R
 /F3.0 17 0 R
 /F1.0 8 0 R
-/F8.0 120 0 R
+/F7.0 119 0 R
 /F5.0 48 0 R
 >>
-/XObject << /Stamp1 214 0 R
+/XObject << /Stamp1 213 0 R
 >>
 >>
-/Annots [132 0 R 133 0 R 134 0 R 135 0 R 136 0 R 137 0 R 138 0 R]
+/Annots [131 0 R 132 0 R 133 0 R 134 0 R 135 0 R 136 0 R 137 0 R]
 >>
 endobj
-132 0 obj
+131 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -20902,7 +20889,7 @@ endobj
 /Type /Annot
 >>
 endobj
-133 0 obj
+132 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -20913,7 +20900,7 @@ endobj
 /Type /Annot
 >>
 endobj
-134 0 obj
+133 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -20924,7 +20911,7 @@ endobj
 /Type /Annot
 >>
 endobj
-135 0 obj
+134 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -20935,7 +20922,7 @@ endobj
 /Type /Annot
 >>
 endobj
-136 0 obj
+135 0 obj
 << /Border [0 0 0]
 /Dest (_rgcfg_configuring-components)
 /Subtype /Link
@@ -20943,7 +20930,7 @@ endobj
 /Type /Annot
 >>
 endobj
-137 0 obj
+136 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -20954,7 +20941,7 @@ endobj
 /Type /Annot
 >>
 endobj
-138 0 obj
+137 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -20965,10 +20952,10 @@ endobj
 /Type /Annot
 >>
 endobj
-139 0 obj
-[131 0 R /XYZ 0 224.9249999999996 null]
+138 0 obj
+[130 0 R /XYZ 0 224.9249999999996 null]
 endobj
-140 0 obj
+139 0 obj
 << /Length 20925
 >>
 stream
@@ -22388,23 +22375,23 @@ Q
 
 endstream
 endobj
-141 0 obj
+140 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 140 0 R
+/Contents 139 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 16 0 R
 /F3.0 17 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 214 0 R
+/XObject << /Stamp1 213 0 R
 >>
 >>
-/Annots [142 0 R 143 0 R 144 0 R 145 0 R]
+/Annots [141 0 R 142 0 R 143 0 R 144 0 R]
 >>
 endobj
-142 0 obj
+141 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -22415,7 +22402,7 @@ endobj
 /Type /Annot
 >>
 endobj
-143 0 obj
+142 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -22426,7 +22413,7 @@ endobj
 /Type /Annot
 >>
 endobj
-144 0 obj
+143 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -22437,7 +22424,7 @@ endobj
 /Type /Annot
 >>
 endobj
-145 0 obj
+144 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -22448,7 +22435,7 @@ endobj
 /Type /Annot
 >>
 endobj
-146 0 obj
+145 0 obj
 << /Length 22582
 >>
 stream
@@ -24018,24 +24005,24 @@ Q
 
 endstream
 endobj
-147 0 obj
+146 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 146 0 R
+/Contents 145 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 16 0 R
 /F3.0 17 0 R
 /F1.0 8 0 R
 /F5.0 48 0 R
 >>
-/XObject << /Stamp1 214 0 R
+/XObject << /Stamp1 213 0 R
 >>
 >>
-/Annots [148 0 R 149 0 R 150 0 R 151 0 R 152 0 R 154 0 R 155 0 R]
+/Annots [147 0 R 148 0 R 149 0 R 150 0 R 151 0 R 153 0 R 154 0 R]
 >>
 endobj
-148 0 obj
+147 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -24046,7 +24033,7 @@ endobj
 /Type /Annot
 >>
 endobj
-149 0 obj
+148 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -24057,7 +24044,7 @@ endobj
 /Type /Annot
 >>
 endobj
-150 0 obj
+149 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -24068,7 +24055,7 @@ endobj
 /Type /Annot
 >>
 endobj
-151 0 obj
+150 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -24079,7 +24066,7 @@ endobj
 /Type /Annot
 >>
 endobj
-152 0 obj
+151 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -24090,10 +24077,10 @@ endobj
 /Type /Annot
 >>
 endobj
-153 0 obj
-[147 0 R /XYZ 0 277.6500000000001 null]
+152 0 obj
+[146 0 R /XYZ 0 277.6500000000001 null]
 endobj
-154 0 obj
+153 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -24104,7 +24091,7 @@ endobj
 /Type /Annot
 >>
 endobj
-155 0 obj
+154 0 obj
 << /Border [0 0 0]
 /Dest (_rgcfg_configuring-core_isis-objects-editing)
 /Subtype /Link
@@ -24112,7 +24099,7 @@ endobj
 /Type /Annot
 >>
 endobj
-156 0 obj
+155 0 obj
 << /Length 21772
 >>
 stream
@@ -25640,23 +25627,23 @@ Q
 
 endstream
 endobj
-157 0 obj
+156 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 156 0 R
+/Contents 155 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 16 0 R
 /F3.0 17 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 214 0 R
+/XObject << /Stamp1 213 0 R
 >>
 >>
-/Annots [158 0 R 159 0 R 160 0 R 161 0 R 162 0 R 163 0 R 164 0 R]
+/Annots [157 0 R 158 0 R 159 0 R 160 0 R 161 0 R 162 0 R 163 0 R]
 >>
 endobj
-158 0 obj
+157 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -25667,7 +25654,7 @@ endobj
 /Type /Annot
 >>
 endobj
-159 0 obj
+158 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -25678,7 +25665,7 @@ endobj
 /Type /Annot
 >>
 endobj
-160 0 obj
+159 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -25689,7 +25676,7 @@ endobj
 /Type /Annot
 >>
 endobj
-161 0 obj
+160 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -25700,7 +25687,7 @@ endobj
 /Type /Annot
 >>
 endobj
-162 0 obj
+161 0 obj
 << /Border [0 0 0]
 /Dest (_rgcfg_configuring-core_filterVisibility)
 /Subtype /Link
@@ -25708,7 +25695,7 @@ endobj
 /Type /Annot
 >>
 endobj
-163 0 obj
+162 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -25719,7 +25706,7 @@ endobj
 /Type /Annot
 >>
 endobj
-164 0 obj
+163 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -25730,7 +25717,7 @@ endobj
 /Type /Annot
 >>
 endobj
-165 0 obj
+164 0 obj
 << /Length 23967
 >>
 stream
@@ -27342,23 +27329,23 @@ Q
 
 endstream
 endobj
-166 0 obj
+165 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 165 0 R
+/Contents 164 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 16 0 R
 /F3.0 17 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 214 0 R
+/XObject << /Stamp1 213 0 R
 >>
 >>
-/Annots [167 0 R 168 0 R 169 0 R 170 0 R]
+/Annots [166 0 R 167 0 R 168 0 R 169 0 R]
 >>
 endobj
-167 0 obj
+166 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -27369,7 +27356,7 @@ endobj
 /Type /Annot
 >>
 endobj
-168 0 obj
+167 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -27380,7 +27367,7 @@ endobj
 /Type /Annot
 >>
 endobj
-169 0 obj
+168 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -27391,7 +27378,7 @@ endobj
 /Type /Annot
 >>
 endobj
-170 0 obj
+169 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -27402,11 +27389,11 @@ endobj
 /Type /Annot
 >>
 endobj
-171 0 obj
-[166 0 R /XYZ 0 220.29600000000033 null]
+170 0 obj
+[165 0 R /XYZ 0 220.29600000000033 null]
 endobj
-172 0 obj
-<< /Length 14663
+171 0 obj
+<< /Length 14091
 >>
 stream
 q
@@ -27729,35 +27716,13 @@ f
 h
 S
 Q
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-59.24000000000001 450.36500000000024 Td
-/F6.0 11 Tf
-<697369732e7265666c6563746f722e66616365742e66696c7465725669736962696c697479> 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
-262.74 450.36500000000024 Td
-/F3.0 11 Tf
-<3d> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-268.24 450.36500000000024 Td
+59.24000000000001 450.36500000000024 Td
 /F3.0 11 Tf
-<66616c7365> Tj
+<697369732e7265666c6563746f722e66616365742e66696c7465725669736962696c6974793d66616c7365> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -28090,35 +28055,13 @@ f
 h
 S
 Q
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-59.24000000000001 154.54500000000013 Td
-/F6.0 11 Tf
-<697369732e6f626a656374732e65646974696e67> 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
-169.24 154.54500000000013 Td
-/F3.0 11 Tf
-<3d> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-174.74 154.54500000000013 Td
+59.24000000000001 154.54500000000013 Td
 /F3.0 11 Tf
-<66616c7365> Tj
+<697369732e6f626a656374732e65646974696e673d66616c7365> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -28188,26 +28131,25 @@ Q
 
 endstream
 endobj
-173 0 obj
+172 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 172 0 R
+/Contents 171 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F1.0 8 0 R
 /F3.0 17 0 R
-/F6.0 49 0 R
 /F5.0 48 0 R
 /F4.1 18 0 R
 /F2.0 16 0 R
 >>
-/XObject << /Stamp1 214 0 R
+/XObject << /Stamp1 213 0 R
 >>
 >>
-/Annots [174 0 R 175 0 R 176 0 R 177 0 R]
+/Annots [173 0 R 174 0 R 175 0 R 176 0 R]
 >>
 endobj
-174 0 obj
+173 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -28218,7 +28160,7 @@ endobj
 /Type /Annot
 >>
 endobj
-175 0 obj
+174 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -28229,7 +28171,7 @@ endobj
 /Type /Annot
 >>
 endobj
-176 0 obj
+175 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -28240,7 +28182,7 @@ endobj
 /Type /Annot
 >>
 endobj
-177 0 obj
+176 0 obj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
@@ -28251,11 +28193,11 @@ endobj
 /Type /Annot
 >>
 endobj
-178 0 obj
-[173 0 R /XYZ 0 238.43000000000018 null]
+177 0 obj
+[172 0 R /XYZ 0 238.43000000000018 null]
 endobj
-179 0 obj
-<< /Length 4897
+178 0 obj
+<< /Length 4329
 >>
 stream
 q
@@ -28369,35 +28311,13 @@ f
 h
 S
 Q
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-59.24 683.2450000000001 Td
-/F6.0 11 Tf
-<697369732e766965776572732e70726f70657274794c61796f75742e6c6162656c506f736974696f6e> 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
-284.74 683.2450000000001 Td
+59.24 683.2450000000001 Td
 /F3.0 11 Tf
-<3d> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-290.24 683.2450000000001 Td
-/F3.0 11 Tf
-<544f50> Tj
+<697369732e766965776572732e70726f70657274794c61796f75742e6c6162656c506f736974696f6e3d544f50> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -28440,35 +28360,13 @@ f
 h
 S
 Q
-0.200 0.400 0.600 scn
-0.200 0.400 0.600 SCN
-
-BT
-59.24 606.7250000000001 Td
-/F6.0 11 Tf
-<697369732e766965776572732e70726f70657274794c61796f75742e6c6162656c506f736974696f6e> 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
-284.74 606.7250000000001 Td
-/F3.0 11 Tf
-<3d> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.867 0.133 0.000 scn
-0.867 0.133 0.000 SCN
-
-BT
-290.24 606.7250000000001 Td
+59.24 606.7250000000001 Td
 /F3.0 11 Tf
-<4c454654> Tj
+<697369732e766965776572732e70726f70657274794c61796f75742e6c6162656c506f736974696f6e3d4c454654> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -28523,26 +28421,25 @@ Q
 
 endstream
 endobj
-180 0 obj
+179 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 595.28 841.89]
-/Contents 179 0 R
+/Contents 178 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 16 0 R
 /F3.0 17 0 R
 /F1.0 8 0 R
-/F6.0 49 0 R
 >>
-/XObject << /Stamp1 214 0 R
+/XObject << /Stamp1 213 0 R
 >>
 >>
 >>
 endobj
-181 0 obj
-[180 0 R /XYZ 0 841.89 null]
+180 0 obj
+[179 0 R /XYZ 0 841.89 null]
 endobj
-182 0 obj
+181 0 obj
 << /Border [0 0 0]
 /Dest (_rgcfg)
 /Subtype /Link
@@ -28550,7 +28447,7 @@ endobj
 /Type /Annot
 >>
 endobj
-183 0 obj
+182 0 obj
 << /Border [0 0 0]
 /Dest (_rgcfg)
 /Subtype /Link
@@ -28558,7 +28455,7 @@ endobj
 /Type /Annot
 >>
 endobj
-184 0 obj
+183 0 obj
 << /Border [0 0 0]
 /Dest (other-guides)
 /Subtype /Link
@@ -28566,7 +28463,7 @@ endobj
 /Type /Annot
 >>
 endobj
-185 0 obj
+184 0 obj
 << /Border [0 0 0]
 /Dest (other-guides)
 /Subtype /Link
@@ -28574,7 +28471,7 @@ endobj
 /Type /Annot
 >>
 endobj
-186 0 obj
+185 0 obj
 << /Border [0 0 0]
 /Dest (_rgcfg_deployment-types)
 /Subtype /Link
@@ -28582,7 +28479,7 @@ endobj
 /Type /Annot
 >>
 endobj
-187 0 obj
+186 0 obj
 << /Border [0 0 0]
 /Dest (_rgcfg_deployment-types)
 /Subtype /Link
@@ -28590,7 +28487,7 @@ endobj
 /Type /Annot
 >>
 endobj
-188 0 obj
+187 0 obj
 << /Border [0 0 0]
 /Dest (using-the-wicket-viewer)
 /Subtype /Link
@@ -28598,7 +28495,7 @@ endobj
 /Type /Annot
 >>
 endobj
-189 0 obj
+188 0 obj
 << /Border [0 0 0]
 /Dest (using-the-wicket-viewer)
 /Subtype /Link
@@ -28606,7 +28503,7 @@ endobj
 /Type /Annot
 >>
 endobj
-190 0 obj
+189 0 obj
 << /Border [0 0 0]
 /Dest (restful-objects-viewer-only)
 /Subtype /Link
@@ -28614,7 +28511,7 @@ endobj
 /Type /Annot
 >>
 endobj
-191 0 obj
+190 0 obj
 << /Border [0 0 0]
 /Dest (restful-objects-viewer-only)
 /Subtype /Link
@@ -28622,7 +28519,7 @@ endobj
 /Type /Annot
 >>
 endobj
-192 0 obj
+191 0 obj
 << /Border [0 0 0]
 /Dest (overriding-the-deployment-type)
 /Subtype /Link
@@ -28630,7 +28527,7 @@ endobj
 /Type /Annot
 >>
 endobj
-193 0 obj
+192 0 obj
 << /Border [0 0 0]
 /Dest (overriding-the-deployment-type)
 /Subtype /Link
@@ -28638,7 +28535,7 @@ endobj
 /Type /Annot
 >>
 endobj
-194 0 obj
+193 0 obj
 << /Border [0 0 0]
 /Dest (_rgcfg_configuration-files)
 /Subtype /Link
@@ -28646,7 +28543,7 @@ endobj
 /Type /Annot
 >>
 endobj
-195 0 obj
+194 0 obj
 << /Border [0 0 0]
 /Dest (_rgcfg_configuration-files)
 /Subtype /Link
@@ -28654,7 +28551,7 @@ endobj
 /Type /Annot
 >>
 endobj
-196 0 obj
+195 0 obj
 << /Border [0 0 0]
 /Dest (_rgcfg_configuring-components)
 /Subtype /Link
@@ -28662,7 +28559,7 @@ endobj
 /Type /Annot
 >>
 endobj
-197 0 obj
+196 0 obj
 << /Border [0 0 0]
 /Dest (_rgcfg_configuring-components)
 /Subtype /Link
@@ -28670,7 +28567,7 @@ endobj
 /Type /Annot
 >>
 endobj
-198 0 obj
+197 0 obj
 << /Border [0 0 0]
 /Dest (viewer-configuration)
 /Subtype /Link
@@ -28678,7 +28575,7 @@ endobj
 /Type /Annot
 >>
 endobj
-199 0 obj
+198 0 obj
 << /Border [0 0 0]
 /Dest (viewer-configuration)
 /Subtype /Link
@@ -28686,7 +28583,7 @@ endobj
 /Type /Annot
 >>
 endobj
-200 0 obj
+199 0 obj
 << /Border [0 0 0]
 /Dest (_rgcfg_configuring-core)
 /Subtype /Link
@@ -28694,7 +28591,7 @@ endobj
 /Type /Annot
 >>
 endobj
-201 0 obj
+200 0 obj
 << /Border [0 0 0]
 /Dest (_rgcfg_configuring-core)
 /Subtype /Link
@@ -28702,7 +28599,7 @@ endobj
 /Type /Annot
 >>
 endobj
-202 0 obj
+201 0 obj
 << /Border [0 0 0]
 /Dest (_rgcfg_configuring-core_domain-events)
 /Subtype /Link
@@ -28710,7 +28607,7 @@ endobj
 /Type /Annot
 >>
 endobj
-203 0 obj
+202 0 obj
 << /Border [0 0 0]
 /Dest (_rgcfg_configuring-core_domain-events)
 /Subtype /Link
@@ -28718,7 +28615,7 @@ endobj
 /Type /Annot
 >>
 endobj
-204 0 obj
+203 0 obj
 << /Border [0 0 0]
 /Dest (_rgcfg_configuring-core_lifecycle-events)
 /Subtype /Link
@@ -28726,7 +28623,7 @@ endobj
 /Type /Annot
 >>
 endobj
-205 0 obj
+204 0 obj
 << /Border [0 0 0]
 /Dest (_rgcfg_configuring-core_lifecycle-events)
 /Subtype /Link
@@ -28734,7 +28631,7 @@ endobj
 /Type /Annot
 >>
 endobj
-206 0 obj
+205 0 obj
 << /Border [0 0 0]
 /Dest (_rgcfg_configuring-core_ui-events)
 /Subtype /Link
@@ -28742,7 +28639,7 @@ endobj
 /Type /Annot
 >>
 endobj
-207 0 obj
+206 0 obj
 << /Border [0 0 0]
 /Dest (_rgcfg_configuring-core_ui-events)
 /Subtype /Link
@@ -28750,7 +28647,7 @@ endobj
 /Type /Annot
 >>
 endobj
-208 0 obj
+207 0 obj
 << /Border [0 0 0]
 /Dest (_rgcfg_configuring-core_services)
 /Subtype /Link
@@ -28758,7 +28655,7 @@ endobj
 /Type /Annot
 >>
 endobj
-209 0 obj
+208 0 obj
 << /Border [0 0 0]
 /Dest (_rgcfg_configuring-core_services)
 /Subtype /Link
@@ -28766,7 +28663,7 @@ endobj
 /Type /Annot
 >>
 endobj
-210 0 obj
+209 0 obj
 << /Border [0 0 0]
 /Dest (_rgcfg_configuring-core_metamodel-validation)
 /Subtype /Link
@@ -28774,7 +28671,7 @@ endobj
 /Type /Annot
 >>
 endobj
-211 0 obj
+210 0 obj
 << /Border [0 0 0]
 /Dest (_rgcfg_configuring-core_metamodel-validation)
 /Subtype /Link
@@ -28782,7 +28679,7 @@ endobj
 /Type /Annot
 >>
 endobj
-212 0 obj
+211 0 obj
 << /Border [0 0 0]
 /Dest (_rgcfg_configuring-core_other)
 /Subtype /Link
@@ -28790,7 +28687,7 @@ endobj
 /Type /Annot
 >>
 endobj
-213 0 obj
+212 0 obj
 << /Border [0 0 0]
 /Dest (_rgcfg_configuring-core_other)
 /Subtype /Link
@@ -28798,7 +28695,7 @@ endobj
 /Type /Annot
 >>
 endobj
-214 0 obj
+213 0 obj
 << /Type /XObject
 /Subtype /Form
 /BBox [0 0 595.28 841.89]
@@ -28826,174 +28723,174 @@ Q
 
 endstream
 endobj
-215 0 obj
+214 0 obj
 << /Type /Outlines
 /Count 18
-/First 216 0 R
-/Last 227 0 R
+/First 215 0 R
+/Last 226 0 R
 >>
 endobj
-216 0 obj
+215 0 obj
 << /Title <feff0043006f0072006500200043006f006e0066006900672019006e002000500072006f0070006500720074006900650073>
-/Parent 215 0 R
+/Parent 214 0 R
 /Count 0
-/Next 217 0 R
+/Next 216 0 R
 /Dest [7 0 R /XYZ 0 841.89 null]
 >>
 endobj
-217 0 obj
+216 0 obj
 << /Title <feff005400610062006c00650020006f006600200043006f006e00740065006e00740073>
-/Parent 215 0 R
+/Parent 214 0 R
 /Count 0
-/Next 218 0 R
-/Prev 216 0 R
+/Next 217 0 R
+/Prev 215 0 R
 /Dest [10 0 R /XYZ 0 841.89 null]
 >>
 endobj
-218 0 obj
+217 0 obj
 << /Title <feff004300680061007000740065007200200031002e00200043006f006e00660069006700750072006100740069006f006e002000500072006f0070006500720074006900650073>
-/Parent 215 0 R
+/Parent 214 0 R
 /Count 1
-/First 219 0 R
-/Last 219 0 R
-/Next 220 0 R
-/Prev 217 0 R
+/First 218 0 R
+/Last 218 0 R
+/Next 219 0 R
+/Prev 216 0 R
 /Dest [12 0 R /XYZ 0 841.89 null]
 >>
 endobj
-219 0 obj
+218 0 obj
 << /Title <feff0031002e0031002e0020004f00740068006500720020004700750069006400650073>
-/Parent 218 0 R
+/Parent 217 0 R
 /Count 0
 /Dest [12 0 R /XYZ 0 523.8100000000001 null]
 >>
 endobj
-220 0 obj
+219 0 obj
 << /Title <feff004300680061007000740065007200200032002e0020004400650070006c006f0079006d0065006e0074002000540079007000650073>
-/Parent 215 0 R
+/Parent 214 0 R
 /Count 3
-/First 221 0 R
-/Last 223 0 R
-/Next 224 0 R
-/Prev 218 0 R
+/First 220 0 R
+/Last 222 0 R
+/Next 223 0 R
+/Prev 217 0 R
 /Dest [43 0 R /XYZ 0 841.89 null]
 >>
 endobj
-221 0 obj
+220 0 obj
 << /Title <feff0032002e0031002e0020005500730069006e006700200074006800650020005700690063006b006500740020005600690065007700650072>
-/Parent 220 0 R
+/Parent 219 0 R
 /Count 0
-/Next 222 0 R
+/Next 221 0 R
 /Dest [43 0 R /XYZ 0 602.9300000000001 null]
 >>
 endobj
-222 0 obj
+221 0 obj
 << /Title <feff0032002e0032002e0020005200650073007400660075006c0020004f0062006a006500630074007300200076006900650077006500720020006f006e006c0079>
-/Parent 220 0 R
+/Parent 219 0 R
 /Count 0
-/Next 223 0 R
-/Prev 221 0 R
-/Dest [51 0 R /XYZ 0 841.89 null]
+/Next 222 0 R
+/Prev 220 0 R
+/Dest [50 0 R /XYZ 0 841.89 null]
 >>
 endobj
-223 0 obj
+222 0 obj
 << /Title <feff0032002e0033002e0020004f0076006500720072006900640069006e006700200074006800650020006400650070006c006f0079006d0065006e007400200074007900700065>
-/Parent 220 0 R
+/Parent 219 0 R
 /Count 0
-/Prev 222 0 R
-/Dest [51 0 R /XYZ 0 313.11 null]
+/Prev 221 0 R
+/Dest [50 0 R /XYZ 0 313.11 null]
 >>
 endobj
-224 0 obj
+223 0 obj
 << /Title <feff004300680061007000740065007200200033002e00200043006f006e00660069006700750072006100740069006f006e002000460069006c00650073>
-/Parent 215 0 R
+/Parent 214 0 R
 /Count 0
-/Next 225 0 R
-/Prev 220 0 R
-/Dest [62 0 R /XYZ 0 841.89 null]
+/Next 224 0 R
+/Prev 219 0 R
+/Dest [61 0 R /XYZ 0 841.89 null]
 >>
 endobj
-225 0 obj
+224 0 obj
 << /Title <feff004300680061007000740065007200200034002e002000530070006500630069006600790069006e006700200063006f006d0070006f006e0065006e00740073>
-/Parent 215 0 R
+/Parent 214 0 R
 /Count 1
-/First 226 0 R
-/Last 226 0 R
-/Next 227 0 R
-/Prev 224 0 R
-/Dest [67 0 R /XYZ 0 841.89 null]
+/First 225 0 R
+/Last 225 0 R
+/Next 226 0 R
+/Prev 223 0 R
+/Dest [66 0 R /XYZ 0 841.89 null]
 >>
 endobj
-226 0 obj
+225 0 obj
 << /Title <feff0034002e0031002e002000560069006500770065007200200043006f006e00660069006700750072006100740069006f006e>
-/Parent 225 0 R
+/Parent 224 0 R
 /Count 0
-/Dest [76 0 R /XYZ 0 238.054 null]
+/Dest [75 0 R /XYZ 0 238.054 null]
 >>
 endobj
-227 0 obj
+226 0 obj
 << /Title <feff004300680061007000740065007200200035002e00200043006f006e006600690067007500720069006e006700200043006f00720065>
-/Parent 215 0 R
+/Parent 214 0 R
 /Count 6
-/First 228 0 R
-/Last 233 0 R
-/Prev 225 0 R
-/Dest [81 0 R /XYZ 0 841.89 null]
+/First 227 0 R
+/Last 232 0 R
+/Prev 224 0 R
+/Dest [80 0 R /XYZ 0 841.89 null]
 >>
 endobj
-228 0 obj
+227 0 obj
 << /Title <feff0035002e0031002e00200044006f006d00610069006e0020004500760065006e00740073>
-/Parent 227 0 R
+/Parent 226 0 R
+/Count 0
+/Next 228 0 R
+/Dest [80 0 R /XYZ 0 654.2700000000001 null]
+>>
+endobj
+228 0 obj
+<< /Title <feff0035002e0032002e0020004c006900660065006300790063006c00650020004500760065006e00740073>
+/Parent 226 0 R
 /Count 0
 /Next 229 0 R
-/Dest [81 0 R /XYZ 0 654.2700000000001 null]
+/Prev 227 0 R
+/Dest [80 0 R /XYZ 0 375.0500000000002 null]
 >>
 endobj
 229 0 obj
-<< /Title <feff0035002e0032002e0020004c006900660065006300790063006c00650020004500760065006e00740073>
-/Parent 227 0 R
+<< /Title <feff0035002e0033002e0020005500490020004500760065006e00740073>
+/Parent 226 0 R
 /Count 0
 /Next 230 0 R
 /Prev 228 0 R
-/Dest [81 0 R /XYZ 0 375.0500000000002 null]
+/Dest [95 0 R /XYZ 0 477.5699999999998 null]
 >>
 endobj
 230 0 obj
-<< /Title <feff0035002e0033002e0020005500490020004500760065006e00740073>
-/Parent 227 0 R
+<< /Title <feff0035002e0034002e002000530065007200760069006300650073>
+/Parent 226 0 R
 /Count 0
 /Next 231 0 R
 /Prev 229 0 R
-/Dest [96 0 R /XYZ 0 477.5699999999998 null]
+/Dest [95 0 R /XYZ 0 198.34999999999982 null]
 >>
 endobj
 231 0 obj
-<< /Title <feff0035002e0034002e002000530065007200760069006300650073>
-/Parent 227 0 R
+<< /Title <feff0035002e0035002e0020004d006500740061004d006f00640065006c002000560061006c00690064006100740069006f006e>
+/Parent 226 0 R
 /Count 0
 /Next 232 0 R
 /Prev 230 0 R
-/Dest [96 0 R /XYZ 0 198.34999999999982 null]
+/Dest [130 0 R /XYZ 0 224.9249999999996 null]
 >>
 endobj
 232 0 obj
-<< /Title <feff0035002e0035002e0020004d006500740061004d006f00640065006c002000560061006c00690064006100740069006f006e>
-/Parent 227 0 R
+<< /Title <feff0035002e0036002e0020004f007400680065007200200043006f006e006600690067002000500072006f0070006500720074006900650073>
+/Parent 226 0 R
 /Count 0
-/Next 233 0 R
 /Prev 231 0 R
-/Dest [131 0 R /XYZ 0 224.9249999999996 null]
+/Dest [146 0 R /XYZ 0 277.6500000000001 null]
 >>
 endobj
 233 0 obj
-<< /Title <feff0035002e0036002e0020004f007400680065007200200043006f006e006600690067002000500072006f0070006500720074006900650073>
-/Parent 227 0 R
-/Count 0
-/Prev 232 0 R
-/Dest [147 0 R /XYZ 0 277.6500000000001 null]
->>
-endobj
-234 0 obj
 << /Nums [0 << /P (i)
 >> 1 << /P (ii)
 >> 2 << /P (1)
@@ -29009,46 +28906,51 @@ endobj
 >>]
 >>
 endobj
-235 0 obj
+234 0 obj
 << /Length1 13044
-/Length 8148
+/Length 8147
 /Filter [/FlateDecode]
 >>
 stream
-x\ufffd\ufffdz	tU\ufffd\ufffd{U%Y\ufffdm\ufffd\ufffdm\ufffd\ufffdjY\u07b4\u0632\ufffdE\ufffd\ufffd/\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdx\ufffd\ufffd\ufffd!\ufffdt\ufffd!\ufffdL\ufffdx\u0490\u0490I\ufffd: \ufffdO\ufffdI\ufffd@\ufffd4\ufffd2\ufffd\ufffd\ufffd\ufffds\ufffd\ufffd\ufffd*I\ufffd\ufffdh\ufffd\ufffdK\ufffdU\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd*\ufffdB|dE4\ufffd3\ua748\ufffd\ufffd\ufffd0s!,\ufffd\ufffd\ufffd\ufffd{\ufffd\ufffd+\u03cf\ufffd\ufffdx\ufffd\ufffd\ufffdH@(i+\ufffdstptzk\ufffdu\ufffd
\ufffd\ufffdh\ufffd'kp\ufffd\ufffd\ufffd\ufffda\ufffdRj\ufffdz\ufffd\ufffdw\ufffd\ufffd\ufffd#0\ufffd\ufffd\ufffdf}\ufffd%\ufffd\ufffd\ufffd\ufffd
\ufffd\ufffd\ufffdkb|j\ufffd\ufffd\ufffd\ufffd\ufffd`|\ufffd\u01fc\ufffd}Y\ufffd\u897e\ufffd\ufffdr\ufffd\ufffd{."\ufffdc\ufffd#/B\ufffd\ufffd~\ufffd\ufffd\ufffd\ufffdH\ufffd\ufffd
\ufffd\ufffd\ufffd\ufffd#\ufffdQB\ufffdX"\ufffd\ufffd\ufffd\ufffdc\ufffd\ufffd8\ufffdZ\ufffdE:}\ufffd!\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdj2[\ufffd\ufffdi\ufffd\ufffd#3+;\u01d9\ufffdr\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdy\ufffdO\ufffd?pOe\ufffd\ufffd\ufffd\ufffd\ufffd4|4C^&~\ufffd9\ufffdH+\ufffd\ufffdz\ufffd\ufffd\ufffd=w']\ufffd8gi5\ufffd\ufffdV#Fp/\ufffda\ufffdEb\ufffdk\ufffd\ufffdw\ufffd\ufffdF\ufffd\ufffdJ\ufffd!\ufffd\ufffd	�!r\ufffdL\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdC\ufffd\ufffd\u0711\ufffd\ufffd\ufffd\ufffd\ufffdC\ufffd\ufffd\ufffd\ufffd\ufffdmW.\ufffd\ufffd\ufffd\ufffd:\ufffd!\ufffd>\ufffdV\ufffd\ufffd\u046c\ufffd\ufffdg\u07f9\ufffd\ufffd*Z\ufffd~Zf\ufffdhW"\ufffd\ufffd\ufffd\ufffd\ufffd\ufffds\ufffd_\ufffd\u06dd\ufffd\u06c1\ufffd/
-XZ\ufffd<\ufffd\u07d1\ufffd\ufffd\u93df{\ufffd\ufffd\ufffd\ufffdcY\ufffd\ufffdg.\ufffd\ufffdI.yh	s&\ufffd\ufffd\ufffdy1\ufffd\ufffdb\ufffd\ufffd\ufffdX\ufffd\ufffd\ufffdg\ufffd\ufffd\ufffd\ufffd^\ufffdm\ufffd\ufffdk\ufffd\ufffd\ufffd\ufffd7\ufffdqu\ufffd\ufffd7p	\ufffd\ufffd+\ufffd\ufffd\ufffd\ufffdW\ufffdE\\ufffd\u06b1~v\ufffd\ufffd\ufffd\ufffd\ufffdJ@a0\ufffdZ\ufffdVhj\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd9\ufffd\ufffd\ufffd\ufffd\ufffdm\ufffd]\ufffdp\ufffd\ufffd\ufffd\ufffd\ufffdc\ufffd1H\ufffd\ufffd3\u0314=\ufffdaKWx|\u074e\ufffd\ufffdN\ufffd.A'\ufffd\ufffd\ufffdd\ufffd\ufffdx
-\ufffd
6(=\ufffd\ufffd\\ufffdR*\ufffdMR;\ufffdrS\ufffd\u06c6?&\u02899V\ufffdv\ufffd\ufffdFH\ufffd\u01c7#\ufffd\u068e\ufffd\ufffd\ufffdG\ufffdPf\ufffd\ufffd`\ufffdK\ufffd\ufffd^g&vH\ufffd\ufffd�\ufffdJ\ufffd\ufffd\u04a2\ufffdlO\ufffdk\ufffd=\ufffd\ufffd`\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd9m9\ufffd\ufffd\ufffd,~w\ufffd!\u1b0dt\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdvA@\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffda\ufffd\ufffd\ufffdzf\ufffd\ufffd\ufffd3YY3\ufffdvl}v\ufffdsI\ufffd7PQ\u065f\ufffdT\ufffd\ufffdUT\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdE,\ufffdI,y}\u04e6\ufffd\u9bde:\ufffd\ufffd\ufffd\ufffdO|s\ufffd\u0415\ufffd\ufffd\ufffd\ufffd+\ufffd\ufffdA!/q^F`i6;\ufffdG( \ufffd\ufffd\ufffd\ufffd<ls'\ufffd^\u062bw\ufffd\ufffd\ufffd\ufffd|\ufffd\u0294\ufffd\ufffd+k\ufffd\u077fKav\ufffd{=|u\ufffd\ufffd\u02b0\ufffdd\ufffd]i<\ufffd\ufffdn\ufffdt=\u015a\ufffd\ufffd{\u0683@\ufffdX\ufffd\ufffdY\ufffdk\ufffd>P%\ufffdv\ufffd&\ufffd\ufffd\ufffd~\ufffd\ufffd\ufffd\ufffd-;\ufffd\ufffd`\ufffd3\ufffd&HCx\ufffd\ufffd}\ufffdS?^\ufffd\ufffd\ufffd\ufffdw\ufffd6\ufffd\ufffd\ufffdV\ufffd\ufffd\ufffd`\ufffd\ufffd\ufffdH65S\ufffd\ufffd\ufffd\ufffd\ufffd;\u0259*}\ufffd \u07b7\ufffd\ufffd\ufffd\ufffd\u038d%\ufffd\ufffd\ufffd1W\ufffd\ufffdft\ufffdU$\ufffd\ufffd\ufffd\u03aeu\u021a<\ufffd\ufffd\ufffdDS\ufffd=X\ufffd\ufffdX\ufffd\ufffd8p\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdt[\ufffd\u075e\ufffd\ufffd\ufffd\ufffd\ufffdh{\ufffd\ufffd\ufffd\u014f\ufffdp\ufffd\ufffdNk\ufffdZ\ufffd\ufffdi\ufffdv\ufffdS\ufffd\ufffd\ufffd\ufffd9\ufffd~\ufffd\ufffdT\ufffd\ufffdz\ufffdt5\ufffdwU$
\ufffd\ufffdg\ufffd\ufffdv\ufffda\ufffd6\ufffd\u0594l\ufffd)R\ufffdxG\ufffd@q\ufffd\ufffd\ufffdd\ufffd
 \ufffd`r\ufffd8\ufffd
\ufffd\ufffd\ufffd\ufffd: ND\ufffd\ufffd"\ufffd\ufffdG\ufffd.�A\ufffd6\ufffdM\ufffda\ufffd\u021b\ufffdT\ufffd\ufffd:\ufffd\ufffdC9\ufffd\ufffd\ufffd\ufffd\ufffd\u04b4\ufffd 9T\ufffdBk0h\ufffd\ufffd\ufffdS\ufffd\ufffd\ufffd\ufffdXe\ufffdh$/-\ufffdL\ufffd+\ufffd\ufffd\ufffdq\ufffd\ufffd\ufffd\ufffd\ufc8b\ufffdhV~\ufffdo|
\ufffd<\ufffd\ufffd\ufffd\ufffdc\ufffdbk\ufffdz\ufffd\ufffd\ufffdkI\ufffdhozG@f_\ufffd
\ufffdOM\ufffd\ufffd,\ufffdW;S\ufffdi\ufffd\ufffdI\ufffd\ufffdG\ufffdE'i\ufffd)\ufffdz\ufffd\ufffd\ufffd\ufffd\u02cav\ufffd\ufffd\ufffd|\ufffd%>\ufffdP\ufffd\ufffd\u042b\ufffd\ufffd\ufffd\ufffdZk\ufffdED\ufffd\ufffde\ufffd-\ufffdL-\ufffd\ufffd\ufffd0\ufffdc\ufffd\ufffd\ufffd\ufffd\u0279"c\ufffd:]v~jU\ufffd\ufffd\ufffd\ufffdv\ufffdm\ufffd6\ufffdTA\ufffd\ufffd $\ufffdC\ufffd)\ufffdW\ufffdI\ufffd
-nq\ufffd3\ufffd\ufffd\ufffd\ufffd\u0178\u029b\ufffd;
\ufffd87\ufffd?\ufffd\ufffd<.\ufffde\ufffd\ufffd6\u03ce\u01a4\ufffdjqj\ufffdlbE\ufffdCJK{]cS\ufffd9\ufffd\ufffd%\ufffd\ufffd\ufffd'\ufffd9\ufffd=rfgy\ufffd9\ufffd\ufffdw\ufffd\ufffd\ufffd\ufffde\ufffd\ufffd\ufffd$9\ufffd\u04dbK'\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd12\ufffd\ufffd\ufffdA\ufffd|\ufffd\ufffdX\ufffd\ufffd\ufffdz\ufffdV\ufffd\ufffdn\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd<N\ufffd`?\ufffdt^\ufffd\ufffd\ufffd(\ufffd:amJX\ufffde39H\u0328\ufffdL\ufffd\ufffdS2 s\ufffd_3Fk8`\ufffdL\ufffdp\ufffd\ufffd\ufffd\ufffd\u0262\ufffd\ufffdRc\ufffd\ufffd\ufffd\ufffd\ufffdup\ufffd\ufffdX\ufffd\ufffd\ufffd\u0796V\ufffd\u02f3S\ufffdf\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\uf93ed[c2[\ufffd[s\ufffd0(\u03a9L\ufffd\ufffd\ufffd\ufffdR\ufffd\ufffd\ufffdc4\ufffd\ufffd\ufffd~\ufffd\ufffdsguQ]\ufffd:\ufffd\ufffdk\ufffd\ufffd\ufffd\ufffd\ufffd\u0721\ufffd\ufffd$\ufffd\ufffd:3Z\u05a7d,L\ufffdV&QK[Y\ufffd\ufffd\ufffd\u035e\ufffdR\ufffd\ufffd\ufffds\ufffdk\ufffd\ufffd\ufffd\ufffd_\ufffd\ufffd\ufffd\ufffd\\ufffdU\ufffd\ufffdL\ufffd\ufffdX\ufffd~\ufffd*R\ufffd&3\ufffd`h:.\ufffd\ufffd?<\ufffd8_\ufffdlw\ufffd>8\ufffd\ufffd\ufffd||`\ufffd\ufffd/\u02d4\u066ds\ufffdz\ufffd\ufffd\ufffdb\ufffd$g\ufffd]\ufffd
\ufffd\ufffdX\ufffdu\ufffdnQ\u5db6a+\ufffdP\ufffd\ufffd\ufffdG\u01df\ufffd]Y{\ufffd^<3\ufffd\ufffd\ufffdC\ufffd.uz\ufffd&!\ufffd\ufffdq\ufffdD=V\ufffdr\ufffd\u051e\ufffdn\ufffd}\ufffd_\ufffdV\ufffdY\ufffd\ufffdNP\ufffd\ufffdx\ufffd:W\ufffdVg\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdV \ufffd:X\ufffd\u0750\ufffd\ufffdr\ufffd\ufffdv\ufffd[\ufffd?sK\u68ef\ufffdf\ufffdv.$\ufffdo\ufffdj\ufffdy\ufffd9\ufffdl$aKv3
 \ufffddbV\ufffd\ufffd!8\ufffd\ufffdfl\ufffd!\ufffd\ufffd	\ufffd\ufffdX\ufffdp\ufffd*Y\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdct\ufffd*\ufffd\ufffd\u06d6\ufffdP^\ufffd\ufffd\ufffd.\ufffdbE\ufffd\ufffd\ufffd\ufffd_\ufffdmfX=\ufffd\ufffdxw\ufffd\ufffd\ufffdMrD\ufffdna\ufffd\ufffd3\ufffdv\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdVz\ufffd5\ufffdG/&-2#\ufffd?\ufffdH/\ufffd\ufffd\ufffd!]\ufffd\ufffdZ
\ufffdm\ufffdF\ufffdL\ufffd4op\ufffdN7\ufffd\ufffdE\ufffd\ufffd\ufffd\ufffd
-\ufffd\u02ecP\ufffd]:a\ufffd|L-u\ufffd\u047c\ufffdJ\ufffdZ\ufffd\ufffd\ufffd{\u06f6\ufffd\ufffduU\ufffd\ufffd{\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdaG\ufffd\ufffdl\ufffd$\ufffd6e\ufffdB=\ufffd\ufffd\ufffd\u0554M\ufffd\ufffd\ufffdV\ufffd\u042f)\ufffdTQ\ufffd\ufffdV\ufffd\ufffd7\ufffd\ufffdy\ufffd)\ufffd-Y)\ufffdpP\ufffd\ufffd\ufffdOr\ufffd\ufffd)\ufffd	1\ufffd\ufffdE\u04cf\ufffd\ufffd\ufffd\ufffd\ufffdm\ufffd\ufffdj)Re\ufffd\ufffd\ufffd\u0247\ufffd\ufffdO\ufffd\ufffdO|\ufffdyK\ufffdnL\ufffd\ufffd
kg\ufffd\ufffd\ufffd\ufffd7\ufffd\ufffd~z\ufffd-\u039a\ufffdKP\ufffd
-S\ufffd\ufffd\ufffdvK.\ufffd\ufffd\ufffdr\ufffd0\ufffdC\ufffd\ufffdzC\ufffdR^\ufffd\ufffdaf"
-\ufffdBNG\ufffd�^\ufffd$\ufffd\ufffd\ufffd?<\u0576d\ufffdvn\ufffd\ufffd\ufffd?C|x\ufffd\ufffd\ufffd\ufffd:,\ufffd\ufffd\ufffd6\ufffd\ufffdN�\u05d9\ufffd\ufffd\ufffd\ufffd\ufffd1,\ufffd+\ufffdsT|Z\ufffd\u0797VbVp�\ufffdg:\ufffdY\ufffd\ufffd
-\ufffd\ufffd\ufffd\u0127\ufffd)f\ufffd\ufffdB\ufffd\ufffdD-\ufffdaOhl\ufffd\ufffd\ufffd�1\ufffdps\ufffd\ufffdG\ufffd\ufffd]\ufffd\ufffdY-CY\ufffd1W\ufffd\ufffd@\ufffd\u0258\ufffdK\ufffdX\ufffd\ufffd}L\ufffdM\ufffdVN\ufffd\ufffd\ufffd^\ufffd\u0697-Y\ufffd\u07f3\ufffdL~\ufffd\ufffds\ufffd:\u4b0bO`\ufffd\u9237\ufffd\ufffduGf\ufffd\ufffd\ufffd\ufffd
-0i\ufffd\ufffdO{\ufffd\ufffd\ufffd\ufffdn\U000b76f3T\ufffd\ufffd\ufffdX\ufffd\ufffdw\ufffd\ufffd\ufffdpl{\ufffd\ufffdx
-\ufffdGHxq	\ufffd\ufffd\ufffd%\ufffd\ufffd]m_y\ufffd1<W\ufffd2\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd[\ufffd~\ufffdp\ufffd \ufffd|r\ufffd\ufffd\ufffd\ufffdiW\ufffd}\ufffd\ufffdg\ufffdlU\ufffd\ufffd1N\ufffdH\ufffdR\ufffd6)\ufffd\ufffdJ\ufffdK\ufffd$\ufffd\ufffd\ufffdf\ufffd\ufffdJk\ufffd+\ufffd\u0470\ufffd\ufffdn|t\ufffd\u02a2\u0214\ufffdA~\ufffd\ufffd\ufffd9\ufffdN]S
\u02ca\ufffd?\ufffd\ufffd\u0467A\ufffdc\ufffdU*\u043e\ufffd-ai\ufffdA`Y\ufffd\ufffdFrq\ufffd@\ufffd!xy\ufffd?\u056d\ufffdg\u037f\ufffd>_^\ufffdu\ufffd\ufffd\ufffdF\ufffd\ufffd6\ufffd\ufffd1\ufffdGX\ufffd?`.H\ufffdS\ufffda\ufffd
-\u886aL\ufffd\ufffd_k\ufffd\u0687\ufffd\ufffd\Bl\ufffd\ufffd\ufffde\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd+\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd:e\ufffd6H\ufffd\ufffd:.m\6{\ufffd|\ufffd\ufffd\ufffd\ufffd<\ufffdJ[2Uz\ufffdN\ufffd\ufffd\ufffd\ufffd\ufffd	\ufffd\ufffdRn\ufffd-o>|\ufffdL\ufffd\ufffd6,\ufffdJ*\ufffd\ufffd%\ufffd3)z\ufffdp\ufffd\ufffdC\u62d2 \ufffdI\ufffd\ufffdb\ufffd-6t\ufffdr_\ufffd"l\ufffd\ufffd\ufffd8o\ufffd\ufffd\ufffdg\ufffdq\ufffd\ufffdG\ufffdw\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\\ufffdo\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdG{RS{\ufffdir\ufffdX\ufffdie%}}x\ufffdBp\ufffd\u037c\ufffd3\ufffd
-\ufffd[j7\ufffd_\ufffd\ufffd\ufffdX\ufffd?*\ufffd\ufffdB.'\ufffd\ufffd g\ufffd\ufffd\ufffd\ufffd/\\ufffdw\ufffd\u785d\u0338\ufffd\ufffd\ufffd
w6\ufffdd\ufffd/x\ufffd\ufffd\ufffd\ufffd'vV\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd{\ufffdL\ufffd\ufffd\ufffd1E'\ufffdr\u0420\ufffdd\ufffd6S.\ufffd	?"\ufffd�/mM\ufffdtk[\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd%?%\ufffd\ufffd\ufffd\ufffdl\ufffd
\ufffdo\ufffd\ufffdJz\ufffd\ufffd\ufffd-\ufffd\ufffdGBJ\ufffd\ufffdT2b3\ufffdA\ufffd\ufffd\ufffd~m\ufffd\ufffdPl\ufffdk\ufffd\ufffd\ufffd\ufffd\u0738\ufffd9\ufffdKO\ufffd$k(\ufffdn\ufffd2\u0402\ufffdn\ufffd\ufffd8\ufffd\ufffdr\ufffd\ufffdk\ufffd\ufffdAby~\ufffdnc\ufffdl\ufffd.\ufffd\u03f5\ufffd,\ufffd\ufffd[k\ufffd\ufffdi\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdb{\ufffd}\u074d\ufffd\ufffd`\ufffdT\ufffds\ufffd\ufffd\ufffdW\ufffd\ufffdk\ufffddT\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdT\u0336m\ufffd\ufffd\ufffd\\ufffdu\ufffd\ufffdqo\ufffd\ufffd\ufffdB\ufffdh)pn\ufffd\ufffdi*\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd(\ufffd\ufffdyIr\ufffdp\ufffd\ufffd*\ufffd\ufffd6\ufffd\ufffd\ufffdY\ufffduEc\ufffd\ufffd]\ufffd-woLO\ufffdo0Y7\ufffd3k]\ufffdkCeQ\ufffd\ufffd\ufffdo\ufffdz\ufffdg\ufffd.\ufffd_\u964aq\ufffd\l\ufffd\ufffd&\ufffdL\ufffd\ufffd8\ufffdei\ufffd\ufffd\ufffd\ufffd&\ufffdQL\ufffdA\ufffd\ufffd\ufffdd=I\ufffd\ufffd\ufffd\ufffd\u02feNmf3.\ufffd\ufffdgY\ufffd\ufffd\ufffd\ufffdcG\ufffd\ufffd\ufffd/\ufffd[#\ufffdDU\ufffd\ufffdWv\ufffd\ufffdT[\ufffd\ufffd\ufffd\u059dMI\ufffd9\ufffd\ufffd+\ufffd\ufffd\ufffd6\ufffd\ufffdvR\ufffd\ufffd\u06cb\ufffdn\ufffd\ufffd\ufffd6\u0354\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd7\u7c98\ufffd\ufffd\ufffd0%3q\ufffdY&\ufffd\ufffd\ufffd\\ufffd\ufffdr7\ufffd35t\ufffdM@!\ufffd\ufffdK
 LuJ\ufffd,nW(\ufffdcu\ufffd0*U\ufffd_<~Q\ufffd\ufffd\u0768J\u046b\ufffdtuU\ufffd
\ufffd\u06202]h\ufffd\ufffdb\ufffd\ufffd\ufffdc\ufffd-O\ufffd\u079d~=\ufffd\ufffd B\ufffd\ufffd\ufffd\ufffde!\ufffdL\u0255L\ufffd\ufffd\ufffd\ufffd\ufffdG\ufffd(\ufffd$\ufffd4\u019e!y\\ufffd\ufffdQe\ufffdWE\ufffd\ufffd\ufffdg\ufffd7^\ufffd\ufffd\ufffdctf\ufffd\ufffdx\ufffd\ufffdfad\ufffd\ufffd*\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd*\ufffd\ufffd[\ufffdU*E(\ufffdK\ufffd]\u03e3\ufffd\ufffd^\ufffd\ufffdg+j_\ufffd!\ufffd}\ufffd:
-\ufffd	\ufffd\ufffd|\ufffd\ufffd\ufffdH\ufffd\u072c\ufffd\ufffd\ufffd�\ufffd\\ufffd\ufffdb3^V/c\ufffdJu\ufffd\ufffd�\ufffdh.~E\ufffdJ3\ufffd\ufffd\ufffd\ufffd\ufffdYS\ufffdQ\ufffd\ufffdn\ufffd6\ufffd@)}\ufffdPQ\ufffd\ufffd\ufffdKGG2-\ufffdX\ufffdO6\ufffd\ufffdD
-WoV\ufffdI\ufffdX\ufffd\u072b\ufffdX\ufffdA$\ufffd\ufffdx<}V2\u0778\ufffdxn\ufffd\ufffdS&S\ufffd\ufffdp)}:Bo\ufffd\ufffd\ufffdy<\ufffd:G"\ufffd\ufffd08\ufffdrh\ufffd,<L\ufffd\ufffdW\u0497\ufffdQ\ufffd<\ufffd=\ufffd\ufffdks/\ufffd=\u02e2g0\ufffdeO\ufffd\ufffd\u0576\ufffdD\ufffd\ufffduz\ufffdP\ufffdMT([U\ufffd^\ufffdP|\ufffd0T\ufffd\ufffd\ufffd\ufffd\ufffdj\ufffd\u0318\ufffd\ufffd\ufffdO@\ufffd\ufffdYY\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd%)\ufffd\ufffdRE\ufffdq92\ufffdJ\u079cU\ufffdph\ufffd\ufffd\ufffd\u0158L\ufffd\ufffd\ufffd2/=F\ufffd\ufffdO\ufffdC\u07d0Du"q\ufffdD\ufffd\ufffd\ufffd	\ufffdbv\ufffd*\ufffdf\ufffd	\ufffdI\ufffd>\ufffd=;\ufffd\ufffd\ufffd\ufffd\ufffd&w_Y�\ufffdr\ufffd\ufffduI\ufffd\ufffd\u059c\ufffd\ufffd\ufffd:\ufffd\ufffdTi\ufffd\ufffd\ufffd5\ufffd\ufffd\ufffd\ufffd\ufffd3M\u05bf}\ufffddxb%N\ufffd\u0698X\ufffd\ufffd`\ufffdK\ufffd\ufffd:\ufffd\ufffd\ufffdzkN\ufffd\ufffd\ufffd"34\ufffd\ufffd^\ufffd\ufffd\ufffd,\ufffd\ufffds:\ufffd<#\ufffdX7\ufffdx\ufffdhw.sC\ufffd\ufffd\ufffd,W\ufffdL\ufffd\ufffd\ufffdc\ufffd(\ufffdY\ufffd\ufffdn7\ufffd\ufffd\u06e0\ufffdAM\ufffd\ufffd\ufffd\ufffd\ufffdt\ufffd\ufffd\ufffdU\ufffdE\ufffd\ufffd\u78d8
-\ufffd	Qx\ufffd\ufffdO\ufffdS\u0555\ufffdwdS&\ufffd\ufffdW*\ufffd\ufffd7\ufffdbc]^\ufffd\ufffd\ufffd\ufffd\ufffd)RX\ufffd\ufffd\ufffd%+|\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdV\ufffd\ufffd\ufffdW\ufffd\ufffdXk\ufffd\ufffd\ufffd\ufffd\u039exbd\ufffd\ufffd\ufffd�\ufffdu\ufffd\ufffd\ufffdk\ufffdqS\ufffd\ufffd\ufffd4\ufffd\ufffd\ufffd\ufffd/JJ\ufffd\ufffd\u065b\ufffd\ufffd?\ufffd\ufffd=\ufffdX\ufffd\ufffd\ufffdX\ufffd\ufffd'6\u07ab\ufffd\ufffd\ufffd6\ufffd!\ufffd\ufffd\ufffd\ufffd\ufffd?\ufffd++&c\ufffd\ufffd,\ufffd\ufffd)0\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdk\ufffd\ufffdc\ufffd\ufffdY\ufffd\ufffd\ufffdK]`\u5577\ufffd\ufffdu\ufffdC!\ufffd%\ufffd\ufffdpF\ufffd[)\ufffdQ\ufffdp\ufffd\ufffd2\ufffd\ufffd\u94cc\ufffd\ufffd`\ufffd,\ufffd$	\ufffd\ufffd\ufffdg\ufffd\ufffd\ufffd\ufffdH]Q\ufffd+\ufffd\ufffd\ufffdY\u065c\ufffdT\ufffdR9\ufffd\zjB\ufffd\ufffd{\ufffdZ\ufffdOR\ufffd99O\ufffd\ufffd'^\ufffdc\ufffd\ufffd\ufffd\ufffdqC\ufffd\ufffdN`\ufffd1P\ufffdVEu\ufffd\ufffdmr.\ufffd\ufffd\ufffdd\ufffd\u0776\ufffd\ufffd\ufffd\ufffd9:\ufffd\\ufffdI\ufffd\ufffd\ufffd\ufffd\ufffd"ALj\ufffd\ufffd\ufffd\u77a9\ufffd\ufffd+\ufffd\ufffdb\ufffd\ufffd\ufffdvc5\u05b9\ufffd\ufffd\ufffdvN<6\ufffd\ufffdh\ufffd\ufffd&(\ufffde\ufffd\ufffdLl\ufffd\ufffdF\ufffd\ufffd&\ufffd4\ufffd\ufffdr:\ufffd\u06c2w\ufffd,\ufffdf\ufffdF\ufffd^\ufffd\ufffd6*/\ufffd\ufffd\ufffdyWc\ufffdX\ufffd*\ufffd\ufffd2D\ufffd3\ufffd\ufffd\ufffd\ufffdH\ufffd\ufffd?b\ufffd\ufffd_I"o\ufffd=]i\u0484MlJ\\ufffd\ufffdi\ufffd\ufffdu\ufffdz\ufffd\ufffd\ufffd\u0783\ufffd\ufffdPvj/jF#h\ufffd\ufffd\ufffdY\ufffd\u0710\ufffdm<ad\ufffd#\ufffd\u049b3\ufffd\ufffd\ufffdw\ufffd\ufffd\ufffd;\ufffd\ufffd\ufffd| \ufffdq
-\ufffd\ufffd\ufffd!]\ufffd\ufffdH\ufffd\ufffdF*\ufffd\ufffdd\ufffd\ufffddn\u07f7\ufffd	\ufffd<I\ufffd2J\ufffd\ufffd(\ufffd\ufffd\ufffd\ufffd:C\ufffd]o\ufffd\ufffd\ufffd;\ufffde6i\ufffdF\ufffd_\ufffdZb\ufffd\ufffdv\ufffd\ufffd5\ufffd\ufffd\ufffd"#\u04dd:\ufffdI\ufffdx,:\ufffd\ufffdf\ufffdF\ufffd\ufffd^c\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd-\ufffd=\ufffd%\ufffd\ufffd\ufffd\u079e&J-3\ufffd	�\ufffd\ufffd)3-U;;\ufffd\ufffd\ufffd\ufffdJ\ufffd\u01e8\ufffds\ufffd\ufffd�{{G\ufffd\ufffd\ufffd'\ufffd\ufffd\ufffd\ufffdZWk\ufffd(\ufffd\ufffd\ufffd\ufffdzOwF\ufffd8:"\u02a8\ufffd	\ufffd\u05e3M5YCa\ufffd\ufffd\ufffd\ufffd"\ufffd\ufffd\u022e]\ufffdTno\ufffd\ufffdw\ufffd\ufffd\ufffd\ufffd\u0269\ufffd\ufffds\ufffd\ufffd\ufffd2H8V\ufffd7a\ufffd\ufffd}\ufffd\ufffdZzou|\ufffdw\j\ufffd\ufffda\ufffdN\u0381\ufffdv$\ufffd\ufffdq\ufffdop\ufffd\ufffd\ufffd\ufffd
Dw\ufffdK\ufffd\ufffd{\ufffd\ufffd=4D\ufffd\ufffd\u2d62\ufffdr\ufffd\ufffdy\ufffd\ufffd\ufffde\ufffdA_\ufffdl\ufffd3\ufffd1\ufffd\ufffd`2W"\ufffdU\ufffdU\ufffdo\ufffd\ufffd\ufffd\ufffd\ufffd|}\ufffd\ufffd"MrLt\ufffdZ,V'G\ufffd$kDlJ \ufffd\ufffdg\ufffdQ_}\ufffd\u024f\ufffd\ufffd\ufffd\ufffdU\ufffdx8GD\ufffd\ufffda n|NK\ufffd\ufffd_\ufffdT2\ufffd\u05ca\ufffd\ufffd\ufffdj\ufffd\ufffdh\ufffd\u0203\ufffd\ufffd\ufffdL\ufffdS\u0342\ufffd\ufffdH\ufffd\ufffd\ufffd\ufffdf\ufffd"\ufffd\ufffd\ufffd\u04e2z\ufffd\u0395\ufffd\ufffdb\ufffdU\ufffd\ufffd\ufffd\ufffd\ufffd4\ufffd\ufffd\ufffd\ufffd/\ufffd\ufffd\ufffd\ufffd\ufffdY\ufffd\ufffdT\ufffd>\ufffdI\ufffdC\ufffdw \ufffdb\ufffd}\ufffd\ufffd\ufffd:\ufffdX\ufffd\ufffd\ufffdC,\ufffd[\ufffd\ufffd\ufffd6E\ufffdO\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdz\ufffd',i}1.\ufffdx\ufffdW\ufffd\ufffdn\ufffd\ufffd\ufffd\ufffdd\ufffdG\ufffd\ufffd\ufffd
 \ufffdH\ufffd\ufffd\ufffd\ufffdgOP\ufffd]\ufffd\ufffd~DS\ufffd_f\ufffd_)\ufffd^\ufffd|\ufffdO\ufffdl\ufffd=\ufffd\u05f0M\ufffd?w\ufffdk\ufffd\ufffd\u06f5\ufffdR\ufffd\ufffd,g\ufffd(\ufffd\ufffd\ufffd\ufffd&kz[\ufffdK,T\ufffd\u05f5Zk~\ufffd1\ufffdmWn\ufffdw\ufffd7;\ufffdA�\ufffd\ufffd\ufffd S&v\ufffd\ufffd[\ufffd^\ufffdY\ufffd\ufffd\u019co\ufffd\ufffd\ufffd17\ufffd4\ufffd\ufffd\ufffdZx\ufffd\ufffd\ufffduR\ufffd\ufffd:\ufffd~b\ufffd?\ufffda@\ufffd\\\ufffd\ufffdk\ufffd\u05b7\ufffd\ufffd\ufffdh\ufffd\ufffdt\ufffd\ufffd\ufffdsb~\ufffd-`W`\ufffd\ufffdG`\ufffdd\ufffd\ufffd{\ufffd\ufffdK5\ufffd<5\ufffd\ufffd\ufffd\ufffd\ufffd
-\ufffd~\ufffd\ufffd\ufffd\ufffdW
WWo*\ufffdS\ufffdga\ufffd?\ufffd\ufffd\ufffd\ufffd\ufffdw\ufffd]\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdfrsgNMN\ufffd\ufffd\ufffd\u0259:\ufffd\ufffdSB\\ufffd~b\ufffd	\ufffd\ufffd\ufffdd\ufffd\ufffd\ufffdAG\ufffd\ufffdt\ufffd\ufffd\u01083\ufffd\ufffd\ufffd\ufffdfY\ufffd{\ufffd\ufffdjWP\ufffd~\ufffdruC~\ufffd\ufffdN\ufffd\ufffdI\ufffdn'\ufffd\ufffd\ufffd^7e\u0185\ufffd6\ufffd\ufffdM\ufffdP\ufffd\ufffd9\ufffd\ufffd`-`-\ufffd\ufffdx@\ufffd\u01d1yK\ufffd\ufffd\ufffdb[hu\ufffdqa\ufffdb\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd0\ufffdr!\ufffd\ufffd\ufffdK+\ufffdZ\ufffd\ufffd;\u0354`\u9acb\ufffdc\ufffd\ufffd\ufffdgU\ufffd\ufffd\ufffdf1$\ufffdX\ufffd\ufffd\u055b\ufffd>A\ufffd|2\ufffd\ufffd\ufffd',\ufffd\ufffd\ufffdl\ufffdN#_\ufffd\ufffdj+\ufffd\ufffd\ufffd\ufffd3\ufffd\ufffd	\ufffd&\ufffd\ufffd\ufffd\\ufffd6\u01f7\ufffdu.}M\ufffd\ufffda\ufffd6U\ufffd\ufffdux\ufffd\ufffd\ufffd\ufffd7}\ufffd\ufffdB\ufffd\ufffd\ufffdjo\u0587A\ufffd\ufffd\ufffd\ufffdOX\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdbUM"YF\ufffd;\ufffd1[%\ufffd\ufffdX?S\ufffd\ufffd\ufffdo\U000fa26a\ufffd\uaca6\ufffd(\ufffd\ufffdP\ufffd\ufffd+\ufffds6=(Qf\ufffd9\ufffd25\ufffd\u03b2$eZIRB\ufffd5]\ufffd/\ufffd\ufffd\ufffd\ufffd\ufffdKP\ufffdJ\ufffd\ufffd&\ufffdSs\ufffd\ufffdVS\ufffd\ufffd\ufffd\ufffd;\ufffdvk]"\ufffd5\ufffd\ufffd\ufffdx\ufffdS\ufffd\ufffd\ufffdj\ufffd\ufffd\ufffd
\ufffd\ufffd\ufffd\ufffd\ufffdI\ufffd\ufffdHF\ufffd
nMDr\ufffd#\ufffdf\ufffd\\ufffd\u042a\u04e7Du\ufffdp\ufffdjS\ufffd\ufffd\ufffd
\ufffdh+\ufffd\ufffd'\ufffdU\ufffd\ufffd\ufffd\ufffd\ufffd3K5C\ufffd@\ufffd~\ufffdU\ufffd\ufffda\ufffd\ufffd\ufffd\ufffd\ufffdBcT&\ufffd\ufffd\ufffdz\ufffd\ufffd\ufffdu\ufffd{L>\ufffdK\ufffd\ufffd\ufffd\ufffd
 <\ufffd[9\ufffd#6\ufffd/\ufffd'E\ufffd\ufffd
\ufffdX-\ufffd\ufffdam\ufffdV\ufffd\ufffd\u039b\ufffd\ufffd<\ufffd_G\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdd,\ufffd\ufffd\ufffd\ufffd\ufffd<)\ufffd.o_Dl\ufffd\ufffd
-\ufffd\ufffd\ufffd\u0502\ufffd\u0422\ufffdH|.\ufffd}RE\ufffd\ufffd}.\ufffd\ufffd \ufffdz<V\ufffdP/\ufffd\ufffd\ufffd77V*d\u0575|\ufffd\ufffd\ufffd\ufffdT-\ufffd$\ufffd0O\ufffd|x\ufffd\ufffd\ufffd\ufffdc\ufffdXc\ufffdAO\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u07ff\ufffd\ufffd\ufffdp\ufffd\ufffd\ufffd\ufffd~^XQ\ufffd\ufffdU\ufffdR\ufffd\ufffd\ufffd\ufffd0\ufffd@\ufffd\ufffdq\ufffd*\ufffd\ufffd\ufffd)]\ufffd0n_&\ufffd\ufffd\ufffdV(WD\\ufffd\ufffd\ufffd345T(l\ufffd\ufffd
-\ufffd\ufffd\ufffd\ufffdw\ufffdO\ufffd\ufffd,\ufffd\ufffda\ufffdx\ufffda\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd*\ufffd\ufffdd}\ufffd\ufffdf\ufffd\ufffd2\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd0\ufffd+\ufffd\u04c6\ufffdT\ufffd/Sc05R\ufffdg\ufffd\ufffd\ufffd\ufffdt\ufffd\ufffd\ufffdT\ufffd\ufffd\\ufffd\ufffd?\ufffd\ufffd\ufffd\ufffd\ufffd*\ufffd\ufffd\ufffd@\ufffd/6d\ufffd\ufffd\ufffd0A\u04e6&h\ufffdyl\ufffd#\u07f3IK\ufffd7\ufffd!\ufffd\ufffdf$\u045f\ufffd�\ufffd_\ufffdN\u055c3\\ufffd\u04f3M\ufffd\u0296\ufffdkp\ufffd=\ufffd~\ufffd,\\ufffd\ufffd9\ufffd04\ufffd>\ufffd\ufffd8\ufffd\ufffd�\ufffd\ufffd\ufffd8\ufffd'\ufffdki H]\ufffdn.\ufffd\ufffd#\ufffd\ufffd->\ufffd\ufffda\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdb\ufffd\ufffd\ufffd6\ufffd\ufffd5\ufffd\ufffd
-	=(P+e7\u0328\ufffd
-6\u0125*|f1\ufffdsp\ufffd49\ufffd\ufffd9\ufffd!wh\ufffd\ufffd\ufffd%\ufffd7\u0515+L;+v8\ufffd\ufffd\ufffdy\ufffd)\ufffd\ufffd[\ufffdKF\u062b\ufffdb\ufffd|\ufffdE-\ufffd{\ufffd\ufffd/\ufffd\ufffd+\ufffdZi\u1450�\ufffd3\ufffdf\ufffd\ufffdB\ufffd\ufffd'wI\ufffd\ufffdI<\ufffdo\\ufffd\ufffd[/>M\ufffd\ufffd\u0765\u0555boRyoNVwErrEwVNoy\ufffd^\ufffdd\ufffdJU2\ufffd\u0638\ufffdT\ufffd*\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdOFfwv\ufffdo\ufffd\u03cc\ufffdW?v&*n\ufffdY\ufffdsO\u014d?3f\ufffd\ufffd"\ufffd\ufffd~\ufffdYF~\ufffdz\ufffdC\ufffd\ufffd\ufffd`\ufffdG\ufffd\ufffd
-\ufffd@\ufffd\ufffdi\ufffdG\ufffd)\ufffd\ufffd\ufffd\ufffd_\ufffd7\ufffddb\ufffd8K\ufffd\ufffdx\ufffd7\ufffdT<\ufffdK\ufffd\ufffdP\ufffd
-\ufffd]\ufffdW9\u05f8U\ufffd\ufffd;!($=\u4390Wy\ufffd\ufffd\ufffd\ufffdo\ufffd\ufffd\ufffd\ufffd\u0417\ufffd\ufffd\ufffd\ufffd3L\ufffd5\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd_G\ufffd\ufffd_\ufffd\ufffdKp^\ufffd\ufffd\ufffd\ufffdc\ufffd\ufffdrG\ufffd\ufffdT\ufffd+>#\ufffd&j\ufffd*\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdg\ufffd<DH\ufffdZ\ufffd\ufffd~
\ufffd\u0623\ufffdB\ufffd\ufffd\ufffdE\ufffd!\ufffd\ufffd9d\ufffd\ufffd\ufffdy\ufffd0\ufffd:\ufffd\ufffd\ufffd [\ufffd\ufffd�\ufffd\ufffdp\ufffd\ufffd\ufffd\ufffd\#*\ufffd\u075cy\ufffdrNTC}\ufffdf8\ufffd\ufffd\ufffdy\ufffd\ufffdc\ufffdp[P
\ufffd-\ufffd\ufffd\ufffd\ufffd\u0649j\ufffdJ\ufffd\ufffd-\ufffd\ufffd.\ufffd\u039c<\ufffd\ufffd
uS\ufffd\ufffd$\u038bH\ufffd\ufffd\ufffd]H\ufffd)GQt\ufffd{j'\ufffd\ufffd\ufffd[\ufffd\ufffd\ufffdh3qeR5\ufffd� q\ufffd\ufffd7>\ufffdN\ufffd\ufffd9\ufffd\ufffdes\ufffdP6u\ufffd\ufffd_\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd#\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd8\ufffdq?Cu\ufffd\u0748G\u0251\ufffd\ufffd\ufffdr?D\ufffd\ufffd0{�\ufffdK'\ufffd7\ufffdUtM\ufffd\ufffd7V\ufffd?5\ufffdL
:\ufffd\ufffd\u040b\ufffd\ufffd\ufffd:c\ufffd\ufffd\ufffd\ufffd+\ufffds\ufffdcKS\ufffd\ufffd\ufffd\ufffd~\ufffd\ufffd\ufffd0Aq(\ufffd\ufffd\ufffd
-\ufffd[>\ufffdz~\ufffd>\ufffd)[\ufffd\ufffd\ufffd#>}�\ufffd\ufffd\ufffdh\ufffd \ufffd\ufffdG\uf086*@\ufffdi/\ufffd"t\ufffd\ufffd\ufffd\ufffdNi
\ufffd\ufffd\ufffdt
-GH\ufffdq"\ufffd'\ufffdN\ufffd\ufffd?\ufffd \ufffdB\ufffd(\ufffd\ufffd\ufffd
(|7p$\ufffd\ufffdbM\ufffd+\ufffd\ufffd\ufffd\u04d1
\ufffdC;r\ufffdL\ufffd\ufffd\ufffd!B:\ufffd\ufffd+F%P1\ufffdA\ufffd_\ufffd_\ufffd\ufffdP5p]\ufffdjQ\ufffdG
\ufffd5A\ufffdjF-\ufffd\ufffd\ufffdv\u05016\ufffd=\ufffd)\ufffd\u0479\ufffd\ufffd\ufffd!\ufffd\ufffd\ufffd\ufffd"\ufffd\ufffd\ufffd7\ufffdgaQc\ufffd\ufffd\ufffd:a\ufffdgr\ufffd~\ufffd<\ufffd\ufffd\ufffd	\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdg\ufffd\ufffd$\ufffd\ufffd\ufffd<	h?\ufffd\ufffdS\ufffd\ufffd\ufffd\ufffdy
-I\ufffd\ufffd?\ufffdA\ufffd\ufffd\ufffd\ufffd .\ufffd\ufffdsQ\ufffdMl!H\ufffd'\ufffd\ufffd\ufffd\ufffdb\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdO\ufffdyJ\ufffd\ufffd\ufffdE"\ufffd+%)\ufffdy>\ufffdl\ufffd\ufffd\ufffd:\ufffd;\ufffd\ufffdaHE\ufffd\ufffd?\ufffdr	\ufffd\ufffd[\ufffd*2\ufffd?\ufffdr\ufffd\ufffd|2\ufffd\ufffd\ufffd#P\ufffd\ufffd^\ufffd\ufffd)\ufffd^~^^4>1;9408\ufffdI\ufffd\ufffd\ufffdk\ufffd\ufffd\ufffdF\ufffd4\ufffd\ufffdz\u031a\ufffd\ufffdM=siJS\ufffd7\ufffd7y[_\ufffd\ufffdqf\ufffdh
\ufffd4\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdf\ufffdu\ufffd\ufffd\ufffdA}0Z\ufffd\ufffdP2�\ufffd\ufffds\ufffd\ufffd_M\ufffd\ufffd>8\ufffd\ufffd\ufffd\ufffd/2\u05ccO\ufffdk\ufffd&\ufffd\ufffd\ufffdT\ufffd\ufffdq\ufffd\ufffd\ufffd\ufffdc\ufffd\ufffd\ufffd
\u030cx'\u065f
\ufffd \ufffdE\ufffd\ufffd\ufffdc\ufffd\u04f3y\ufffd;046\ufffd1i\ufffd\ufffdT\ufffd1\ufffd\ufffd,\ufffd\ufffda\ufffd\ufffd
\ufffd1\ufffd\ufffd#\u05ac\ufffd\ub9d1x\ufffd&\ufffd\ufffd\ufffd\ufffd4ifk\ufffdff\uc6390\ufffdv\ufffdD\ufffd\ufffdf\ufffd`|
-R\ufffd,A\ufffd\ufffd\u0414\u01ab\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdz'\ufffd5\ufffd\ufffd\ufffd\ufffdb9\ufffd
-\ufffd\ufffd4p\ufffd\ufffd\ufffdL\ufffda\ufffd\ufffd\ufffd\ufffd\ufffd"\ufffd\ufffd\ufffd\ufffdc\ufffd\u03cb\ufffd\ufffd\ufffd\ufffd4\ufffd}\ufffd\ufffd5~]\ufffdj\ufffd\ufffd\ufffd\ufffdh\ufffd{\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdi\ufffd?\ufffd\ufffd^M\ufffd\ufffd\ufffd&\ufffd\ufffd \ufffd\ufffd\ufffdiv\ufffd3@f\ufffd\ufffd2\ufffd3\ufffdU,\ufffd9
\ufffd\ufffd\ufffd5\ufffd\ufffdfpzz"\ufffdb\ufffd\ufffd\ufffd3\ufffd"6\ufffd\ufffd\ufffdZ&,d\ufffd�\ufffd4\ufffd>\ufffd\ufffd>\ufffdR1\ufffde\ufffd\ufffd\ufffd\ufffdQ\ufffd>\u01d8_7?\ufffd-[\ufffd\ufffdG\ufffd\ufffdbIOM\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd3\ufffd\ufffd\ufffd\ufffdiO\ufffd\ufffdp\ufffd\ufffd\ufffd\ufffd\ufffd\u034c\ufffd\ufffdMj\ufffd\ufffd4\ufffd8\ufffd\ufffd\ufffdj\ufffdn\ufffdBd*}@w\ufffd/!F\ufffd\ufffd\ufffdM2rd\ufffdS\ufffd\ufffdp\ufffdo\ufffd\ufffd7\ufffd0\ufffd\u0686\ufffdZ\ufffd\ufffdE`\ufffd\ufffd\ufffd\ufffdPLY\ufffd\ufffd\ufffd\ufffd4\ufffd\ufffdk\ufffd\ufffd\ufffd\ufffd\ufffd'A\ufffd\ufffdj0\ufffd)\ufffd\ufffd\ufffd+\ufffd\ufffdQNVN\ufffdrG\ufffd\u7bd8\ufffdzZ\u0530ocd\ufffd\ufffda<6\ufffd]\ufffd\ufffdai\ufffd9\ufffd\ufffd\ufffd\ufffdF\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd
+x\ufffd\ufffdz	tU\ufffd\ufffd{U%Y\ufffdm\ufffd\ufffdm\ufffd\ufffdjY\u07b4\u0632\ufffdE\ufffd\ufffd/\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdx\ufffd\u01c4t!B\ufffd\ufffd@!1\ufffd4\ufffd\u04d0I\ufffd: \ufffdO\ufffdI\ufffd@34\ufffd2\ufffd\ufffd\ufffd0\ufffd\u012e\u032d\ufffd\u02ce\ufffd\ufffdO\ufffd\ufffd^\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdB!\ufffdGV\ufffdA=\ufffd\u0789\ufffd\ufffd\ufffd\ufffd3'�\ufffd\ufffd\ufffd\ufffd\ufffd\u07b5\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdx\ufffd\ufffd\ufb4e\ufffd\ufffd\ufffd\ufffd=GG\ufffd\ufffd6_\ufffd\ufffdJ\ufffd\ufffd{\ufffd\ufffd\ufffdQ\ufffdpA(\ufffd\ufffd\u01cfz\ufffdN\ufffd~<\ufffdik\ufffd7X\ufffdx\ufffd\ufffd\ufffd`\ufffd \ufffd\ufffd&\u01a7\ufffd\ufffd]\ufffd\ufffdWa|q\ufffd;\ufffd\ufffda\ufffdn\ufffd\ufffd\ufffd"B\ufffd\ufffdFD\ufe48P:\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdW.\ufffd\ufffdFs")7\ufffd\ufffd\ufffdDF	Eb\ufffdT&go\ufffd\ufffdQ(c\ufffdTj\ufffd\ufffd\ufffd\ufffdcbRrJ\ufffd\ufffdl\ufffd\ufffd\ufffd\ufffd\ufffd2\ufffd\u032c\ufffdg\ufffd\u02dd\ufffd_PXT\RZV\ufffd\ufffd\ufffd>\ufffd=\ufffdU\ufffd\u07eb\ufffd~\ufffd\ufffd!\ufffdy\ufffd\ufffd=\ufffd,"Q\ufffd\ufffdF\ufffd\ufffd\ufffd\ufffd\ufffd\u071dt!\ufffd\u3725\ufffd\ufffdcZ\ufffdq\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdu\ufffd5\ufffd\ufffd\ufffd+ARHT\ufffd\j&{\ufffd\u020d3\ufffdW\ufffd\ufffd\ufffdsGN\u038e7\ufffdm\ufffd{\ufffd]\ufffd|&\ufffd3\ufffd\u0607X\ufffd\ufffdsX\ufffd\ufffd\u01f2:\ufffd}\ufffd
+C\ufffdh\ufffd\ufffdie\ufffd	\ufffd]E\ufffd\ufffdB\ufffdC\ufffdn\u03c9nZw8\ufffdw\ufffd\ufffdXZ\ufffd<\ufffd\u07d1\ufffd\u061f\u93df{\ufffd\ufffd\ufffd\ufffdcY\ufffd\ufffdg.\ufffd\ufffdI.yh	s&\ufffd\ufffd\ufffdy1\ufffd\ufffdb\ufffd\ufffd\ufffdX\ufffd\ufffd\ufffdg\ufffd\ufffd\ufffd\ufffd^\ufffdm\ufffd\ufffdk\ufffd\ufffd\ufffd\ufffd7\ufffdqu\ufffd\ufffd7p	\ufffd\ufffd+\ufffd\ufffd\ufffd\ufffdg\ufffdE\\ufffd\u06b1~v\ufffd\ufffd\ufffd\ufffd\ufffdJ@a0\ufffdZ\ufffdVhj\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd9\ufffd\ufffd\ufffd\ufffd\ufffdm\ufffd\u0773p\ufffd\ufffd\ufffd\ufffd\ufffdc\ufffd1H\ufffd\ufffd3\u0314=\ufffdaKWx|\u074e\ufffd\ufffdN\ufffd.A'\ufffd\ufffd\ufffdd\ufffd\ufffdx
+\ufffd
6(=\ufffd\ufffd\\ufffdR*\ufffdMR;\ufffdrS\ufffd\u06c6?&\u02899V\ufffdv\ufffd\ufffdFH\ufffd\u01c7#\ufffd\u068e\ufffd\ufffd\ufffdG\ufffdPf\ufffd\ufffd`\ufffdK\ufffd\ufffd^g&vH\ufffd\ufffd�\ufffdJ\ufffd\ufffd\u04a2\ufffdlO\ufffdk\ufffd=\ufffd\ufffd`\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd9m9\ufffd\ufffd\ufffd,~w\ufffd!\u1b0dt\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdvA@\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffda\ufffd\ufffd\ufffdzf\ufffd\ufffd\ufffd3YY3\ufffdvl}v\ufffdsI\ufffd7PQ\u065f\ufffdT\ufffd\ufffdUT\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdE,\ufffd),y}\u04e6\ufffd\u9bde>\ufffd\u0353\ufffd\ufffdO~s\ufffd\u0415\ufffd\ufffd\ufffd\ufffd+\ufffd\ufffdA!/q^F`i6;\ufffdG( \ufffd\ufffd\ufffd\ufffd<ls'\ufffd^\u062bw\ufffd\ufffd\ufffd\ufffd|\ufffd\u0294\ufffd\ufffd+k\ufffd=\ufffdKav\ufffd{=|u\ufffd\ufffd\u02b0\ufffdd\ufffd]i<\ufffd\ufffdn\ufffdt=\u015a\ufffd\ufffd{\u0683@\ufffdX\ufffd\ufffdY\ufffdk\ufffd>P%\ufffdv\ufffd&\ufffd\ufffd\ufffd~\ufffd\ufffd\ufffd\ufffd-;\ufffd\ufffd`\ufffd3\ufffd&HCx\ufffd\ufffd\ufffd\ufffdS?^\ufffd\ufffd\ufffd\ufffdw\ufffd6\ufffd\ufffd\ufffdV\ufffd\ufffd\ufffd`\ufffd\ufffd\ufffdH65S\ufffd\ufffd\ufffd\ufffd\ufffd;\u0259*}\ufffd \u07b7\ufffd\ufffd\ufffd\ufffd\u038d%\ufffd\ufffd\ufffd1W\ufffd\ufffdft\ufffdU$\ufffd\ufffd\ufffd\ufffd\ufffdu\u021a<\ufffd\ufffd\ufffdDS\ufffd=X\ufffd\ufffdX\ufffd\ufffd8p\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdt[\ufffd=\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdh{\ufffd\ufffd\ufffd\u014f\ufffdp\ufffd\ufffdNk\ufffdZ\ufffd\ufffdi\ufffdv\ufffdS\ufffd\ufffd\ufffd\ufffd9\ufffd~\ufffd\ufffdT\ufffd\ufffdz\ufffdt5wtU$
\ufffd\ufffdg\ufffd\ufffdv\ufffda\ufffd6\ufffd\u0594l\ufffd)R\ufffdxG\ufffd@q\ufffd\ufffd\ufffd
 \ufffdd\ufffd\ufffd\ufffd`r\ufffd8\ufffd
\ufffd\ufffd\ufffd\ufffd: ND\ufffd\ufffd"\ufffd\ufffdG\ufffd.�A\ufffd6\ufffdM\ufffda\ufffd\u021b\ufffdT\ufffd\ufffd:\ufffd\ufffd\ufffd9\ufffd\ufffd\ufffd\ufffd\ufffd\u04b4\ufffd 9T\ufffdBk0h\ufffd\ufffd\ufffdS\ufffd\ufffd\ufffd\ufffdXe\ufffdh$/-\ufffdL\ufffd+\ufffd\ufffd\ufffdq\ufffd\ufffd\ufffd\ufffd\ufc8b\ufffdhV~\ufffdo|
\ufffd<\ufffd\ufffd\ufffd\ufffdc\ufffdbk\ufffdz\ufffd\ufffd\ufffdkI\ufffdhozG@f_\ufffd
\ufffdOM\ufffd\ufffd,\ufffdW;S\ufffdi\ufffd\ufffdI\ufffd\ufffdG\ufffdE'i\ufffd)\ufffdz\ufffd\ufffd\ufffd\ufffd;\u028av\ufffd\ufffd\ufffd|\ufffd%>\ufffdP\ufffd\ufffd\u042b\ufffd\ufffd\ufffd\ufffdZk\ufffdED\ufffd\ufffde\ufffd-\ufffdL-\ufffd\ufffd\ufffd0\ufffdc\ufffd\ufffd\ufffd\ufffd\u0279"c\ufffd:]v~jU\ufffd\ufffd\ufffd\ufffdv\ufffdm\ufffd6\ufffdTA\ufffd\ufffd $\ufffdC\ufffd)\ufffdW\ufffdI\ufffd
+nq\ufffd3\ufffd\ufffd\ufffd\ufffd\u0178\u029b\ufffd;
\ufffd87\ufffd?\ufffd\ufffd<.\ufffde\ufffd\ufffd6\u03ce\u01a4\ufffdjqj\ufffdlbE\ufffdCJK{]cS\ufffd9\ufffd\ufffd%\ufffd\ufffd\ufffd'\ufffd9\ufffd=rfgy\ufffd9\ufffd\ufffdW\ufffd\ufffd\ufffd\ufffde\ufffd\ufffd\ufffd$9\ufffd\u04dbK'\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdcd8\ufffd\ufffd\ufffd\ufffdi\ufffdV\ufffd\ufffdb\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd'\ufffdy\ufffd\ufffd\ufffd~<\u9f36\ufffd\ufffdQu\ufffd\u0694\ufffd6#\ufffdfr\ufffd\ufffdQ\ufffd\ufffd\i\ufffdd@\ufffd\ufffdf\ufffd\ufffd:p\ufffd\ufffd\ufffd\ufffd\ufffd&;-\ufffd\ufffdE9\u0765\ufffd\ufffdM\ufffd\ufffd\ufffd\ufffd\ufffd#\ufffd\ufffd\ufffd]\ufffd\ufffd-\ufffd\ufffdg'\ufffdN\ufffd8\ufffdE\ufffd\ufffd\ufffd	\ufffd\ufffd=\ufffdI}\ufffd \ufffd\ufffdd\ufffdd\ufffd\ufffdaP\ufffdS\ufffd*\ufffd\ufffd\ufffd\u0365mu\ufffdh~\ufffd]\ufffdn{\ufffd\ufffd\ufffd\ufffd\ufffdu|}\ufffdD\ufffd\ufffd\ufffdM\ufffd\ufffdC\ufffd\ufffdI*\ufffduf\ufffd6\ufffdO\ufffdX\ufffd\ufffd\ufffdL\ufffd\ufffd\ufffd\ufffdCA\ufffd=\ufffd\ufffd<O\ufffdZ\ufffd\ufffd\u02d1\ufffd7\ufffd Y\ufffd\ufffd\ufffd\ufffd\ufffd\ufffds\ufffd	\ufffd(\ufffd\ufffd2U\ufffd\ufffdMf\ufffd\ufffd\ufffdt\vmx\ufffd	\ufffd\ufffdY\ufffd\ufffdh}h\u0619\ufffd\ufffd\ufffd\ufffd\ufffd_\ufffd)\ufffd[\ufffd\ufffd4O\ufffd&\ufffdI\u03aa\ufffd\ufffd\ufffd-"\ufffd\ufffd\ufffd\u0762\ufffdmm\ufffdV\ufffd\ufffdL7\ufffd3\ufffd\ufffd?\ufffd\ufffd\ufffd\ufffd\ufffdxf\ufffd\ufffd]\ufffd\ufffd|MBO\ufffd4)\ufffdz\ufffd4\ufffdj\ufffd=\ufffd\u0751\ufffd\ufffd?5n\ufffd\u04b3x \ufffd\ufffd}\ufffdzu6\ufffd/\ufffd\ufffd?\ufffd-\u0229\ufffd	\ufffd@\ufffdu\ufffd<\ufffd!\ufffd=<\ufffd(e\ufffdL\ufffd\ufffd-~\ufffd\ufffdG_]\ufffdz\ufffd
 \H\ufffd\ufffd\ufffd-\ufffd8\ufffds\ufffd\ufffdH\ufffd\ufffd\ufffdf\ufffd\ufffd\ufffd6\ufffd"\ufffdCp&&\ufffd\ufffd( CH->Z\ufffd/*\ufffd\ufffd\ufffdFU\ufffdN-\ufffd\ufffd\ufffd\u07c7\ufffd\ufffdRU\u02a5\ufffd-s\ufffd\ufffd\ufffdy\ufffd]"\ufffd\u014a\ufffd\ufffd\ufffd\ufffd\ufffdx7\ufffd"\u0330z<\ufffd\ufffd4\ufffd\ufffd\ufffd\ufffd\ufffdJ\ufffd\ufffdx\ufffdg\ufffd\ufffd\ufffd\ufffd*%\ufffd\ufffd\ufffd\ufffd'j\ufffd\ufffd^LZdFN~\ufffd2^@%\ufffdC\ufffd\ufffd\u07b5
+\ufffdn\ufffd\ufffd)\ufffd\ufffdi,\ufffd\ufffd(\ufffdn0\u04cb\ufffd\ufffdKGz\ufffdY\ufffd4\ufffdt
+�\ufffd\ufffdZ\ufffd|\ufffdyk\ufffdN\ufffdnk\ufffd[\ufffd\ufffdm-W\ufffdf\ufffd\ufffdR\ufffd%\ufffd5v/<g�\ufffd\ufffd\u0618I~m\ufffdT\ufffdz~w\u076b)\ufffd\ufffd\ufffd\ufffd\ufffd&\ufffd_S\ufffd\ufffd\ufffd\ufffd\u03ed\ufffd\ufffdo\ufffd\ufffd\ufffd<PS\ufffd[\ufffdRT\ufffdP\ufffd\ufffd\ufffd=:`SZb\ufffd\u06cb\ufffd\ufffd\ufffd7[\ufffd\9\ufffdR\ufffd\ufffd\ufffd#\ufffd\ufffd\ufffd\ufffdj\ufffd\ufffd\ufffd\ufffd\ufffd\u0758\ufffd\ufffd$\ufffd\ufffdJK\ufffd\ufffdo\ufffd\ufffd\ufffdx[\ufffd5O\ufffd\ufffd6\ufffd\ufffd@ \ufffd\ufffd\ufffd\cm	\ufffd\ufffda\ufffd\ufffd\ufffdv\ufffd\ufffd\ufffd\ufffd\ufffdD\ufffd\ufffd\ufffd\u0185k\ufffd\ufffd\ufffd?H:SGx\ufffdm\u027e\ufffd\ufffd6\ufffd\ufffd\ufffdv\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdy X\ufffd\ufffd\ufffdo?l8\ufffd\ufffd!\ufffd\ufffd\ufffd3-\ufffd\ufffd\ufffd^cX.V0\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd#\ufffd/\ufffd\u012c\ufffd\ufffd\ufffd\ufffd*t.\ufffd\ufffd\ufffd7\ufffd\ufffd\ufffdO\ufffdS
+\ufffd\ufffd	|\ufffd\ufffd3\ufffdZ\ufffd�\ufffd\ufffdLy\ufffdMc\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdz|\ufffd\ufffd/\ufffdZ\ufffd\ufffd08c\ufffdb
\\ufffd&\ufffd1\ufffd\ufffdv\ufffdL\ufffd\ufffd\ufffdF\ufffd\ufffd\ufffd\ufffd\u06a5\u04fdt\ufffd/[\ufffd,\ufffdg,\ufffd\ufffd\ufffd\ufffd5\ufffd~\ufffdu6\ufffdY\ufffd\ufffd(\ufffdo[S\ufffd\ufffd{);)`\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdo6g\ufffdl%\ufffd\ufffd?\ufffd<7\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd2d\ufffdK\ufffd\u057b\ufffd\ufffd\ufffdDcx\ufffd0e\u01b1\ufffd\ufffdi\ufffd\ufffd\ufffd\ufffd2\ufffd\ufffdA&P\ufffd\ufffd\ufffd#r\ufffd\u04ee\ufffd\ufffd%\ufffd*\u066a\ufffd\ufffdWc\ufffd2\ufffdF\ufffd\ufffdmR\ufffd\ufffd&\ufffd^I4._a\ufffd\ufffd\ufffd\ufffd,W~\ufffda\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdE\ufffd)36\u0503\ufffd\ufffd\ufffd'sP\ufffd\ufffd\ufffd\ufffdk+~,8\ufffdO\ufffdH\ufffd\ufffd\ufffdT\ufffd}\ufffdZ\ufffd\u048e\ufffd\ufffd\ufffd&i\ufffd\ufffd\ufffd�RC\ufffd\ufffd\ufffd\ufffdx\ufffd[O\ufffd\ufffd5B}\ufffd\ufffd\ufffd\ufffd\ufffd{\u038d\ufffd\ufffdm^\ufffdc\ufffd\ufffd\ufffd
+5~\ufffd\\ufffd,\ufffd$�\ufffdCU\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u0600\ufffd#\ufffd\ufffdL!\ufffd\u3d75\ufffdW
+\ufffd#
+\ufffd\ufffdt\ufffd8m\ufffd3u\\u06b8l\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdyB\ufffd\ufffdd\ufffd\ufffd\ufffd'\ufffd\ufffd\ufffd\ufffdv\ufffd\\ufffd\ufffd"[6\ufffd|\ufffdR\ufffdzgmXx\ufffdT\ufffd\ufffdK\ufffdgR\ufffd\ufffd\ufffd-\u0107\ufffd%A\ufffd\ufffd\u0511\ufffd\ufffd[l\ufffd\ufffd\ufffd\ufffd E\ufffd \ufffdM\ufffd?\ufffdq\ufffd\ufffd\ufffd\ufffd+\ufffd\\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdXm\ufffd\ufffd2\ufffdx\ufffdS\ufffdc\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd>\ufffd\ufffd\ufffdJ\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdy\ufffdg\ufffd\ufffd\ufffd\ufffdnX\ufffdYo\ufffdTH	\u0205\NN5A\u0394\ufffd\ufffd\ufffd\ufffd]\ufffdw\ufffd\ufffd\ufffd\ufffd\u0338\ufffd\ufffd\ufffd
w5\ufffdd\ufffd/x\ufffd\ufffd\ufffd\ufffd'vV\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd{\ufffdL\ufffd\ufffd\ufffd1E'\ufffdr\u0420\ufffdd\ufffd6S.\ufffd	?"\ufffd�/mM\ufffdtk[\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd=%?%\ufffd\ufffd\ufffd\ufffdl\ufffd
\ufffdo\ufffd\ufffdJ\ufffd\ufffd]\ufffd[^\ufffd!\ufffd\ufffd\ufffd\ufffd|9\ufffd
+d\ufffdfr\ufffd
+pa\ufffd\ufffd\ufffd\ufffd\u061a\ufffd\ufffd\ufffd\ufffd3\ufffd\ufffdq]s\ufffd\ufffd\ufffd\ufffd)\ufffdP  \u0774e\ufffd\ufffd\ufffdq\ufffd{\ufffd\ufffd}\ufffd\ufffd\ufffd=\ufffd\ufffd\ufffd\ufffd6\ufffd\ufffd
+-\u061c/\\ufffd\ufffdk\ufffdYk\ufffd\ufffd\ufffdO\ufffd\u04c2-wC\ufffd\ufffd\ufffd\ufffd<&\ufffd\ufffd\ufffd\ufffd1\ufffd \ufffdz\ufffd\ufffd6\ufffd\ufffdz\u0228.#\ufffd\ufffd\ufffd\ufffd\ufffd<\ufffd\ufffd\ufffdm\ufffdx_\ufffd\ufffdh\ubf37\ufffdn[s\ufffd\ufffd\ufffdR\ufffd\u0710\ufffd\ufffdTnkm\ufffd\u07ddQv\ufffd\ufffd\ufffd\ufffd\ufffd|wU\ufffdmm\ufffd\ufffd\u06f3<\ufffd\ufffd\ufffd\u047b[\ufffd\u0658\ufffd\ufffd\ufffd`*,\ufffdnXg\u05ba<v\u05c6\u02a2xC}\ufffd\ufffd\ufffdL\ufffd\ufffd]\ufffd\ufffd>\ufffd3\ufffd
+!2\ufffd\u0636\ufffdMz)\ufffdx\ufffdq6\ufffd\ufffd.#\ufffd\ufffdM.\ufffd\ufffd
+\ufffd\ufffd\ufffd\ufffd\ufffdz\ufffd\ufffd\ufffd\ufffd/\ufffd}\ufffd\ufffd\ufffdf\\ufffd\ufffd\u03f2\ufffd\ufffd\ufffd\ufffd\u01ce/\ufffd_.\ufffdF\ufffd\ufffd\ufffd\ufffdg\ufffd\ufffd\ufffd.
\ufffd\ufffd\ufffd\ufffd\ud56d;\ufffd\ufffd|s;W\ufffd\ufffdE\ufffdm\ufffd\ufffd\ufffdI\ufffdo/~\u073a\ufffd&\ufffd\ufffd4SJZ\ufffdf/\ufffd\u07dc\ufffdbbj\ufffd~\ufffd\ufffd\ufffd\ufffdf\ufffd,_hdr\ufffd
+\ufffd\ufffd8S\ufffd\ufffd\ufffd	7\ufffd`\ufffd\ufffd.
S0\ufffd)a\ufffd\ufffd]\ufffd\ufffd\ufffd\u0569�T\ufffd\ufffd\ufffdE\ufffd\ufffd7\ufffd*E\ufffd\ufffd-\ufffdUMr4\ufffd\ufffdb\ufffd\ufffdti\ufffd\ufffd\u928a\ufffd.b_\ufffdYh\ufffdx<\ufffdzw\ufffd\ufffd<\ufffd!\ufffd\ufffd\ufffd\ufffdP(0%W2\u0547B\ufffd^u\ufffd8\ufffd \ufffd{\ufffd\ufffdq9\ufffd\ufffdF\ufffd)^I/\ufffd\ufffd\ufffd\ufffd\ufffdx\ufffd\ufffd\u02cf\u0459o\ufffd\ufffds_T\ufffd\ufffd\ufffdI\u02ab\ufffd\ufffd{\ufffd_(\ufffd8\ufffdCl
W\ufffd\ufffd,.\ufffd\ufffdv=\ufffd\ufffd\ufffd\ufffd{%\ufffd\ufffd\ufffd\ufffd\ufffd}\ufffd\ufffd\ufffd\ufffd\ufffd(\ufffd[&`\ufffd\ufffd\ufffd.#eVp\ufffd\ufffd{\ufffdrE\ufffd\ufffdxY\ufffd\ufffd\ufffd+1\u0531\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd*\u035cG\ufffd\ufffdgM\ufffdF\ufffd\u04bba\ufffd8\ufffd\ufffdOBEQ\ufffd\ufffdb.a\u0234\ufffdc\ufffd\ufffd>e\ufffd`V)\\ufffdY\ufffd'\ufffdb\ufffds\ufffd\ufffdc9\ufffd<\ufffd\ufffd\ufffd\ufffdY\ufffdt\ufffd\ufffd\ufffdiOq\ufffdL\ufffd\ufffd�\ufffd\ufffdm\ufffd!J\ufffd\ufffdD\ufffd\ufffd\ufffdK\ufffd\ufffd\u02e1Q\ufffd\ufffd0\ufffd2^I_\ufffdF\ufffd\ufffd\ufffd\ufffd\ufffd6.\ufffd\u037d\\ufffd,\ufffd\ufffd\ufffd\ufffd=\ufffd\ufffdW\u06c6?\ufffdR\ufffdI\ufffd\ufffdB\ufffd6Q\ufffd lU\ufffdzIHL\ufffd\ufffd\ufffd\ufffd\ufffdP\ufffd6^\ufffdK"\ufffdw\ufffd\ufffd\ufffd2cb\ufffd\ufffd>ySge=\ufffd"~\ufffd\ufffdKEG\ufffd\ufffd\ufffd\ufffd+ysV\ufffd\ufffdU\ufffd\ufffdJ\ufffdc2z\ufffd\u02fc\ufffd8\ufffd\u01d7>	\ufffd}C\u0549L\ufffd\ufffd\ufffdo\ufffd'D@\ufffd\u066d\ufffd\ufffd\ufffd'&\ufffd\ufffd@\ufffd\ufffd\ufffdcD\ufffd\ufffd\ufffd}e	\ufffd\ufffdg\ufffd\ufffd?8\ufffd%	\ufffdZs\ufffd\ufffd\uaf37\ufffd"P\ufffdA\ufffd\ufffdJ#\ufffd\u45b7
 \ufffd4Y\ufffd\ufffd\ufffdS\u12558\ufffdkcb\u0166\ufffd.\ufffd\ufffd\ufffd hs\ufffd9e\ufffd
+\ufffd\ufffd\u0438\ufffd{\ufffdS\ufffdt\ufffd\ufffd\ufffd8c\ufffd\\ufffd\ufffd!\u0739\ufffd
E\ufffdk\ufffd\ufffd\	2\ufffd_\ufffda\ufffd\ufffd>dU\ufffdJ\ufffd!\ufffd\ufffdo\ufffd5Abj6s\u04d1>gW\ufffdSO\ufffd\ufffdb*L&D\ufffdY><yNUWn\u07d1M\ufffd\ufffd\ufffdv8_\ufffd,\ufffd+\ufffd\u828duy	\ufffd\ufffd\ufffdHa-L<\ufffd\u06d6\ufffd\ufffd\ufffd\ufffd\u0537'[m\ufffd*{\\u047e?b\ufffd}d~|x~";{\ufffd\u0251\ufffd\ufffd#\ufffd\ufffd\ufffd1\ufffdsR \ufffd\ufffd\ufffdeL\ufffd\ufffdk\u0488\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd7G~G{\ufffd\ufffd(�\ufffd8\ufffdWOn\ufffdO)Im\ufffdS\ufffd\ufffd\ufffd\ufffd\ufffdxwVL\ufffdz{Y\ufffd\ufffdS`H9\ufffd\ufffd\ufffd?\ufffd\ufffd'\ufffd\ufffdK\ufffd|{	\ufffd\ufffd\ufffd\ufffd\ufffd+o9J/\ufffd\u0407BnK0\ufffd\ufffd+\ufffd8x\ufffdR"\ufffd\ufffd\ufffd\ufffd'e<\ufffd\ufffd'\ufffd\ufffd'\ufffd\Y8I{\ufffd\ufffdI\ufffd\ufffd \ufffd\ufffd\ufffd\ufffd.W\ufffdm\ufffd\ufffd9o\ufffdd\ufffdr  \ufffd\ufffd\u0504J\ufffd	\ufffd\u06b5v\ufffd\ufffd\ufffdsr&\ufffd~\ufffdO>\ufffd\ufffd\ufffd '#)\ufffd\ufffdh\u065d4\ufffd%b\ufffd\ufffda\ufffd\ufffd\ufffdf	\ufffd\ufffd\~7:\ufffd\ufffd0\ufffd\ufffdm_\ufffd\ufffdst\u0339\ufffd!\ufffd\ufffd'\ufffd\ufffd\ufffd+\ufffdE\ufffd\ufffd\u0536=\ufffd\ufffd=SwwW\ufffd\ufffd\ufffd\ufffd.\ufffd\ufffdj\ufffds\u03dd\ufffd\ufffdx|0-:\ufffd\ufffdMP\ufffd\ufffdr\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdMBi \ufffd\ufffdtf\ufffd\ufffd4X|\u035e\ufffd8\ufffd\ufffd\ufffdmT^x!\ufffd\ufffd\ufffd\ufffd\u06b1"U\ufffd\ufffde\ufffdPgS\ufffd\ufffdXK\ufffd$@\ufffd\ufffd\ufffdD\ufffd\ufffd\ufffd{\ufffd\u04a4	\ufffd\u0614\ufffdH\ufffd\ufffd\ufffd+\ufffd.\ufffd\ufffd.!\ufffd/\ufffd\ufffd-\ufffd\ufffd\ufffd^\u050cF\ufffd6\ufffd\ufffd\ufffdl
 \ufffd!7\ufffdx\ufffd\u0204GF\ufffd77fXe7\ufffdA\ufffdwr\ufffd\ufffd@
+\ufffdb\ufffd\ufffdC\ufffd\ufffd=B\ufffd\u02cdTH\ufffd\ufffd\ufffd\u073eo\ufffdy\ufffdxe\ufffdXgQ\ufffd\ufffd\ufffdu\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdw\ufffd\ufffd:l\ufffdD\ufffd$\ufffd4\ufffd\ufffdc\ufffdz\ufffdk(w\ufffdEF&\ufffd;uj\ufffd*r\ufffdXtn\ufffd\ufffd\ufffd\ufffd:\ufffd\ufffd\ufffd\ufffd/)uy	[\ufffd{\ufffdKR\u014d\ufffd=M\ufffdZf\ufffd\ufffdGK#\ufffd#RfZ\ufffdvv\ufffd1&1?Z\ufffd \ufffdQ	9\ufffd\u0345-\ufffd\ufffd8\ufffd\ufffd\ufffdm\ufffdO
U%;\ufffd\ufffd\ufffddQ^]\ufffd\ufffd\ufffd\ufffd\ufffd0qtD\ufffdQ+\ufffd\ufffdG\ufffdj\ufffd4\ufffd\ufffdv\ufffd\u0165D&W\ufffd]\ufffd\ufffd\ufffd\ufffd\u07a2{\ufffd\ufffd\ufffd\ufffd5\u0413S\ufffd\ufffd\ufffd\ufffdse\ufffdp\ufffd\ufffdo�\ufffd\ufffd[\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u053c\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdH\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdR17\ufffd\ufffd\ufffd
+\ufffdX\ufffdB\ufffd\ufffd\ufffd{h\ufffd\ufffd\ufffd+\ufffdkE\ufffd\ufffdK\ufffd\%]\ufffdT\ufffd\ufffd\ufffd\ufffd\ufffdfc4\ufffd\ufffdd\ufffdD\ufffd/\ufffd\u012b\ufffd\ufffd*e'\ufffd\ufffd\ufffd\ufffd\ufffdD\ufffd\ufffd\ufffdd\ufffdX\ufffdN\ufffd\ufffdI\u0588\u0614@\ufffd,|\ufffd\ufffdc\ufffd\ufffd\ufffd\ufffdoU\ufffd\ufffd\ufffd\ufffd\ufffdp\ufffd\ufffdPA\ufffd@\ufffd\ufffd\ufffd\ufffd\u09c0\ufffd\ufffd\ufffdd\ufffd\ufffd]!\ufffd\ufffd\ufffd\ufffd\ufffd\u0711\ufffdZ\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdk\ufffd:%::\ufffd\ufffd\u035eET\ufffd\ufffd\ufffdE\ufffd2\ufffd+\ufffd\ufffd\u0140\ufffdn\ufffd\ufffd\ufffd\ufffdi\ufffd\ufffd_e9"]\ufffd,\ufffd\ufffd\ufffd}\ufffd\ufffd\ufffd\ufffd\ufffd	\ufffd@\ufffd\ufffdB\ufffdP	7\ufffdu\ufffd\ufffd4\ufffd\ufffdY@\ufffdj
#m\ufffd\ufffd\ufffdf�\ufffd\ufffd%\ufffd\ufffd\ufffdOX\ufffd\ufffdb\0\ufffd0R\ufffd\u25f1\ufffd\ufffdV;\ufffd6d%k#\ufffdOo\ufffd\u03de\ufffd%\ufffdX]\ufffd\ufffd\ufffd\ufffd\ufffd
+\ufffd>\ufffdR,\ufffdL\ufffd\ufffde\ufffd"Z\ufffd\ufffdW{ \ufffd5\ufffda\ufffdr\ufffd
+\ufffd\u05f6\ufffd5\ufffdk\ufffd=\ufffd>'Y\u039a'.P\ufffd\ufffd\ufffd\ufffdM\ufffd\ufffdj\ufffdX\ufffd.\ufffdk\ufffd\ufffd\ufffd\ufffd1\ufffdmWn\ufffdw\ufffd7;\ufffdA�\ufffd\ufffd\ufffd S&v\ufffd\ufffd[\ufffd^\ufffdY\ufffd\ufffd\u019co\ufffd\ufffd\ufffd17\ufffd4\ufffd\ufffd\ufffdZx\ufffd\ufffd\ufffduR\ufffd\ufffd:\ufffd~b\ufffd?\ufffda@\ufffd\\\ufffd\ufffdk\ufffd\u05b7\ufffd\ufffd\ufffdh\ufffd\ufffdt\ufffd(\ufffd\ufffdsb~\ufffd-`W`\ufffd\ufffdG`\ufffdd\ufffd\ufffd{\ufffd\ufffdK5\ufffd<5\ufffd\ufffd\ufffd\ufffd\ufffd
+\ufffdv\ufffd\ufffd\ufffd\ufffdW
WWo*\ufffdS\ufffdga\ufffd?\ufffd\ufffd\ufffd\ufffdw\ufffd]\ufffd\ufffd\ufffd\ufffd\ufffdfrsgNMN\ufffd\ufffd\ufffd\u0259:\ufffd\ufffdSB\\ufffd~b\ufffd	\ufffd\ufffd\ufffdd\ufffd\ufffd\ufffdAG\ufffd\ufffdt\ufffd\ufffd\u01083\ufffd\ufffd\ufffd\ufffdfY\ufffd{\ufffd\ufffdjWP\ufffd~\ufffdruC~\ufffd\ufffdN\ufffd\ufffdI\ufffdn'\ufffd\ufffd\ufffd^7e\u0185\ufffd6\ufffd\ufffdM\ufffdP\ufffd\ufffd9\ufffd\ufffd`-`-\ufffd\ufffdx@\ufffd\u01d1yK\ufffd\ufffd\ufffdb[hu\ufffdqa\ufffd\ufffdb\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd0\ufffdr!\ufffd\ufffd\ufffdK+\ufffdZ\ufffd\ufffd;\u0354`\u9acb\ufffdc\ufffd\ufffd\ufffdgU\ufffd\ufffd\ufffdf1$\ufffdX\ufffd\ufffd\u055b\ufffd>A\ufffd|2\ufffd\ufffd\ufffd',\ufffd\ufffd\ufffdl\ufffdN#_\ufffd\ufffdj+\ufffd\ufffd\ufffd\ufffd3\ufffd\ufffd	\ufffd&\ufffd\ufffd\ufffd\\ufffd6\u01f7\ufffdu.}M\ufffd\ufffda\ufffd6U\ufffd\ufffdux\ufffd\ufffd\ufffd\ufffd7}\ufffd\ufffdB\ufffd\ufffd\ufffdjo\u0587A\ufffd\ufffd\ufffd\ufffdOX\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdbUM"YF\ufffd;\ufffd1[%\ufffd\ufffdX?S\ufffd\ufffd\ufffd_\U000fa26a\ufffd\uaca6\ufffd(\ufffd\ufffdP\ufffd\ufffd+\ufffds6=$Qf\ufffd9\ufffd25\ufffd\u03b2$eZIRB\ufffd5]\ufffd/\ufffd\ufffd\ufffd\ufffd\ufffdKP\ufffdJ\ufffd\ufffd&\ufffdSs\ufffd\ufffdVS\ufffd\ufffd\ufffd\ufffd;\ufffdvk]"\ufffd5\ufffd\ufffd\ufffdx\ufffdS\ufffd\ufffd\ufffdj\ufffd\ufffd\ufffd
\ufffd\ufffd\ufffd\ufffd\ufffdI\ufffd\ufffdHF\ufffd
nMDr\ufffd#\ufffdf\ufffd\\ufffd\u042a\u04e7Du\ufffdp\ufffdjS\ufffd\ufffd\ufffd
\ufffdh+\ufffd\ufffd'\ufffdU\ufffd\ufffd\ufffd\ufffd\ufffd3K5C\ufffd@\ufffd~\ufffdU\ufffd\ufffda\ufffd\ufffd\ufffd\ufffd\ufffdBcT&\ufffd\ufffd\ufffdz\ufffd\ufffd\ufffduwxL>\ufffdK\ufffd\ufffd\ufffd\ufffd<
 [9\ufffd#6\ufffd/\ufffd'E\ufffd\ufffd
\ufffdX-\ufffd\ufffdam\ufffdV\ufffd\ufffd\u039b\ufffd\ufffd<\ufffd_G\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdd,\ufffd\ufffd\ufffd\ufffd\ufffd<)\ufffd.o_Dl\ufffd\ufffd
+\ufffd\ufffd\ufffd\u0502\ufffd\u0422\ufffdH|.\ufffd}RE\ufffd\ufffd}.\ufffd\ufffd \ufffdz<V\ufffdP/\ufffd\ufffd\ufffd77V*d\u0575|?\ufffd\ufffd\ufffd\ufffdT-\ufffd$\ufffd0O\ufffd|x\ufffd\ufffd\ufffd\ufffdc\ufffdXc\ufffdAO\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u07ff\ufffd\ufffd\ufffdp\ufffd\ufffd\ufffd\ufffd~^XQ\ufffd\ufffdU\ufffdR\ufffd\ufffd\ufffd\ufffd0\ufffd@\ufffd\ufffd\ufffdU_S\ufffd\ufffda\ufffd.\ufffdL\ufffd\ufffdP\ufffd\ufffd\ufffdL/=nhj\ufffdP\ufffd\ufffd\ufffd
+'3\\ufffd-\ufffd$.\ufffdY<\ufffd\ufffd\ufffd\ufffd@\ufffdj\ufffd\ufffd'-\ufffdU
+E\ufffd\ufffdz1\ufffd\ufffdeP9\ufffd\ufffda&W\ufffd\ufffd\ufffd
\ufffd\ufffd\ufffd_\ufffd\ufffd`j\ufffd(\ufffd\ufffd\ufffd\ufffd-\ufffd\ufffd?`\ufffd\ufffd.A\ufffd\ufffd
\ufffd+RE\ufffd?T\ufffd\ufffd)\ufffd\ufffd_l\ufffdJOWa\ufffd\ufffdMM\ufffd\ufffd\ufffd\ufffd\ufffd?F\ufffdg\ufffd<\ufffd<o\ufffdC\ufffd\ufffd\ufffdH\ufffd?\ufffd\ufffd}m\ufffd\\ufffd\ufffd9\ufffdf\ufffdF\ufffdg\ufffd\ufffdp\ufffd-\ufffd\ufffd.{4\ufffdBY\ufffd4Is\ufffdh\ufffd}\ufffdqp7\ufffd\ufffdy+\ufffd/}p\ufffdO.\ufffd\ufffd@\ufffd\ufffd\ufffd\ufffd\f\ufffdGD\ufffdK|~i�{\ufffdE\ufffdG\ufffd\ufffd\u043b
+m
+\ufffd\ufffdk\ufffd\ufffdzP\ufffdV\ufffd(n\ufffdQ\ufffd7l\ufffdKU\ufffd\ufffdb\ufffd\ufffd\ufffdpir\ufffd\ufffd=r\ufffdC\ufffd\ufffd$)\ufffdK:\ufffdo\ufffd+W\ufffdvV\ufffdp\ufffd9\ufffd\ufffdS\ufffd{\ufffd\ufffd\ufffd\ufffd\ufffd6\ufffdW'\ufffd\ufffd\ufffdx\ufffdZ\ufffd\ufffd\ufffd_$\ufffd\ufffdW3\ufffd\ufffd0\ufffd#!\ufffdK'gb\ufffd.\ufffd\ufffd>SO\ufffd&\ufffd\ufffdxX\u07f8\ufffd�\ufffd^|\ufffd\ufffdI\u033bK\ufffd+\ufffd\u07a4\ufffd\u079c\ufffd\ufffd\ufffd\ufffd\ueb1c\ufffd\ufffd$\ufffd\ufffd\ufffd\ufffd\ufffdd\ufffd\ufffdqs\ufffdJU\ufffdz\ufffd\ufffd\ufffdq\ufffd\ufffdw\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd'\u0786\ufffd\u03ef~\ufffdLT\ufffd2\ufffd\ufffd\u778af\u032c\ufffdEN\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd.\ufffd\ufffd\ufffd\ufffd\ufffd\u060f\ufffdC0\ufffd\ufffd\ufffd\ufffd\ufffdSLa\ufffd\u01ff\ufffdo\ufffd\ufffd q\ufffd\ufffd\ufffd\ufffd\ufffd/\ufffdx\ufffd\ufffd:\u01618\ufffd\ufffd9\ufffdr\ufffdq\ufffd\ufffd\ufffdwBPHz\u021d!\ufffd\ufffd^)\ufffdA\ufffd_C\u0761\u04e1/\ufffd\ufffd\ufffd\ufffdf\ufffd&lk\ufffd;\ufffdQ\ufffd\ufffd'�\ufffdx \ufffd?:A\ufffd\ufffd\ufffd?"\ufffd#\ufffdE\ufffd)\ufffdu,\ufffdSa\ufffdpD\ufffd\ufffd\ufffdM\ufffdX&.w\ufffd\ufffd\ufffd\u07df\ufffd!k)F3\ufffd54C\`\ufffdB
+\ufffdFj\ufffd\ufffd"\ufffd
\ufffd;\ufffd\ufffd\ufffd,\ufffdc\ufffdpl\ufffdC\ufffdf8\ufffd\ufffd1G's\ufffd\ufffd@pts\ufffd!\ufffd9Q
\ufffd\ufffd\ufffd\\ufffd\ufffd"\ufffd\ufffd\ufffd9\ufffdmA5\u0137p|p\ufffdf>d'\ufffd\ufffd*\ufffd\u06b7h\ufffd\ufffd\ufffd;s\ufffd\ufffd\ufffd6\ufffdM}\ufffd\ufffd8/"5\ufffd0w!\ufffdEq\u040d\ufa5d\ufffdh\ufffdo\ufffdp\ufffd\ufffd\ufffd\ufffdU\ufffdI\ufffd G\ufffd\ufffd\ufffd\ufffdB\ufffd\ufffd\ufffd\ufffd:\ufffd\ufffd2\ufffd~\ufffd\ufffdIB\ufffd\ufffdQ\ufffd~%\ufffd\ufffd*&\ufffd\ufffd\ufffd2\ufffdo,\ufffd\ufffd\ufffd\ufffd\ufffd1\u0127v#%G\ufffd3\ufffd\ufffd\ufffd\ufffd3\ufffdbd\ufffd\ufffd	\ufffd\ufffd/\ufffd@\ufffd\ufffdHW\ufffd5\ufffd?\ufffd\ufffdX]\ufffd\u053035\ufffd\ufffdB/"\u03aa\ufffd\ufffd)\ufffd
+~\ufffd \ufffda\ufffd
,M\ufffd;\ufffd\ufffd\ufffd\ufffd\ufffdw"\ufffd8\u0161\ufffd\ufffd\ufffdn\ufffdh\ufffd
\ufffd\ufffd\ufffdl\ufffd\ufffd2\ufffd\ufffd\ufffd\ufffd
\ufffd~\ufffdE\ufffd\ufffdc\ufffd\ufffd\ufffd"\ufffd	\ufffd\ufffd\u040d~\u053f\ufffd;\ufffd5\ufffd\ufffd\ufffda(E \ufffd\ufffdQH\ufffdD\ufffd\ufffd;\ufffd2\ufffd\ufffdh\ufffd\ufffd\u01628\ufffd+6\ufffd\ufffd\ufffdD\ufffd\ufffd\ufffdR\ufffd\ufffd5A\ufffd\ufffdB\ufffdNG6\ufffd\ufffd\u02012\ufffd\ufffd\u03c6\ufffdN\ufffd\ufffd@\ufffdX\ufffd\ufffd%\ufffdB\ufffd\ufffdu=\ufffdEu\ufffd5\ufffdF\ufffd\ufffd\ufffd\ufffd\ufffdV\u0506\ufffdQ\u0680\ufffd\ufffd\ufffd1F\ufffdBf\u0186\ufffd\ufffd+\ufffd4w\u07d4\ufffd\ufffdE\ufffd)\ufffd\ufffd\ua111o\ufffd\ufffd5\ufffd\ufffd\ufffd\ufffd?\ufffd'Pz\ufffd?O\ufffd
+\ufffd\ufffd\u03d3\ufffd\ufffdW\ufffd\ufffd$\ufffd\ufffd\ufffd?O!>\ufffd\ufffd\ufffd)$\ufffdZ\ufffd<Eb\ufffd\ufffd\ufffdT\ufffd\ufffd?\ufffdEQ7\ufffd\ufffd \ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdy\ufffd\ufffd?\ufffd\ufffdy(\ufffd\ufffd>I\ufffd\ufffdP\ufffdH\ufffd\ufffd\ufffd\ufffd`\ufffd
\ufffdy>\ufffd$\ufffd\ufffd\u03c7!\ufffd\ufffd|\ufffd%\ufffdoI\ufffd\ufffd\ufffd|8\ufffd%[\ufffd\ufffd\ufffdL>\u87cf@\ufffd\ufffdyJ\ufffdT\ufffdy\ufffdyy\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd&\u075a\ufffd\ufffd)\ufffd\u04ec\ufffd1k
+FF4\ufffd\u0325)M}\ufffdT\ufffd\ufffdm}\ufffdfT\ufffd\ufffd!\ufffd\u0362I4\ufffd\ufffd \ufffdsK\ufffd\ufffd\ufffd\ufffd=h\ufffd\ufffdhC=\ufffd\ufffd
+`f\ufffd\ufffd75\u014e\ufffd\ufffd\ufffd\ufffdn\ufffd\ufffd\ufffd\ufffd\3>=\ufffdi\ufffd\ufffdS\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd!\ufffd_\ufffd703\ufffdd6\ufffdf\ufffd\ufffdMV\ufffd\ufffd\ufffdO\ufffdN\ufffdQ\ufffd\ufffd\ufffd\u0600\u01a4	\ufffdR
\ufffdXJ\ufffd\ufffd\u0687i~6\ufffd\ufffd\ufffd\ufffdX\ufffd\ufffd\ufffdF\ufffd\u96dc\u04e4\ufffd\ufffd\ufffd\ufffdA\ufffdc\ufffd\ufffd\b\ufffdi@fI|\ufffdA\ufffd\u0327%\ufffd\ufffd\ufffddIMi\ufffd\ufffd\ufffdIoo\u07e8wrX3\ufffd,\ufffd \ufffdC\ufffd\ufffd\ufffdpL/\ufffd\ufffd]\ufffd$\ufffd\ufffdq\ufffd\ufffd\ufffd-ra	\ufffd\ufffd<V\ufffd\ufffd\ufffdojh`L3\ufffd\ufffd]\ufffd\ufffd\u016c\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdh\ufffdw\u06ab\ufffd\ufffd\ufffd\ufffdS\ufffd\ufffd\ufffdt\ufffdjn\ufffd\ufffd
"[?\ufffdf\ufffd8dY(\ufffd>\ufffdX\u0142\ufffd\u04e0n`\ufffdYL\ufffdZ`\ufffd\ufffd'r,\ufffd\ufffd\ufffd\ufffd>\ufffd+bs\ufffd\ufffd\ufffde\ufffd@\ufffd-\ufffd)N\ufffd\ufffds \ufffdX`\ufffd\ufffd,3\ufffdX\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdp\ufffd\ufffduc\ufffdS\u07b2e\ufffdy\u053f,\ufffd\ufffd\ufffd\ufffdL\ufffd\ufffd\ufffd*\ufffd[\ufffd?3PY\ufffdz\ufffd\ufffd\ufffd\ufffdw\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd)\ufffd\ufffd\ufffdXo\u07e4fz\ufffdOS0\ufffd\ud053\ufffdJ\ufffd&`\ufffd\ufffdf+D\ufffd!\ufffd\ufffdt\ufffd\ufffdb\ufffd\ufffd\ufffd\ufffd$#\ufffdAV:\ufffd\ufffd\ufffd\ufffdF+\ufffd
+3\ufffdm8\ufffd\ufffd\ufffd5zY\ufffd\ufffd\ufffd\u02c8\u0154\ufffdj]QIMC\ufffd\ufffdA\ufffd\ufffdz\ufffdA\\ufffd@ydj\ufffds\ufffd\ufffd\ufffd*0\ufffd"\ufffd5\ufffdd%\ufffd,w\ufffd{\ufffd\ufffd\ufffd\ufffd\u04df6\ufffd\ufffd\ufffd\ufffd?D\ufffd
c\ufffd>xD8CF\ufffd?\U0003a46f\ufffda?\ufffd\ufffd\ufffd\ufffd\ufffd
 endstream
 endobj
-236 0 obj
+235 0 obj
 << /Type /FontDescriptor
-/FontName /AAAABA+NotoSerif
-/FontFile2 235 0 R
+/FontName /AAAAAX+NotoSerif
+/FontFile2 234 0 R
 /FontBBox [-212 -250 1246 1047]
 /Flags 6
 /StemV 0
@@ -29059,7 +28961,7 @@ endobj
 /XHeight 1098
 >>
 endobj
-237 0 obj
+236 0 obj
 << /Length 1286
 /Filter [/FlateDecode]
 >>
@@ -29069,47 +28971,50 @@ x
 \ufffd\ufffd\ufffdJ\ufffd\ufffd\ufffdJ\ufffd\ufffd\ud2b9\ufffd\ufffd\ufffdx\ufffd\ufffdx\ufffd\ufffdx\ufffd\ufffd+\ufffd!�w\ufffd\ufffdB\ufffdx\ufffdb\ufffdx\ufffd\ufffd+\u0781\ufffdr\ufffd;\ufffd\ufffd2\ufffd\ufffdk\ufffd\u039c\ufffdJ\ufffdY\ufffde\ufffdY\ufffd\ufffd7+|\ufffd\ufffdx\ufffdoS\ufffd\ufffd7+[\u019be\u021b\u05day\u07a2oV\ufffd\ufffd\u6d56-\u3b4c\ufffd\ufffd\ufffd"\ufffd\ufffd\ufffdR\ufffdW\ufffd*\ufffd\ufffd4Xq\ufffd\ufffdC\ufffd^J\ufffd[(\ufffd\ufffd^\ufffd1\ufffd�\ufffdy]\ufffd\ufffd\ufffdk\ufffd}\ufffdYM-x\ufffd\ufffd\ufffd\ufffdV\ufffdz\ufffd\ufffd\ufffd\ufffd\ufffd[YE\ufffdV\ufffdY\ufffd\ufffd\ufffd_}/7\ufffd*\ufffdY%\ufffd\ufffde\ufffd\u04ebq+\ufffd\ufffd:\ufffd\ufffd.\ufffd7\ufffdJ\ufffd\ufffd\ufffdE\ufffd/\ufffd3Y(Y\ufffd*A\ufffdW	R\ufffd\ufffdVJS\ufffd\ufffd\ufffd\ufffd\ufffd:(u@c\ufffd\ufffdD\ufffd]a*\ufffd\ufffdf)\ufffd9J\ufffd\ufffd\ufffd)\ufffdo,#\ufffd\\ufffdZ>M\ufffdU\ufffd\ufffd\\ufffdjPS\ufffd
{HS\ufffd\ufffdM\ufffd\ufffd\ufffdj\ufffd\ufffd\ufffd\ufffd{fk\ufffd\ufffd\ufffdyG\ufffdm[z*E\ufffdsa\ufffd\ufffd>\ufffd&\ufffd\u04eb\ufffd\ufffd\ufffdj%u\ufffd\ufffd\ufffd;\ufffd2^\ufffd\ufffd\ufffdW\ufffd[\ufffd\ufffd\ufffd�\ufffdv\ufffd[\ufffd\ufffd\ufffd2\ufffd\ucbf2u\ufffd[\ufffd\ufffd\ufffdP\ufffd:\ufffd\ufffd\ufffdV\u0321\ufffd\u0545>\ufffdM\ufffd\ufffdBi2.\u0126\ufffd\ufffd\ufffd\ufffd\u0507!\ufffd\ufffd\ufffdd\ufffdk\ufffd`\ufffd\ufffd\ufffd=o\ufffd\ufffdqW\u0795wdJF(\ufffdL164\ufffdU\ufffd\ufffd)\ufffdx0E\ufffd~\ufffd\ufffdZ?\ufffd=\ufffd\ufffd/\ufffd\ufffd\ufffd\ufffd\u03af\ufffd\ufffd\ufffd~:\ufffdo?$\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdO
 endstream
 endobj
-238 0 obj
+237 0 obj
 [259 1000 408 1000 1000 1000 1000 220 346 346 500 559 250 310 250 288 559 559 559 559 559 559 559 559 559 559 286 286 1000 1000 1000 1000 1000 705 653 613 727 623 589 713 792 367 356 1000 623 937 763 742 604 742 655 543 612 716 674 1046 660 625 1000 1000 1000 1000 1000 1000 1000 562 613 492 613 535 369 538 634 319 299 584 310 944 645 577 613 613 471 451 352 634 579 861 578 564 511 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 361 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 857 259 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 250 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 10
 00 1000 1000 1000 1000 1000 1000 1000 1000 1000]
 endobj
-239 0 obj
+238 0 obj
 << /Length1 9896
-/Length 6540
+/Length 6538
 /Filter [/FlateDecode]
 >>
 stream
-x\ufffd\ufffdzy|S\u05d5\ufffd\ufffd\ufffd=-\ufffdm\u0652\ufffd\u0612\ufffd}\ufffd,k\ufffd\ufffdy\ufffd\ufffdE\ufffd\ufffdn\ufffd1\ufffdX\u078d%\ufffdP\ufffd$@\ufffd\ufffd
B\ufffdLH\ufffd!d i'\ufffdm\ufffd\ufffdI2M\ufffdi3
\ufffdd\u0350L;2i\ufffd~f\ufffd\ufffd\ufffdI\ufffd~\ufffd\ufffd{\ufffd\ufffdO3\ufffd\ufffd<\ufffdw\u03fb\ufffd\ufffd=\ufffd=\ufffd=F	\ufffdq\ufffd\ufffd@,2\ufffd\u056f\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd@\ufffd\ufffd9\u06cdP\ufffd\ufffd0g\ufffdhl\ufffd\u06ef
-\ufffdRu\ufffd\ufffd\ufffd\ufffd\u0461\ufffd\ufffd\ufffd{!u.\ufffd
\ufffd\ufffd]S\ufffd\ufffd\ufffd\ufffd\u019a\ufffdG\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdq\ufffd}S\ufffd\ufffds\ufffd&\ufffdoa\ufffd\ufffd\ufffd\u0106\u07ac\ufffd\ufffdL~\ufffdL`7\ufffdz\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd%}\ufffd'\ufffd\ufffd\ufffd\ufffd\ufffdpy\ufffd$\ufffd\ufffdd\ufffd\ufffd*LKG"\ufffd\ufffd\ufffd\ufffd3\ufffd\ufffd\ufffd;\ufffdsTj\ufffdV\ufffd7M\ufffd\K\ufffd5\ufffd\ufffdgA!r}\ufffd\ufffd\ufffd\ufffdF\ufffd\ufffd7\ufffd6$\ufffd\ufffdDE\u0225v\ufffd\ufffd\ufffd\ufffd\ufffd'\ufffd\ufffd\ufffd\ufffd\ufffd]\ufffd^\ufffd\ufffdxM\ufffd\ufffd7^\ufffdvW0\ufffd8\ufffd\ufffd\ufffd._\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd38\ufffd?.\ufffd.\ufffd\ufffd)�
-x\ufffd\ufffd\ufffd\ufffdf\ufffd\ufffdK%\ufffd\ufffd<\ufffd$\ufffd\u03eafym\ufffd\ufffd\ufffdfx}\ufffd\u0385\ufffd\ufffd\ufffd\ufffd\ufffd?y\ufffd,}\ufffdw?\ufffd\ufffdx\ufffd3\ufffd\u05c1\ufffd\ufffd\ufffd\ufffd\ufffd>\ufffd\ufffd\ufffd\ufffd]N\ufffd
-U\ufffdT"$\ufffd:;q@a+\ufffd\ufffd\ufffdv\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdm\ufffd\u3380)=\ufffdp\ufffd\ufffdM"\ufffd\ufffd\ufffdy>\ufffdp^CZ\ufffd\Wa9\ufffd	I\ufffdi\ufffd\ufffd.\ufffd\ufffdK\ufffd:\ufffd0)R\u0321
-\ufffd:\u02ea\ufffdP\ufffd\ufffd\}\ufffd$\ufffdh\ufffd\ufffd\ufffd\ufffd\f\ufffdp6\ufffd\ufffd\ufffdE:\ufffd\ufffd\ufffd1n\ufffd\ufffd\ufffd\ufffdD1\ufffd_\ufffd\ufffd\ufffd\ufffd#+\ufffd7!\ufffd\ufffd\ufffd\ufffd^\ufffdKj=\ufffd\ufffd\ufffdMzW\ufffdHK`'?\ufffd\ufffd\ufffd85\ufffd6\ufffd\ufffd,\ufffdJ^(�m\ufffd\u0610\ufffd\ufffda\ufffd\ufffd$2O=75{ag\ufffd\ufffd\ufffd\ufffd7\ufffd\ufffd\ufffd\ufffdu\ufffd\ufffd\ufffd.\ufffdD\ufffd|\ufffdh\ufffd|\ufffdd\ufffd&_\ufffd`\ufffd\ufffd\u04757n\ufffd\ufffd\u06df\ufffd\ufffd\ufffdK\ufffd`]\ufffdjA\ufffdV_8FHHu&\ufffd
-E\ufffdT$s\ufffd7\ufffdwe;zc\ufffd\u05a2\ufffd-,\ufffd\ufffdM\ufffdU\ufffdWh�\ufffd\ufffdI\ufffd\ufffd#\ufffd3\ufffdM\ufffd.\ufffdrv\ufffdT\ufffd\ufffd\ufffd\ufffd\ufffdoIr\ufffd\ufffd\ufffd\ufffd2\ufffd\ufffd\ufffd\ufffdJ\ufffd\ufffd\ufffd*\ufffd\ufffd\ufffdgm\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd)\ufffd\ufffd\ufffd\ufffdV\ufffd\ufffd\ufffd\ufffd54\ufffd\ufffd't\ufffd\ufffd\ufffd\ufffd\ufffdH>\ufffd\ufffd@J\ufffd];\ufffd\ufffd\ufffd\ufffdi\ufffdZ\ufffd\ufffd\ufffd"\ufffd\ufffd\ufffd>!\ufffd\ufffdZr\ufffd\ufffdV\ufffdS,\ufffd\ufffd6\ufffd\ufffd\u03c8\ufffdy\ufffdF\\ufffd \ufffd\u041eB\ufffd\ufffd\ufffd={\ufffd%jA,&P\ufffd8\ufffd\ufffd!_]h>\ufffd\ufffd\ufffdN_f\ufffd\ufffd\ufffd\ufffd\ufffdt\ufffd2K2.+\ufffdg\ufffd\ufffdf\ufffd\ufffdvR\ufffde\ufffd\ufffd\ufffdV:\ufffd\ufffd\ufffde\U00109bf8\ufffd\ufffd,\ufffd0\ufffdNyo%\ufffd\u0327sR\ufffd\ufffd,:LR\2=\ufffdUV\ufffd\ufffd\ufffd\ufffd\ufffd"O\ufffd\ufffdu\ufffd\ufffdms\ufffd\ufffd\u07adi\ufffd\ufffd\ufffd\ufffdInr*\ufffdH\ufffdI\ufffd\ufffdH\ufffd\ufffd\ufffd\u053f\ufffdMN\ufffd\ufffdbg&\ufffd\u0344\ufffd\ufffd\ufffd\u0750\u07f5!\ufffd\ufffd\ufffdY6\ufffdGe\ufffd\ufffd\ufffd
-\ufffd\ufffd
-\ufffd\ufffd\u0531\ufffdtzaQ\ufffd\ufffde\ufffd\ufffd<\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\U00052c9d/\ufffd\ufffd\ufffd\ufffd@}\ufffd\ufffd\ufffdrb\ufffdH\u062c(\ufffdLQy&\ufffd\u02cb\ufffdX\ufffdos\ufffdl\ufffd\ufffd\ufffd\ufffd=B\ufffd,\ufffd$vjp\ufffdo\ufffd\ufffdxs\ufffd\ufffd6\ufffdz\ufffd)\u0416\ufffd.\ufffdW\ufffd{\ufffd\ufffd/\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd|\ufffd\ufffd\ufffdq\ufffd|\u0235\\u042b\ufffd\u0270\ufffd'\mN\ufffdbyg\ufffd\ufffd\ufffdf\ufffd,\ufffd\u016f\ufffd\ufffdE\ufffd
-\ufffd8\ufffd\ufffdY\ufffd\ufffdf\u058b\ufffd8\ufffd\ufffd\ufffd5\ufffdg{Z\ufffd4Y\ufffd)\ufffd\ufffdG\ufffd\ufffdr)?)S\ufffdL\u0645\ufffd�\ufffd\ufffdU\ufffd%Qe\ufffd\ufffdS\ufffd%v\ufffd{\ufffd\ufffd\ufffdZa,\ufffd\ufffd\ufffd\ufffdf\ufffdEo\ufffd\ufffdM\ufffd-u}s\ufffd\ufffd>\ufffd\ufffd\ufffd\ufffd9\ufffd:u\ufffdm\ufffdS\ufffd6
&F\ufffd^\ufffdJm\ufffd\ufffdK \ufffd\ufffd{B\ufffd\ufffd{\ufffd\ufffd{_\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdN:\ufffd\ufffd\ufffd\\ufffd\ufffd\ufffd\ufffd\\ufffd	WD\ufffd\ufffd\ufffdO=\ufffd/\u06a0K)TX\ufffd\ufffd\ufffd\ufffd?\ufffd\ufffd\ufffd\ufffdb\ufffdO&\ufffd\ufffd
-M\ufffdN\ufffdk\ufffd\ufffd\ufffd\ufffd\ufffd''N|x\ufffd\ufffd\ufffdW1\ufffd\ufffd\u02e0/22\ufffd\ufffd\ufffdR\ufffd\ufffdnD\ufffd\ufffdR21'.E\ufffd\ufffdr\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdbOXn\ufffdNO\ufffd1\ufffd\ufffd\u0119\ufffdq\ufffd\ufffdW.\ufffd\u03ce\ufffd\ufffd_\ufffd\ufffd?\ufffd\ufffdd,)\u06ddO~`)P$E7\ufffdDy\ufffd\ufffd\u0586Mg>er\ufffd\u0717 \ufffd\ufffd\ufffd7\ufffd\ufffdV	f\ufffd"\ufffdTq\ufffd\ufffd:_\ufffd\ufffdI \ufffdVkXf\ufffdIO\ufffd6\ufffd\ufffd\ufffd4\ufffdA\ufffd,@?\ufffd\ufffd\u04ca=\ufffdb]}(\ufffd\ufffd*\ufffd%?\ufffdwg'E\ufffdC\ufffd\ufffdV\ufffdF	\ufffd\ufffdZ\ufffd(\ufffd\ufffdZ\ufffd\ufffd?\ufffdeSz\ufffd\ufffd%@\ufffd\ufffd\ufffd+\ufffd\u0395\ufffd[\ufffd\ufffd\ufffd2+\ufffd&\ufffd\ufffd\ufffdv\ufffd\ufffd.:�\ufffd\ufffdE^g\ufffdJJ\ufffd\ufffd`c\ufffd\ufffd\ufffda!N|"\ufffd\ufffd*ei"!&\ufffd_\ufffd?~\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdo\ufffd\ufffd\ufffd
-]\ufffd\ufffdR\u8adc:5`s\ufffd=\ufffd\ufffd\ufffdh\ufffd\ufffdU\ufffd)\ufffdv\ufffd\ufffd?JV\ufffd\ufffdp*\ufffdG\ufffd-\ufffd\ufffd?~\ufffd\ufffd\ufffd\u01f6\ufffd\ufffdh4\ufffdP\ufffdO_\ufffd\ufffd\ufffd\ufffdX]\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd(\ufffdj)\ufffd\ufffd\ufffd\ufffd5\ufffdFXff\ufffd\u0372p\u0734\ufffd\ufffd/\ufffd\ufffd^\ufffd\ufffd\ufffdh\ufffd7k\ufffd\ufffd\ufffdwboZ\ufffd\j\ufffd\ufffd=\ufffd\ufffdb\ufffdlZ\ufffd\ufffd\ufffd\ufffd\ufffdI\ufffd\u02ed\ufffd[6=\ufffd\ufffd\ufffd8\ufffd \ufffd_2\ufffd\ufffd\ufffd
\ufffd\ufffdW/\ufffdzO\ufffd)\u0424\ufffdG\ufffd\ufffd\ufffd\u0210BS\ufffdv%\ufffdq'\ufffd@T\ufffd\ufffd\ufffdg\u068cT\ufffd-	\ufffd\ufffd\ufffd+\ufffd^\u0413\u05e2\ufffd\ufffdm\ufffd\ufffd\u0638V\ufffd\ufffdS\ufffd?@\ufffdk\ufffdA]\\ufffd\ufffd(\ufffd,
/~\ufffdB\u5624a\ufffd\ufffd.{A\ufffd\ufffdR R\ufffdG\ufffd\u055d\ufffd\ufffd\ufffd\ufffd\ufffd,\ufffd[\ufffd\u03cc\ufffd}\ufffdy\ufffd\ufffdR<\ufffdp?&\ufffdW\ufffd\u020c|\ufffd[^\ufffdo?{\ufffd\ufffd\ufffdb8\ufffd\u05d8s\ufffd,\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdFc\ufffd}\ufffd\ufffdv\ufffd\ufffdk\ufffd\u047f\ufffdI\M\ufffd\ufffd\ufffdX\ufffd\ufffd\ufffd\ufffd?\u041f\ufffdp\ufffd\ufffdw:;\ufffds\ufffd8\ufffd;:\ufffds=\ufffd\ufffd\ufffd_c\ufffd\ufffd\ufffdV#L\ufffdXWx\ufffd:\ufffd\ufffdU<t\ufffd\ufffd\ufffd*W\ufffd\ufffdm9\ufffd\ufffd?\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdje\ufffdP+E\ufffd<O})\ufffd \ufffd\ufffdJ!e\u04e7i\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd]-\ufffd%,\ufffd\ufffd\ufffd\u0149\ufffdP\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd#\ufffd\ufffd\ufffd\ufffd\ufffdL\ufffdp\ufffd\ufffdU\ufffd\ufffd_\ufffd\ufffd	\ufffd\ufffdi\u0396A\ufffd\ufffd~u\ufffd\ufffd\ufffd\ufffd\ufffd\u06f5\ufffd'\ufffd\u065am
 \ufffdY\ufffde}\ufffd\u0255~\ufffd\ufffd\ufffd\ufffd\ufffdVJ\ufffd\ufffd\ufffd%#&\ufffd\ufffd\ufffd7\ufffd(\ufffd\ufffd\ufffdaj\ufffdnh\ufffd\ufffd\ufffdq\ufffd\ufffd\ufffd~[y#\ufffd~
\ufffd\ufffd\u02aaie"\ufffd\ufffd+("\ufffd\u0225I\ufffd\ufffd\ufffd�W?\ufffd/\ufffd\ufffd\ufffdm\ufffd?\ufffdmn<x):}f\u072dl\ufffd\ufffd\ufffd\ufffdz\ufffd&\ufffd\ufffd\ufffd\u0471\u06ec\u034f\ufffd-q\ufffdzj\ud4ae\ufffdm\ufffd\ufffd6\ufffd\ufffd-0\ufffdo\ufffd\ufffdm\ufffd},Z\ufffdf\ufffdr\ufffd\ufffd:\ufffd\ufffd(\ufffdYc\ufffd6\ufffd\ufffd\ufffdY\ufffdGv7<\ufffd\ufffd\ufffd\ufffd.\ufffd\ufffdx~5\ufffd\ufffd7\ufffd1
\ufffd\u014d\ufffd\u05b2\ufffd~\ufffd\ufffdg\ufffd\ufffd\ufffdJx$\ufffdZN\ufffd2\ufffd\ufffd\ufffd37\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd}\ufffd=\ufffdO\ufffd5JXYZ\ufffd\ufffd \ufffd\ufffdD|'\ufffd\ufffd\ufffd\ufffdUV\ufffd\\ufffdb\ufffdt\ufffd\ufffd\ufffd\ufffdH\ufffd(\ufffd(\ufffd"^gc\ufffd\ufffd:\ufffd!8\u0454\ufffd\ufffd\ufffd:\ufffdS\u03c6\ufffdoF\ufffd\ufffd\ufffd]S/\ufffd%\u04d6cm\ufffd\ufffd\ufffd|\ufffdZ_?\ufffdL\ufffdYj\ufffd=\ufffdL\ufffd	L<\ufffdJ\ufffdj\ufffd\ufffdHdrp6y9\ufffd\ufffd`kr\ufffd\ufffd\ufffdL\ufffd\ufffdN\ufffd\ufffdM7
-\ufffdzC\ufffd\ufffd8\u04db\ufffd-\ufffdp/C9\ufffdJ\ufffdii\u04bbT\ufffdc3\ufffd"N=T\ufffd[\ufffd\ufffd'9f\ufffd\ufffd+2$.\ufffd\ufffdayy\ufffd:[T
-e\ufffd\ufffd\ufffdl_g\ufffd\ufffd}
-~\ufffd�\ufffd$\ufffd\ufffd4\ufffd4i%X\ufffd\ufffd\u0607\ufffd\ufffd\ufffdR\ufffdVH8|\ufffdT\ufffd%y\2t2\ufffd\ufffdn\ufffd\u04afJ\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd$\ufffd\u07a6R/:\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdY21%\u050a\ufffd\ufffdsn\ufffds\ufffd\ufffdQi\ufffd-\ufffd?L\u0468\ufffd|O~4\ufffd\ufffd/w\ufffd
-\ufffd\ufffd\ufffd\ufffdi\ufffd\u0468\ufffd%\ufffd\u0326\ufffd\ufffd-[\ufffd\u06aa\ufffd22v\ufffd=L
"!
-0\ufffdD/\ufffdyB2cM\ufffd\ufffdf}\ufffd\ufffdr\ufffd>�
~\ufffd\ufffd,\ufffd\u01a5\ufffd\ufffdw\ufffd^1{4\ufffdG\ufffdV\ufffd>\ufffd)\ufffd\ufffd\ufffd\ufffd\ufffdl\ufffd\ufffdO\ufffdk\ufffd\u0282K\ufffd\ufffd
-?\ufffd~\ufffd\ufffdp\u10ae.c0R\ufffd\ufffd\u0516t{\ufffd\ufffdm\ufffd\ufffd\ufffdB\ufffd\ufffd\ufffd@\ufffd\ufffdyEP\ufffd\ufffd\ufffds3r;\ufffdl|\ufffd4\ufffd;\ufffd
-\ufffd\ufffd\ufffd\ufffd^\ufffdJ\ufffd+\ufffd\ufffd?6\ufffd\ufffdyk\ufffd\ufffdH\ufffd\ufffdqy\ufffdx\ufffd\ufffd\ufffd\ufffd0u\u0677\ufffd\ufffdpi_S\ufffd,\ufffd\ufffd\ufffd-\ufffd)\ufffdW*\ufffdK\ufffd|\ufffdIQ\ufffd\ufffd\ufffds\ufffd\ufffd\ufffdyi\ufffd\ufffd\ufffdH\ufffd\ufffd\ufffd\ufffd\ufffdn\ufffd\ufffd\ufffd\ufffd\u01ea\u03aa\ufffd\ufffd1\ufffd\ufffd\ufffdA\ufffd\ufffd=*A\ufffd~Z6\ufffd\ufffd]\ufffdG\ufffd`\ufffdk\ufffd\ufffd\ufffd\ufffdS\ufffd_\ufffd\ufffd\ufffd/Y\ufffd\ufffd\ufffd9\ufffd9\ufffd\u05b6"\ufffd|%\ufffd\ufffdO\ufffd\ufffdD\ufffd\ufffd\ufffd7\ufffd\ufffd}\ufffda\ufffd\ufffdt\ufffd\ufffdiLm\ufffd\u0719\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdL{\u4924\ufffd\ufffd\ufffd\ufffd\ufffd~x\ufffdX[\ufffdb\ufffd\ufffd*O_\ufffd\ufffd:z\ufffd\ufffdw\ufffd1\ufffd\ufffd\u05e7\ufffd\ufffd\u036d\ufffd\ufffdU/\u0131t\ufffd@\ufffd\ufffdYc\ufffd~q4r\ufffd	\u0486/m\ufffd+\ufffd/G\ufffdg;\ufffd`\ufffd\ufffd\ufffdyiS_\ufffd\ufffd\ufffd>\ufffd\ufffd'J\ufffd6\ufffdH\ufffd\ufffdI+me\ufffdt\ufffd\ufffd\ufffd/\ufffdmIA\ufffd\ufffdUg\ufffdnZp\ufffd\ufffd\ufffdyU\ufffd\ufffd\ufffd\ufffd|\ufffd\ufffd\ufffdc\ufffd,k\ufffd\ufffd\ufffdP\ufffdoV%M\ufffd\ufffd\ufffd\ufffd\ufffd%\ufffd\ufffd\ufffd\ufffd\ufffdAk\ufffd3\ufffdt\ufffdGyLO\ufffd\ufffdi\u0676go\ufffd2
\ufffdL\u01aa\ufffd/<\ufffd\ufffd\ufffdb\ufffd?\ub7b7\ufffd\ufffd\ufffdx\ufffd\ufffd\ufffdwW-FHsh\ufffd\ufffd\ufffd]\ufffd\ufffd\ufffd\ufffd\ufffd&?z\ufffdL\ufffd\ufffda\ufffdBj\ufffdC\ufffd>\ufffd\ufffdG\ufffdw_\ufffd\ufffd\ufffd\u0209>;\ufffd3\u0546\ufffd\ufffd2c3\ufffd\ufffd\ufffdk\3\ufffd?,\ufffdWz\ufffdk\ufffdt\ufffd%\ufffd\ufffd;\ufffd\ufffd&sYs^y\ufffd`\ufffd\ufffd\ufffd}\ufffd\ufffd=\ufffd\ufffd\ufffd,\ufffd\\ufffd\ufffd\ufffd\ufffdK\ufffd\ufffdf[\ufffd
 7n{t\ufffd+\ufffdx5\ufffd\ufffd\ufffd\ufffdB\ufffd\ufffd\ufffd78u\ufffd\ufffd;Q\u1448\ufffd%\ufffd4\ufffd\ufffd@\ufffdhG\ufffd\ufffdY\ufffd\ufffdD\ufffd\ufffd\ufffd.e\ufffd\ufffdN\ufffda\ufffd\ufffd\u0177/\ufffd\ufffdu\ufffd\ufffd\ufffdf\ufffd\ufffdi/\ufffd\ufffdu\u019a
-\ufffd\ufffdj\ufffd\ufffdRe\ufffdi"s\ufffd\u0520L/~r<Y\ufffdS\ufffdS\ufffd\ufffdT\ufffd\ufffd\ufffd\ufffd{\ufffd\ufffd\ufffd\ufffd\ufffde{\ufffdJgu\ufffd\ufffd\u0267\ufffd\ufffdA\ufffd\ufffd\ufffd\ufffd0}\u018c\ufffd\ufffdw|\ufffdL{\ufffd\ufffd\ufffd\ufffd4\ufffd7V\ufffd*\ufffdz-\ufffd^\ufffd\ufffd\ufffd\u02ed\ufffd\ufffdF\ufffd,\ufffd\ufffdK\ufffdu\ufffd\ufffd{\ufffd\ufffd\ufffd\ufffd'Uh\ufffd:\ufffd\ufffdu\ufffd\ufffd\ufffd{\ufffd\ufffd\ufffd\ufffd\ufffdd\ufffd\ufffd\u0120+\ufffd8\ufffd\ufffd\u016d\ufffd\ufffd\ufffd{\u02e8[t\ufffdM\ufffd\u035b\ufffdF\ufffd*\ufffd\ufffd:?y\ufffdwS\ufffdN\ufffd\ufffd+\ufffdZe4{\ufffdx\ufffd\ufffd\ufffd\ufffd\ufffdjD+Z\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd@\ufffd\ufffdmd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdq\ufffdR\ufffdkfN\ufffdK\ufffd\ufffd
bu\ufffdy\ufffd\ufffde\ufffd&\ufffdH\ufffd\ufffds\ufffd\ufffd\ufffdF6\u075bf\ufffd.\ufffd;\ufffd\ufffdRUEv\ufffd\ufffdR\ufffd\ufffdG\ufffd\ufffd=f{~I\ufffd6\ufffd\ufffd\ufffd\ufffd(mtC<\ufffd9p\ufffd\ufffd#\ufffd\ufffd\ufffdX\ufffd\u018b\
3\ufffd\ufffd\ufffd0\ufffd+\ufffd99\ufffd
-\ufffd1\ufffdP\ufffd\ufffd\ufffd\ufffd\ufffdr\ufffdnY\ufffd\ufffd<\u7939H/\ufffd\u0326"\ufffdXl(\ufffd\ufffd\ufffd:\ufffd\ufffd'\ufffdp.\ufffd\ufffd#\ufffd\ufffdZB\ufffd\ufffd|c"\ufffd\ufffd\\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd-�M\ufffd*\ufffd\ufffdL\ufffd}p-\ufffd\ufffd\ufffd\ufffd#\u07cf\ufffd\ufffd:\ufffd#\ufffd\ufffd\ufffdn\\ufffdg\ufffdFr\ufffdQ	\ufffd(^\ufffd\ufffdB\ufffd3\ufffdo`\ufffd\ufffdq\ufffd0V\ufffdR\u0311\ufffdL=6\u045a\ufffdJ{b\u0759+TA$\ufffd	\ufffd\ufffd\ufffd"\ufffd\ufffd\ufffdm\ufffdq\ufffdw\ufffd\ufffd'0\ufffd\ufffd\ufffdvE\ufffdS\ufffdi\ufffdw\ufffduZs.\u059ali\ufffd\ufffd\ufffd\ufffd\ufffd-\ufffd\ufffd\ufffdm\ufffdq\ufffd`#	\u0284\ufffdv]\ufffd\ufffd~\ufffd+9\ufffd\ufffd0\ufffdn\ufffde\ufffd\ufffd\ufffd<\u4d0e\ufffd\ufffdK9\ufffd2\ufffd\u03c4\ufffdL+\ufffdZ\ufffdS\ufffdf\ufffd\ufffd\ufffd\ufffd+\ufffd\ufffdN\ufffd6\ufffd\ufffdu[\ufffd\ufffdU\u01e5\ufffd\ube9dA\ufffd\ufffd\ufffd8/1\ufffd\\ufffd<R4\u06b60W8/\ufffd\ufffd}9Z\ufffdK\ufffd\u0612/\ufffdk\ufffdhamE\ufffd\u06f5}]\ufffd\ufffd^\ufffd\ufffd\ufffd\ufffd\ufffd^?\ufffdhb9\ufffd\ufffd\ufffd7\ufffdH\ufffdl!p\ufffdk\ufffd4\ufffd\ufffd_\ufffdv\ufffdy\ufffd\ufffda\ufffd\ufffd7\ufffd-\ufffd\ufffd\ufffd\ufffd\ufffd6\ufffd\ufffd=\ufffd\ufffd\ufffd\ufffd\ufffd5\ufffd\ufffd\ufffdb\u0146\ufffd<;;U\<u66\ufffd\u0304\ufffd7\ufffd\ufffd\ufffdr\ufffd\u03e8^\ufffdQ\ufffdf\ufffdXw\ufffd\ufffdlm\ufffd\ufffd\ufffd*\ufffd\ufffd\ufffd\u0504\ufffd}\ufffd\ufffdYR\ufffd+G\ufffd6&\ufffd`\ufffd->\ufffd\ufffd\ufffd{|p\ufffd\ufffd|\ufffdtI\ufffd\ufffd\ufffd#\ufffd\ufffd#\ufffd7\ufffd\u06d9:\ufffd\ufffd\ufffd\u03fa_m|\ufffd\u036dr*\ufffd\ufffd\ufffd\ufffd\ufffd+\ufffdWonp\ufffdLa\u0371\ufffdGb\ufffd\ufffd\ufffd\ufffdk\ufffd\ufffd
 \ufffd\ufffdF]	R\ufffdT?*@\u0202\ufffd\ufffd\ufffd\ufffd}\ufffdJX\ufffdxo\ufffd\ufffd\ufffd/\u0253\ufffd\ufffd\ufffd\ufffdE qVo	\ufffd\ufffd\ufffd\ufffdIrs\ufffd\ufffdm\ufffd\ufffdR2\ufffdGU\u017e\ufffd%\ufffdm>UR\ufffd=d\ufffdol\ufffd\u036b\u0213\ufffdk\ufffd2\ufffdl\ufffd\uc925\ufffd\ufffd<	8*\ufffd\ufffd\ufffd1\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdS6si\ufffdRS\ufffdV\ufffdi*\ufffd\ufffd*\ufffd\ufffdv\ufffd\ufffdd\ufffd==\ufffdV872\ufffde\ufffd\ufffdoSf\ufffd\ufffd\ufffd\ufffd{\ufffd\ufffdY\ufffd\ufffd\ufffd\ufffdU\ufffd\ufffd%W\u05d8dfW\ufffd\ufffd\ufffde\ufffdTv\ufffd\ufffd\u06bf\u0456\u02fc\ufffd
\ufffdO\ufffdk\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdUn<\ufffdSx\ufffd\ufffdW�E*\ufffd]\ufffd\ufffd\ufffd\ufffdo\ufffd\ufffdy}.)[!\u0208{s\ufffd4\u9fbaoh\ufffd9\uf26aQu@\ufffd<\ufffd\ufffd7'\ufffd\ufffd\ufffdim\ufffd\ufffdn\ufffd\ufffd1\ufffd\ufffd\ufffd0}\ufffd\ufffd\ufffd\ufffd\ufffdxo\ufffd\ufffdMO\ufffd3\ufffdH\ufffdl3\ufffd\ufffdC\ufffduy\ufffd&P\u05f6oq\ufffd~!]\ufffd1R\ufffd\ufffd4C\ufffd\ufffd\ufffd\ufffd&\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdP\ufffd=\ufffd\u0527\ufffd\ufffd\ufffd\ufffd"MJlq\ufffdj{\ufffd\ufffd\ufffd6[\ufffd\ufffd\ufffdJ^l\ufffd\u0365\ufffd\ufffd\ufffd
u0X\ufffd\ufffd]Zhe\ufffd+;ozp\ufffd\u986eZ\ufffdZ\ufffdJL_\ufffdo\ufffd\ufffds\ufffd.\ufffd;\ufffd6\ufffdrg\ufffd8\ufffd<*H\ufffd\ufffdK\ufffd\ufffd\ufffd5\ufffd\ufffd\ufffd`\ufffd\ufffd:VpM\ufffd&\ufffd)\ufffd\ufbbc\u03ddY\ufffd/\ufffd\ufffd.\ufffd\ufffde18n\ufffdD\ufffd\ufffd\ufffd`\u07943"]\ufffdd.5Z\ufffd\ufffd6Z\ufffd\ufffd2\ufffd?\ufffd4K\ufffd\ufffdr\ufffdR\ufffdS\ufffd\ufffd\ufffd\ufffd!!~O\ufffd\ufffd\u05e9\ufffd\ufffd/\ufffd\ufffd\ufffdg\ufffdJV\ufffd\ufffdU\\ufffdKY\ufffdO\ufffd6
-\ufffd\ufffd7I\ufffd\ufffdL\ufffd\u050f\ufffd\ufffd\ufffdR\ufffd*\ufffdDng,\ufffd\ufffd.\ufffdA\ufffd[\ufffd"\ufffd5y\ufffd\ufffdXL\ufffd9\ufffd\ufffd\ufffd\ufffd\ufffd*\ufffd+\ufffdH\ufffd\ufffd\ufffdC\ufffd	O\ufffdJ\ufffd\ufffdRH\ufffd@\u023e1\ufffdk2\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdi\ufffd�I74\ufffd\ufffd
5\ufffdo\ufffd\ufffdO\ufffdVg\ufffd\ufffd\ufffdt\ufffdr\ufffd\ufffd,$\ufffd\ufffdF]j\ufffd$\ufffdO)B!y\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd	\ufffd\ufffd\ufffd\ufffdz\ufffd\ufffd\u1053\ufffdV\ufffdNw\ufffd\ufffd6\ufffd@\ufffdN\ufffd\ufffdS\ufffdD\ufffd4\ufffd\ufffdP\ufffd\ufffdpY\ufffdR\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdMr\ufffdcK_M\ufffdE\u0453\ufffdC\\ufffd\ufffd\ufffdO	
1C\"\ufffdH\ufffd\ufffdA\ufffd{\ufffdo)1\ufffdG\ufffd\ufffd~\ufffd\ufffd\ufffd|\ufffd\ufffd!W\ufffd\ufffd\ufffd>\ufffd\ufffd\ufffdy\ufffdx_\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd4\ufffd\ufffdT	N
-^M\ufffdK\u0791|1%%\ufffd5\ufffd\\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd
-e\ufffd\ufffd\ufffd\ufffd	\ufffd\ufffd.4G\u044dP\ufffdP\ufffdZ8\ufffd\ufffdP\ufffd\ufffdG\ufffd\ufffd\ufffd\ufffd.4\ufffd\u0563bN1\ufffd\ufffdC\ufffd>Mz`\\ufffd\ufffdyO\ufffd\ufffd\ufffdF4\ufffdQ\ufffd\u0339\ufffd\ufffd0W�\ufffd\ufffd\ufffd\ufffdL\ufffd\ufffds\ufffd\ufffd)@z\u0287\ufffd\ufffd\ufffdK=\ufffd\ufffd\ufffd*d\ufffdv#\ufffdFz\ufffd2o\u073e�\u01efy\ufffd\ufffd,@\ufffdP\ufffd\ufffd|\ufffdq \ufffd	\ufffd~d\ufffd\ufffd\ufffd
-\ufffdy\ufffd\ufffdM\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd!$\ufffdM7\ufffd\u0342\ufffd;\ufffd\ufffd~n\ufffd\ufffdF\ufffdQ:zq\ufffd\ufffd'`LqJ\ufffdW\ufffd\ufffd<\ufffdaR\ufffd*~&\ufffdA\ufffd\ufffd\ufffd\ufffdd>Aq(\ufffd\ufffd\ufffd\u02b9
-t\ufffdmx\ufffd\ufffd<\\ufffd\ufffdR\ufffd4H@\u07cec\ufffd#\ufffd4\ufffd+\ufffd\ufffdz\ufffd+0\ufffd \ufffd\ufffd\ufffdF\ufffd\ufffd~+v#\ufffdIF)H\ufffd$H
-\ufffd\ufffd*\ufffd,d\ufffd0\ufffd\\ufffd\ufffd\ufffd\ufffd9a\ufffd`\ufffdq{\ufffd\ufffd\ufffd(\ufffd\ufffd.\ufffdBh\ufffdA\ufffd\ufffd\u0563\ufffd&\u050cZP+jC\ufffdPmDa\ufffd	u\ufffd\u0368\ufffd\ufffd\ufffdrp\ufffd8X\u0258bv\ufffd^\ufffd\u0137k:\ufffd\ufffd3\ufffd�\ufffd\ufffd\ufffdB/$\ufffd\ufffd\ufffd\ufffd	:\ufffdt\ufffd\ufffd	:	\ufffd\ufffd&\ufffdJ\ufffd9	:\ufffdT8?A\ufffd\ufffd>A\ufffd}s\ufffd\ufffdER\ufffd3q\ufffdC:|b\ufffd\ufffd\ufffdsn$\ufffd\u0435\ufffd=	I\ufffd\ufffd=	\ufffd\ufffd]\ufffdD,A\ufffd^\ufffd\ufffd=\ufffd\ufffd\ufffd	z2*#3\ufffd\ufffd\u0659\ufffd\ufffd}&AOEv\ufffd|\ufffd\ufffd\ufffdz\ufffdI\u0405(\ufffd*J\u0405\ufffd\ufffd\uabde\ufffd\ufffd5362:\ufffd)tjj&'G\ufffdC\ufffd\ufffd\ufffd\ufffd\ufffd2\u05743\ufffdf5\ufffdC\ufffdC3;\ufffd\ufffdM\ufffd)\ufffd\u036014\ufffdF\ufffd\ufffdLa\ufffd\ufffd0\ufffd$\ufffd\ufffd\ufffd0\ufffd:4\ufffd\ufffd\ufffd*\ufffd\ufffds\ufffd\ufffd\ufffdf\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd;\ufffd\ufffd\u0353s\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdap\ufffdI\ufffd5	\ufffd:\ufffdch\ufffdj2:\ufffd\ufffd$pl\ufffd\ufffd\ufffd\ufffd\ufffd5Hc\ufffd\ufffd\ufffd\ufffd\ufffdM\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd3'X.\ufffdqOE@\ufffd\ufffdG`l\ufffdc9p\ufffd\ufffd\ufffd\ufffd\u57dd\ufffd\ufffd\ufffd\ufffd\ufffd\u061dn\ufffd\ufffd(823e&184\ufffd!;\ufffd\ufffd
W\ufffdh\ufffd~UUVF\ufffd\ufffd\ufffd\ufffdg\u014d\ufffdj"\ufffd\ufffd\ufffd\ufffd\ufffdP,23\ufffd\ufffd^i\ufffd\ufffdXF\ufffd1P\ufffd\ufffd\ufffd4\ufffdI\u067a\ufffd\ufffd\ufffd\ufffdX\ufffd_\ufffd\ufffd\ufffd\ufffd\ufffdf\ufffdF&4sC\ufffd\ufffd:OY\ufffd2\u059e`!\ufffdX02\ufffd\ufffdO\ufffd\ufffdM\u0301/%8
 
j\ufffdwi\ufffd\\ufffd6\u0371k\ufffd6\ufffd,\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd4\ufffd\ufffdk\ufffd3\ufffd\ufffd\u0479\ufffd\ufffd\ufffdc`rp\ufffd>�\ufffd>0sL9\u0224\ufffdu\ufffd9x\ufffd\ufffd>\ufffdr\ufffd\ufffde\ufffd\ufffdYz\ufffdO\ufffd1\ufffd\ufffd\ufffd#\ufffdy\ufffd\u039d\ufffdXbY,\ufffd\u0679\ufffd\ufffd\ufffd\ufffd5\ufffdw\ufffd\ufffd\ufffd\ufffde5\ufffde\u07b3@\ufffd\ufffd\ufffdH\ufffdcC\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u8426r*2\ufffd\u011d|\u0352\u069d\ufffd]\u01c0\ufffd\ufffdMh\ufffd\ufffd\ufffd \ub60cFY\ufffdT\ufffd\ufffd\u030b\ufffdV?\ufffd\ufffd\ufffd\ufffd\\ufffd8\ufffd5FX\ufffd\u0259G4\ufffdb\ufffd\ufffdXWj\ufffd\ufffd\ufffd7\ufffdB\ufffd8\u03c0N\ufffd\u0555\ufffdg\ufffd\ufffd\ufffdW
\ufffdF3\ufffd\B\ufffd\ufffd\ufffdf3,\ufffdw\ufffd\ufffd\ufffdooK+\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdK\ufffd\u03b0\ufffd"\ufffd,\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd$
+x\ufffd\ufffdZy|\ufffd\ufffd\ufffd\ufffdfF\ufffde[\ufffdd\ufffdd\ufffd>,\ufffd:l]\ufffdd\ufffd\ufffd\ufffd}a\ufffd1\ufffdoc\u0277!\ufffd%	P \ufffd\ufffd$R6K9H\ufffdMi\ufffdfw\ufffdl\ufffd~\ufffdlC\ufffdYB\ufffd$\ufffd\ufffdl\ufffd\ufffd\ufffd]\ufffd\ufffdO
+\ufffd\ufffdoF2>\ufffd6\ufffd\u05ca\ufffdx\ufffd\ufffd\ufffd7\ufffd}\ufffd\ufffd\ufffd7\ufffd!r"\ufffd\ufffdE\ufffd\ufffd\ufffdu\u06c1\ufffd"BX<\ufffd5\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd!\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd=g\ufffd\ufffd\ufffd\ufffdl\ufffd\ufffd\ufffdu\ufffdUA?B\ufffd.\ufffd3::\ufffdp\ufffd"\ufffd\u0385\ufffd!\ufffdk
+5\ufffd97\ufffdX\ufffd\ufffd\ufffd(\ufffd\ufffd>\ufffdW0\ufffd�ojrv\ufffd\ufffd\ufffd\ufffd5\ufffd\ufffd#\ufffd\ufffd\u041bU\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd	\ufffdSO\ufffd!\ufffd\ufffd\ufffd�\ufffd\ufffd\ufffd\u48af\ufffd\ufffd\u0119 \ufffd\ufffdB.\ufffd\ufffd$X\ufffd\ufffd\ufffdRR\ufffdi\ufffdH\ufffd\ufffd8C"\ufffd!yf\ufffdB\ufffd}\ufffd~\ufffdJ\ufffd\ufffd\ufffd\ufffd\ufffd\u025ck\u0273\ufffd#\ufffd\ufffd\ufffd,(D\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdh\ufffd\ufffd7\ufffd\u05c6\ufffd0\ufffd\ufffd\ufffd\ufffdN\ufffd\ufffd\ufffd\ufffdB\ufffd\ufffd\ufffdk\ufffd7\ufffd\ufffdy\ufffd\ufffd\ufffd\ufffd
+fG\ufffd\ufffd\ufffd\u52c1{C\ufffd\ufffd-V\ufffd}g\ufffd\u01e5\ufffd\ufffd\ufffd\ufffdw>axU\ufffd\ufffd\ufffd\ufffdv\ufffd\ufffdQb\ufffd\ufffdb\ufffd\ufffd\ufffd\ufffd\ufffdY\ufffd,\ufffd
X^\ufffd\ufffdO\u07b9\ufffd\ufffd\ufffd\ufffd\ufffd\u03dc\ufffd\ufffd\ufffd\ufffd{\ufffd{/\ufffd\ufffd:p\ufffd?\ufffd{\u06072\ufffd\ufffd	W\ufffd\ufffd\ufffdJ\ufffd\ufffd^g'(l\ufffdz\ufffd\u07eeT\ufffd\ufffd:}\ufffdMq\ufffd0\ufffd\ufffd\ufffd{\ufffdI$2\ufffd3\u03c7\ufffdb\ufffdkH\ufffd\ufffd\ufffd\ufffd*,'<"!\ufffd<
P\ufffd%\ufffd\ufffd\ufffdb\ufffd[\ufffd&E\ufffd9T\ufffdWgY5\ufffd`S\ufffd\ufffd\ufffd$\ufffd-\ufffdgb\ufffd*\ufffd\ufffd"\ufffd\ufffdEjin\ufffd\ufffd/7z\ufffd\ufffdo\ufffd5\ufffd:Q\ufffd\ufffd%\ufffd\ufffd\ufffd\ufffdMH\ufffdam\ufffd\ufffd\ufffdZ.'=n\ufffd^\u01d52\ufffd\ufffd\u024f\ufffd\ufffd;N\ufffd\ufffd\ufffd\ufffd6\ufffdE\ufffd\ufffd\ufffd\ufffdc\ufffd\ufffd6dol\ufffd,\ufffd\ufffdL\ufffdS\ufffdM\ufffd^\ufffdYF\ufffdtv\ufffd\ufffd\ufffd2\ufffdF](@\ufffd\ufffd\ufffd=\ufffd'8\ufffd2\ufffd\ufffd\ufffd\ufffd\ufffdW4\ufffdhst\ufffd\u06ee\ufffd\ufffdg,\ufffd \ufffd\ufffd,X\ufffdZ\u043f\ufffd\u0380R\ufffd\u0273B\ufffd<\u025c\ufffdg\ufffd]\ufffd\u0380\ufffdX\ufffd\ufffd\ufffdp\ufffd\ufffd\ufffdmG\u04feCU\ufffd\ufffdp\ufffd/d~\ufffdH\ufffd\ufffdsS\ufffd\ufffd\ufffd\ufffd\ufffd3\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd[\ufffd\ufffd\ufffdf\ufffd\ufffd\ufffd"\ufffd\ufffd\ufffdf\ufffdJ\ufffdkr\ufffdY['\ufffd\ufffd\ufffdz\ufffdg\ufffd6\ufffdz\ufffd\ufffd\ufffd\ufffd\ufffdn
\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd{\ufffd\ufffd<?\ufffd\ufffd\ufffd&\ufffdt\ufffd\ufffdye"=,C7\ufffd\ufffd\ufffd\u01e0@\ufffd\ufffd%\ufffdn\ufffdOH\ufffd\u0723\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdz\ufffdM\ufffd\ufffd"\ufffds\u07a3
 \ufffd/\ufffd/\ufffd\ufffd\u041f\ufffdsx\ufffdg\ufffdZ\ufffd	\ufffd%\ufffd={\ufffdW\ufffd\ufffd\ufffdu\ufffd\u04d7\u0679\ufffd%\ufffd\ufffd\ufffd\ufffdj]\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdJ\ufffd3\ufffdz\ufffd\ufffd\ufffdkAi`\ufffd\ufffd\ufffd\ufffdq{}\ufffd+\ufffd-!\ufffd#\ufffd\ufffdS\ufffd[I\ufffd\ufffd\ufffd\ufffd&\ufffd\ufffd\ufffdLOw\ufffdU\ufffdw\ufffd\ufffd\ufffd\ufffd\ufffdm\ufffd==h\ufffd\ufffd \ufffd\ufffdwk\ufffd\ufffd>~\ufffd\ufffd\ufffd\ufffd3o\ufffd\ufffd\ufffd\ufffd9\ufffdd\ufffd\ufffd\ufffd\ufffdr\ufffd\ufffd8\ufffd\u0619\ufffd3\u1c046;k7\ufffdwmH\ufffdp\ufffdM\ufffdQ\ufffdf \ufffd�\ufffd\ufffdy\ufffdf&u\ufffd5]\ufffd^X\ufffdpY\ufffd&\ufffd+\ufffd\ufffd6\ufffd\ufffd~s\ufffd\ufffdl\ufffdK\ufffd3?8P_\ufffd\ufffd86+J\ufffdST\ufffd\ufffd\ufffd\ufffdbG*\ufffd\ufffd\ufffd-[9\ufffdG~r\ufffdP)K-\ufffd\ufffd\ufffd\ufffd\ufffd{j;^\ufffd\ufffdo?\ufffdM\ufffd\ufffdk
+\ufffd\ufffdK\ufffd\ufffd\ufffdF\ufffd\ufffd\u02e2l\ufffd\ufffd\ufffd?}\ufffd\ufffd/_:\ufffdx/r-\ufffdja2,\ufffd	W\ufffd\u04c7\ufffdXE\ufffd@&\ufffd,Kj\ufffdk\ufffd|Q\ufffdB+/~\ufffd\ufffd\ufffd\ufffd\ufffdb\ufffd*\ufffd\ufffd/\ufffdi\ufffd\ufffd\ufffd\ufffd\u015e\ufffd4MVz
+\ufffd\ufffd\ufffdd\ufffd\\ufffdO\ufffdT*Sv\ufffd\ufffd.fUgIT`\ufffdm\ufffd\ufffd\ufffd\u03adzk\ufffdV\ufffd%e\ufffd\ufffdYv\ufffd\ufffd\ufffdm}Sk\ufffdA]\ufffd\ufffdl\ufffd\u03c2\ufffdo\ufffd\ufffdNq\ufffd\ufffdT8\ufffdM\ufffd\ufffd\u0466\u05f0R\ufffdl\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd"=\ufffd}\ufffd\u0797\ufffd\ufffd/vu\ufffd\ufffd\ufffd\ufffd\ufffd0W\ufffd\ufffd\ufffd+\ufffdy\ufffd\ufffd\ufffdm\ufffd\ufffd\ufffdS\ufffd6\ufffdR
+\ufffdm\ufffd\ufffd\u83f0\uce73X\ufffd	c\u0166BS\ufffdS\ufffdjw\ufffd?\ufffd\ufffd\ufffdc\ufffdU\ufffd\ufffd2\ufffdK\ufffd\ufffdL\ufffd \ufffd\ufffd>\ufffdQ<d\ufffd\ufffd\ufffdL\ufffdI\ufffdKC\ufffd\ufffd\ufffd]\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdsL\ufffd0q\ufffdy\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdc\ufffd\u01fd\ufffd\ufffd\ufffd\ufffdO~<K\ufffdv\ufffdX
+I\ufffd\ufffd/\ufffd_\ufffd\ufffdF\ufffd\ufffd\ufffda\u04d9O\ufffd\1\ufffd\ufffd\ufffdF-\ufffd\ufffdU\ufffd\ufffd@\ufffdz\ufffdH+\ufffdB>\ufffd\ufffd\ufffddp\ufffdH\ufffd\ufffd\ufffd\ufffdr\ufffd\u04f3M\ufffd05\ufffdP\ufffd/\ufffd\ufffd\ufffd\ufffdb\ufffd<\ufffdX\ufffdG\ufffd\ufffd
+r\ufffd\ufffd\ufffd\ufffdIQ\ufffdP\ufffd\ufffd\ufffdF\ufffdQB&\ufffdV&\ufffd\ufffd\ufffd\ufffde\u0654^ h	\ufffd\ufffdg\ufffd\ufffd\ufffdse\ufffd%q\ufffd\u030a\ufffdI\ufffdh\ufffd]\ufffd\ufffd\ufffd\ufffd0bbq\ufffd\ufffd\u0675\u04876\ufffd=\ufffd\ufffd\ufffd\ufffd\ufffd?gX\ufffd\ufffd\ufffdmb\ufffdJY\ufffdH\ufffd\ufffd\ufffd\ufffd\ufffd\u07fc\ufffd\ufffd\ufffdwX\ufffd\ufffd\ufffd\ufffdv\ufffd.\ufffd_\ufffd
+\ufffdUN\ufffd\ufffd9\u019e\ufffdej4\ufffd\ufffd*\ufffd\ufffd\ufffdj\ufffdJx\ufffd$\ufffd\ufffdl8\ufffd\ufffd\ufffd\ufffd\u033fy\ufffd\ufffd\ufffd\u01f6\ufffd\ufffdh4\ufffdP\ufffdO_\ufffd\ufffd\ufffd\ufffdX]\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd(\ufffdj)\ufffd\ufffd\ufffd\ufffd5\ufffdFXff\ufffd\u0372p\u0734\ufffd\ufffd/\ufffd\ufffd^\ufffd\ufffd\ufffdh\ufffd7k\ufffd?\ufffd;\ufffd7\ufffdf.5g\ufffd\ufffd\ufffdV\ufffdv6-\ufffd\ufffd]\u0582\ufffd$E\ufffd\ufffd\ufffd\ufffd-\ufffd\ufffd`Sg\ufffd?o\ufffdC\ufffd/\ufffd
\ufffd\ufffd\ufffd\ufffdL�D\ufffd'\ufffdh\ufffd\u9063t\ufffd\ufffd\dH\ufffd\ufffde\ufffd\u0378o \ufffd\ufffd\ufffd\u2085\ufffd3mF*\ufffd\ufffd\ufffd\ufffdl\ufffd\ufffd%K/\ufffd\ufffdkQv\ufffd\ufffd\ufffd\ufffdYl\+`\ufffd\ufffd\ufffd\ufffd\ufffdmP~%\ufffd6K�\ufffd\ufffdPD9&i\ufffdE\ufffd\ufffd^\ufffd\ufffd\ufffd\ufffd�eu'\ufffdj\ufffd \ufffd\ufffd\ufffdV)\ufffd3\ufffdwp\u0786:\u017c\ufffd+\u070f	\ufffd;2#\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd^\ufffdo\ufffd\ufffd5\ufffd\<\ufffd\ufffd\ufffd-\ufffd~o\ufffd<\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd~\u07f6\ufffd\ufffd\ufffd&\ufffd\ufffds\ufffdoW\ufffd?\ufffd<\ufffd\ufffd9>\ufffd\ufffd/\ufffd\ufffd\ufffd\ufffd\ufffdo]?\u738eo]\ufffd\ufffd`\ufffd\ufffd\ufffd\ufffd8s\ufffd\ufffd\ufffd;\ufffd\ufffd\ufffd^\ufffd\ufffdk]?\ufffdA\ufffd\u0295\ufffdh[\ufffd/\ufffd\ufffd\ufffdhp\ufffd\ufffd\ufffdq{\ufffdZY\ufffd-\ufffdJQ=\ufffd\ufffd\ufffdD_\ufffd-\ufffd\ufffdRH\ufffd\ufffdi\ufffdoj\ufffd\ufffd\ufffd}W\ufffdy	\ufffd"`q"?Tn\ufffd\ufffdk(\ufffd\ufffd\ufffd`7f5\ufffd\ufffd%\ufffd+`3\ufffd\ufffdmq\ufffdp\ufffd\ufffde\ufffd\ufffdEA\ufffd;\ufffd_\ufffdsx\ufffdA\ufffd\ufffd\ufffd`\ufffdv-\ufffd	b\ufffdf[qVvY_pr\ufffd\ufffd\ufffd\ufffd
 \ufffd\ufffd\ufffd\ufffdR\ufffd'?`\u0248	-\ufffd\ufffd\ufffd
:\u02a2'n\ufffd\ufffd\ufffd\ufffd!u\u0737\ufffd\ufffd\ufffd\ufffdC\ufffd\ufffd_CAi\ufffd\ufffdjZ\ufffdH\ufffd\ufffd
+\ufffd\ufffd9ri\ufffda\ufffd\ufffd\ufffd\u054f\ufffd\ufffdz\ufffdty\ufffd\ufffd\u01cfw\ufffd^\ufffdN\ufffdw\ufffd\ufffdrwG\ufffd\ufffd\u07a7\ufffdn\ufffdwt\ufffd\ufffd6k\ufffd#oK\ufffd\ufffd�\ufffdZ\ufffd\ufffd\ufffd\ufffdf\ufffd\ufffd\ufffd\ufffd\ufffdn\ufffd[\ufffd{z\ufffd\ufffd\ufffd\ufffd\ufffd\u072e\ufffdl,\ufffdt\ufffd\u062d\ufffduuy\ufffd\ufffd\ufffd
\ufffd\ufffdb\ufffdK\ufffd1\ufffd_\ufffd\ufffd\ufffd\ufffd`L\ufffd\ufffdDqc\ufffdd\ufffd\ufffd\uc89f\ufffd\ufffd{\ufffd9\ufffdI\ufffd\ufffd\u04e8s\ufffd\ufffd\u030deg\ufffdj$F\ufffdn>F\ufffd\ufffd\ufffdy\ufffdV\ufffd\ufffd\ufffd*\ufffd\ufffd\ufffd \u07c9"\ufffd\ufffdyl\ufffd\ufffd9W\ufffd\ufffdx*\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd>\ufffd$\ufffd1J\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdNmN4\u5973\ufffd\ufffd\ufffd\u0533\ufffd\ufffd\ufffd\ufffd33~\ufffd\ufffdK{\u0274\ufffdX[\ufffd$<_\ufffd\ufffd\ufffd\ufffd4\ufffdz\ufffd\ufffdh\ufffd8'Sa\ufffd\ufffd\ufffd%,\ufffd\ufffdM^N\ufffd2\u061a\ufffd\ufffdsr@(\ufffde\ufffd\u04fdo\u04cd\ufffd\u0790\ufffd \ufffd\ufffde\u02c5)\ufffd\ufffdP\ufffd\ufffd\ufffdd\ufffdD\ufffd\ufffd.\ufffd\ufffd\ufffd\u060c\u3108SU\ufffd\ufffdV#\ufffdq\ufffdYhx\ufffd\ufffdK\ufffdxX^\ufffd\ufffd\ufffd\ufffdB\ufffd\ufffdd\ufffd2[\ufffd\ufffd\ufffdq\ufffd\ufffd\ufffd0\ufffdF$	\ufffd M MZ	\ufffd{+\ufffda\ufffd=\ufffd\ufffd_,\ufffd\ufffdDI\ufffd\ufffd\u032c\ufffdr\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd4}8I\ufffd\ufffd\ufffd\ufffd\u010b\ufffdr*\ufffdpr\ufffdLL	\ufffdb,\ufffd[\ufffd\ufffd\ufffdnT\ufffdF\ufffd\ufffdS4j%\u07d3\ufffd\ufffd\ufffd\ufffd]\ufffd\ufffd\ufffd\ufffd/\ufffdk\ufffd\ufffd,A4\ufffdt\ufffd*\ufffdi\ufffdy\ufffd\u05b0\ufffdj\ufffd\ufffd\ufffd\u0769AS\ufffdH\ufffdL>\ufffd\ufffds\ufffd\ufffd\ufffdX\ufffdG,E\ufffdY\ufffd
 \u0730\ufffd0a\ufffd\ufffd(*\u02efq){\ufffd\ufffd\ufffd\ufffdW\ufffdM\ua463\u0573\ufffdo\ufffd\ufffd\ufffd75\u06e9\ufffd\ufffd\ufffdZ\u017a\ufffd\ufffd\u0192\ufffd\ufffd\ufffd\ufffd\ufffd\?\ufffdW\ufffdpAW\ufffd1){\ufffdKjK:\ufffd\ufffd\ufffd\ufffd6gyCQk\ufffd\ufffd\ufffd~\ufffdo\ufffd\ufffd"(\ufffdY\ufffd\ufffd\ufffd{6>{\ufffd\u01ddv\ufffd\ufffdu\ufffdWx/s%\u040b\ufffd\ufffd\ufffd\ufffd\\ufffd5\ufffdO$\ufffd\ufffd<W\ufffdz\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd~j\ufffd\ufffd\ufffd\ufffdT\ufffdQL\ufffd\ufffd\ufffd+\ufffd\ufffdZ>\ufffd\ufffd\ufffd(a\ufffd\ufffd\ufffd\ufffd\u01fc4\ufffdouJ$\ufffdv\ufffdPw7ay\ufffd\ufffdc\ufffd
+gU\ufffd\ufffd@U\ufffd\ufffd\ufffd\ufffd J?\ufffd	\ufffdl\ufffd\u01ae\ufffdW\ufffd\ufffd5zj\ufffd\u0429q\ufffd/v\ufffd\ufffdo\ufffd\ufffd\ufffd\ufffd\ufffdtk[\ufffdo\ufffd\ufffd\X\ufffd'\ufffdT\ufffdg\ufffd\ufffd]\ufffd>\ufffd\u0630G^:\ufffd\ufffd4\ufffd6P\ufffd\ufffd~\ufffd\ufffd\ufffdbqV\ufffd=rRRr\ufffd\ufffdSg?<X\ufffd-i\ufffdiN\ufffd\ufffd\ufffd\ufffdj=\ufffd;\ufffd\ufffde\ufffd\ufffd\ufffd\\ufffd\ufffd\ufffdJ\ufffd\ufffdX\ufffdr\ufffd\ufffd\u5b31l\ufffd8\ufffd\ufffdi�\ufffd6\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd~0\ufffdlq\ufffd\ufffd\ufffd\ufffd\ufffdl\ufffd\ufffdq\ufffdo\ufffd%[J\ufffdB\ufffd\ufffd$\ufffd\ufffd\ufffd2]:\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufab3I7-8\ufffdT\ufffd\ufffd\ufffd*GV\ufffd\ufffd>~\ufffd\ufffdP\ufffd\ufffd\ufffdP\(\ufffd7\ufffd\ufffd\ufffd\ufffd\
+~\ufffd\ufffd\ufffd\ufffd|\ufffdS�5\ufffd\ufffdU
+:\ufffd<\ufffd'\ufffd\ufffdl\u06f3\ufffd7k\ufffdt&cU\ufffd\ufffd\ufffd~\ufffd\u065fu\ufffd[\ufffd\ufffd{~\ufffdk\ufffd\u5eeb#\ufffd94P\ufffd\ufffd\ufffd}\ufffd\ufffdo\ufffd=\ufffd\ufffd\ufffd}!\ufffd\ufffd\ufffd\ufffd\ufffd#u\ufffd\ufffd/}ml\ufffdD\ufffd\ufffd\u0459jC~K\ufffd\ufffd\ufffd\ufffdl\ufffd5\ufffd\ufffd\ufffd\ufffd\ufffd+\ufffd\u01f5l:\ufffd\ufffd\u01dd\ufffdl\ufffd\ufffd\ufffd9\ufffd\ufffdR0\ufffdTt\ufffdf\ufffd}\ufffdLsN\ufffdA.\ufffd
+\ufffdz\ufffd\ufffd%\ufffdc\ufffd-\ufffd\ufffd\ufffd=:\ufffd[\ufffd\ufffdPEVI\ufffdVY\ufffd\ufffd\ufffd\u045d\ufffd\ufffdHD\ufffdj\ufffdzu\ufffd~\ufffd#\ufffd\ufffdDn\ufffd\ufffdg\ufffd]\ufffd\ufffdR|\ufffdW\ufffd0\ufffd\ufffd\ufffd\ufffd{\ufffd
+e\ufffdx3\ufffd\u01b4\ufffdMH\ufffd:cM\ufffdBM\ufffd\ufffdy\ufffd\ufffd\ufffd4\ufffd9YjP\ufffd?9\ufffd\ufffd\u04e9\ufffd\ufffdJi\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdG\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdy
+\ufffd\ufffd:\ufffd\ufffd\ufffd\ufffd\\ufffd\ufffdn\ufffd]dqW\ufffd\ufffd>c\ufffd�\ufffd;\ufffds\ufffd\ufffd\ufffd\ufffd\ufffd
+\ufffd\ufffdp\ufffd\u039b+Lj\ufffd\ufffd\\ufffdVH\ufffd\ufffdVM\ufffdT#K\ufffd\ufffd\ufffd:S\u04fd}^\ufffdI\u0313*4b\ufffd\ufffd\ufffd:_j\ufffd=|\ufffd\ufffd|r\ufffd\ufffdVb\u0415x\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdeT\ufffd-:Y\ufffd&\ufffd\ufffd\u034dm\ufffdC\ufffd\ufffdd\ufffd\ufffd\ufffd\u01fb\ufffd\\ufffd
l\ufffdo\ufffd2\ufffd\ufffd\ufffdl\ufffd\ufffd\ufffd\ufffd\u0442\ufffdC5\ufffd-\ufffd\ufffd\ufffd\ufffd\ufffdR~ W\ufffd6\ufffd[d\ufffd\A\ufffdXj\ufffd\u9e0bG)}\ufffd53'\ufffd%\u02cc\ufffd\ufffd:\u053c\ufffd\u0672w\ufffd]\ufffds\ufffd\ufffd\ufffdU#\ufffd\ufffdM\ufffdz\ufffd\u055d\ufffdl\ufffd\ufffd";U`)P\ufffd\ufffd\ufffd\ufffd=\ufffd\ufffdJ\ufffdd\ufffd{t\ufffd6:\ufffd!\u061c8\ufffd\ufffd\\u0511P\ufffdf\ufffdy\ufffdE\ufffd\ufffd\ufffdQ\ufffd\ufffd\u039cg\ufffd\ufffdp(\ufffd\ufffd\ufffdq	h9V\ufffd,sq\ufffds\ufffd\\ufffd\ufffd\ufffdEfS\ufffdA,6\ufffd\d\ufffdn\ufffd\ufffd[8\ufffd\ufffdq\ufffd
+-!\ufffdA\ufffd\ufffd\ufffd1[D\ufffdR\ufffdZL\ufffdt\ufffd\ufffd\ufffda\u0466R\ufffd\ufffdV\ufffd\ufffd>\ufffdU\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd|h7\ufffd\ufffd\ufffdd#9\u0628l\ufffdy\ufffd?c!\\ufffd\ufffd\ufffd7\ufffdq\ufffdi\ufffdp)\ufffd\ufffds\ufffd\ufffdh\ufffd}\ufffd=\ufffd\ufffd\ufffd\ufffd 	\ufffd\ufffd\ufffdN\ufffdsT\ufffd\ufffd\ufffd8\ufffd;Q\ufffd\ufffdX\ufffd?\ufffd\ufffd\ufffd)f\ufffd\ufffd\ufffd\ufffd\ufffd:\ufffd9kM\ufffd4E\ufffd\ufffdH\u01d6\ufffd\ufffd\ufffd\ufffd\ufffd8N\ufffd\ufffdeBe\ufffd\ufffdEJ\ufffdl\ufffd\ufffd\ufffdo~\ufffdP7\ufffd@OurZ\ufffdW\ufffd\ufffd\ufffduI\ufffd|\ufffdg\ufffdc\ufffd\ufffdO\ufffd\ufffdR\ufffdW\ufffd\ufffd\ufffd\ufffdM\ufffdO\ufffd\uae8e-K\ufffd\ufffd\ufffd\ufffd\ufffdu\ufffd\u03a0U\ufffdg\ufffd\ufffdd\ufffdG)	m[\ufffd\ufffd+\ufffd\ufffdx\ufffd\ufffd\ufffd\ufffd\ufffdtl\u0257\u0675q\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u06be*\ufffdV/\ufffd+b\ufffd\ufffde\ufffdY4\ufffd\ufffd\i\ufffd\ufffdt\ufffde\ufffd8\ufffd\ufffd\ufffd]u\ufffd\ufffd/\ufffd\ufffd\ufffd\ufffd<\\ufffd\ufffd0\ufffd\ufffd\ufffd\ufffdrW{ii\ufffdK\u019e\ufffde\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdk\ufffdb\ufffdW\ufffd\ufffd\ufffd*.\ufffd:\ufffdxf\ufffd\ufffdx\ufffd}\ufffd	\ufffd\ufffd'T/\u0528P\ufffdg\ufffd\ufffd\ufffdx\ufffd6\ufffder\ufffd\ufffdKj\ufffdl\ufffd\ufffd\ufffd\u0582\ufffd,\ufffd\u0455#\ufffd\ufffdd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd=>8\ufffdH>l\ufffd$\ufffd\ufffdRl\ufffd\ufffd\ufffd\u035b\ufffd\ufffd\ufffdL\ufffd\ufffdJ\ufffdg\u076f6\ufffd\ufffd\ufffdV9\ufffd\ufffd\ufffd\ufffd\u0115\ufffd\ufffd778l\ufffd\ufffd\ufffdX\ufffd#1\ufffd\ufffd\ufffd?\ufffd\ufffdo\ufffd\ufffd\ufffd\ufffdS\ufffd\ufffd\ufffd
\ufffdt\ufffd d\ufffd\ufffd\ufffd\ufffd
 G%\ufffdG\ufffd\ufffd\ufffd\ufffd\u0557\ufffd\ufffd\ufffd\ufffdz\ufffd"\ufffd8\ufffd\ufffdv\ufffd|\ufffd\ufffd$\ufffd9\ufffd\ufffd6\ufffdS)\ufffd\u0263\ufffdb_\ufffd\ufffd6\ufffd*)v\ufffd\ufffd\ufffd7\ufffd\ufffd\ufffd\ufffdU\ufffd\ufffd\u0175uU\ufffd\ufffdS6_v\ufffdRF\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdtg\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdJ\ufffd)i+\ufffd4df\ufffdDj;\ufffdm\ufffd\ufffd\ufffd|#\ufffd\ufffd\u06b2Y\ufffd)\ufffd\ufffd\ufffd\ufffdl\ufffd\ufffdt\ufffd\ufffdP\ufffd\ufffd*\ufffd\ufffd+\ufffdkL2\ufffd+[\ufffdq\u0632r*;\ufffdC\ufffd_k\ufffde\ufffd\ufffdj\ufffd\ufffd\ufffd5\ufffd\ufffd\ufffdp\ufffdd\ufffd[\ufffd*7\ufffd)\ufffdV\ufffd+\ufffd\ufffd"\ufffd\ufffd\ufffd|D\ufffd7Iz\ufffd\ufffd>\ufffd\ufffd\ufffdd\u013d\ufffdu\ufffdt_]\ufffd74\u055c\ufffdD\u0568:\ufffd~s\u96c1\ufffd\ufffd\ufffd\ufffd\ufffd4\ufffd\ufffdiw7\ufffd\ufffd[Wu\ufffd\ufffd\ufffd\ufffd\ufffdp\ufffd\ufffd\ufffd@\ufffd\ufffd\ufffd\ufffdZ$Q\ufffd\ufffdV\ufffd!\ufffd:\ufffd\ufffd<j\ufffdk\u06f78O\ufffd\ufffd\ufffd\ufffd)\ufffdV\ufffd\ufffd\ufffdVPc\ufffdf\ufffdzU\|Yj(T\ufffd\ufffdT\ufffdS~\ufffds\ufffdS[\ufffd&%\ufffd8U\ufffd\ufffd\ufffdbm\ufffd\ufffd\u0147mn%/\ufffdp\ufffd\ufffdR\ufffdb\ufffd\ufffd\ufffd\ufffd
+\ufffdw\ufffd.-\ufffd2\ufffd\ufffd\ufffd\ufffd7=8\ufffd\ufffdPW-R\ufffdZ%\ufffd\ufffd\ufffd7\ufffd\ufffd9f\ufffd\ufffd\ufffdVS\ufffd\ufffd\ufffd\ufffd\ufffdX\ufffdF\ufffd\ufffd\ufffd\ufffdu\ufffd@]Z\ufffdp\ufffd\ufffd
+\ufffd\ufffdV\ufffd\ufffd\ufffdwW\ufffd\ufffd\u03ac\ufffd
+\ufffd_dg\ufffd\ufffdo"\ufffd\ufffdp0o\ufffd\ufffd\ufffdU2\ufffd\ufffd\ufffdu-h|\ufffd~\ufffd%\ufffdq9I\ufffd\ufffd)\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdP\ufffd\ufffdT\ufffd\ufffd\ufffd\ufffd\ufffd\u04cf\ufffd?&+t\ufffd*.\u0465,\ufffd's\ufffd\ufffdT\ufffd\ufffd\ufffdV\\ufffd\ufffdg\ufffdGL
+{a\ufffd	[e"\ufffd3K\ufffd
+\ufffd \ufffd-v\ufffd\u04da\ufffdLA,\ufffdw\ufffd\ufffdr\ufffdscs}\ufffd\ufffdk$j\ufffd\ufffd!\u4127w%\ufffd\ufffd\ufffd)$yB d\u07d8\ufffd5G
+@W\ufffd\ufffdz\ufffd\ufffd\ufffda\u04a4\ufffd[Z\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd7\ufffd\ufffd\ufffd'G\ufffd\ufffd\ufffdST\ufffd\9Q[r\ufffdf\ufffd.5M\ufffd\ufffd'\ufffd\ufffd\ufffd<DA\ufffd\C\ufffd\u01c4\ufffdb\ufffd\ufffd?\ufffd\ufffd\ufffd\ufffd\ufffd\u0249Z\ufffdx\ufffd\ufffd\ufffd`y G'\ufffd\uc2a9m"G\ufffduh\ufffd\ufffd`\ufffd\ufffdR\ufffd\ufffda\ufffd\ufffd\ufffd\ufffd&9\ufffd/\ufffd&\u0508\ufffd\ufffdI\ufffd!.\ufffds\ufffd\u01c4\ufffd\ufffd!. \ufffd\ufffd \ufffd\ufffd\u05d4\ufffd\ufffdNS\ufffd\ufffd\ufffdr\ufffd\ufffd\ufffd\ufffd+\ufffd\ufffdr\ufffd\ufffd	x\ufffd\ufffdK\ufffd/\ufffd\ufffd\ufffdG\ufffd\ufffdH\ufffdJzS@	\ufffd'\ufffd&\ufffd%\ufffdH\ufffd\ufffd\ufffd\ufffd\u049ar.\ufffd\ufffdTEjo\ufffd\ufffd\ufffd2\ufffd|T@\ufffdJ_\ufffd\ufffd\ufffd\ufffd\ufffdF\ufffd](G-\ufffdp(\ufffdh\ufffd\ufffd\ufffd\ufffdE|N\ufffd\ufffd\ufffdQ1\ufffd\ufffd}\ufffd\ufffd\ufffdV\ufffd&=0.E\u017c\ufffd`\ufffdG#\ufffd\ufffd(\ufffdv\ufffd\D~\ufffd+\ufffd\ufffdDZ\ufffdI\ufffd[\ufffd\ufffd)\ufffd\ufffd =\ufffdC}p\ufffdF}d2S\ufffd\ufffd	#=q\ufffd7n_\ufffd\ufffd\ufffd\u05fcC\ufffd[\ufffd\ufffda\ufffd\ufffd8\ufffd\ufffd\ufffd\ufffdI?\ufffd\ufffdC]\ufffdz\ufffd&\ufffdt\ufffd\ufffd\ufffdc\ufffd\ufffd\ufffd\ufffdf\ufffd\uc74f\ufffdK?7Kq\ufffd\ufffd(\ufffd\ufffd8k\ufffd0\ufffd8\ufffd\u012bpq\ufffd\ufffd0)Z?\ufffd\ufffda|\ufffd@D2\ufffd\ufffd8\ufffde\ufffd
+\ufffd\\ufffd\ufffd6<ga\ufffdii\ufffdA$\ufffdo\ufffd1\ufffd]\ufffd\ufffd\ufffd\ufffdXu=\ufffd\ufffdC\ufffd\ufffd\ufffdn\ufffd\ufffdu\ufffd\ufffd\u04cb$\ufffd$B$\ufffdJQ\ufffdP2\ufffdO\ufffdQ.\ufffd\u0283\ufffd\u0541\ufffd\ufffdg0\u07f8=\u020b|PC]D!\ufffd\u0560ZT\ufffd\ufffdQ\ufffdPjF-\ufffd\ufffd\ufffdv\ufffd\ufffd6\ufffd0\u0684\ufffd\ufffdf\u050dzXi9\ufffd\ufffd\ufffd\ufffddL1;B/\ufffdp\ufffd\u06f5K\u0419wa\ufffdL\ufffd	D\ufffdt\ufffd\ufffd\u0505\ufffdD:\ufffd\ufffd\ufffdDWt
+\ufffd\ufffd\ufffdB*\ufffd\ufffd\ufffds\ufffd^\ufffd\ufffds\ufffd\ufffd9A\ufffd")\u0799\ufffd\ufffd!\ufffd?1\ufffd\ufffd\ufffd\ufffd|\ufffd\u038797t\ufffdZ	^\ufffd\ufffd\ufffd$DA\ufffd\ufffd\ufffdr\ufffdP\ufffd.@"\ufffd\ufffdP/\ufffdd\ufffd\ufffd\ufffdT\ufffd\ufffd=\ufffd\ufffd\ufffdw\ufffd\ufffd\ufffd\ufffdL\ufffdS\ufffd>\ufffd\ufffd\ufffd";y>AOE=\ufffd$\ufffdB\ufffdG%\ufffdB\ufffdI\ufffdWON\ufffd\ufffd\ufffd:
+55\ufffd\ufffd#\ufffd!M\ufffd\u0100]S\ufffdj\u0699[\ufffd\ufffd\ufffd\ufffd\u0661\ufffdC\ufffdvT\ufffd&\ufffd\u0685f\ufffdA\ufffdh\\ufffd0aj
v\ufffd\ufffd@b\ufffdQ\ufffd@\ufffdW\ufffd@\ufffd�\ufffd\ufffdS\ufffd\ufffdh\ufffdC\ufffdk\ufffdD\ufffd\ufffd\u0279IM\ufffd\ufffd\ufffd\ufffd08\ufffd$\u031a\ufffdY\ufffd14\5\ufffd\ufffdi8
6MNL\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u0108\u01a6Y~X\ufffd\ufffdl\ufffd\ufffd,\ufffd]\ufffd8\ufffd'\ufffd" \ufffd#0\ufffd\ufffd\ufffd\ufffd\ufffdNHY\ufffd\ufffd\ufffdN\ufffd\u030eMNh
+\ufffdN\ufffdf~\ufffd\ufffd2\ufffd\u0410\ufffd\u41aby4Z\ufffd\ufffd6[,�76\ufffd\ufffdh\ufffdf"\ufffdC\ufffd\ufffd\u0338frx\ufffdMV cU\ufffdc\ufffdD@}C\ufffd\ufffdf\ufffd8\ufffd&Yd\ufffd\ufffdK\ufffdc\ufffd\ufffd\ufffd>\ufffd\ufffd\ufffd\ufffd
Eb\ufffd<dm\ufffdX{\ufffd\ufffd8\ufffdb\ufffd\ufffd\D3?1:61\ufffd\ufffd\ufffd04\ufffd\ufffd\u07e5\ufffd\ufffdvp\ufffd <4\u01eeq\u060c\ufffdP\ufffd\u2bb2FC\u04e0~\ufffdY\ufffd\ufffdz`F\ufffd\ufffdJ\ufffd\ufffd\ufffd\ufffd!\ufffd\ufffdb\ufffd\ufffdd\ufffd1\ufffd \ufffd\ufffdI\ufffd\ufffd\ufffd\ufffd3X\ufffd$\ufffd\ufffd<\ufffdujg\ufffd1\ufffd?\ufffdD\ufffd6\ufffd\ufffd;w\ufffdc\ufffde\ufffd\ufffdg\ufffd\ufffd\ufffd&\ufffdp\ufffd\ufffd\ufffd\ufffd\ufffd\u0568\ufffdy\ufffdm\ufffd\ufffd#5\ufffd
M\u0302\ufffd\ufffd'\ufffdf4s\ufffdC\ufffd\u02a9\ufffd\ufffdw\ufffd5KnXhwBv.C\ufffdw6\ufffd!F\ufffd\ufffd\ufffdc2ze\ufffdS	\ufffd"0/>Z\ufffdL>P\ufffd:r!\ufffd\ufffd+\ufffda\ufffd'gF\ufffd8\ufffdYGc]u\ufffd\ufffd#dcP\ufffd\ufffd\ufffd\ufffd
+\ufffdv\ufffd<:u\ufffdVWJ\ufffdJ#8^5\ufffd\ufffds!YV:\ufffd\u0370\ufffd\ufffd\ufffd\ufffdw\ufffd\u0796V\ufffd?\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdK\ufffd\u03b0\ufffd"\ufffd,\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd$
 endstream
 endobj
-240 0 obj
+239 0 obj
 << /Type /FontDescriptor
-/FontName /AAAABB+NotoSerif-Bold
-/FontFile2 239 0 R
+/FontName /AAAAAY+NotoSerif-Bold
+/FontFile2 238 0 R
 /FontBBox [-212 -250 1306 1058]
 /Flags 6
 /StemV 0
@@ -29120,7 +29025,7 @@ endobj
 /XHeight 1098
 >>
 endobj
-241 0 obj
+240 0 obj
 << /Length 1286
 /Filter [/FlateDecode]
 >>
@@ -29130,46 +29035,38 @@ x
 \ufffd\ufffd\ufffdJ\ufffd\ufffd\ufffdJ\ufffd\ufffd\ud2b9\ufffd\ufffd\ufffdx\ufffd\ufffdx\ufffd\ufffdx\ufffd\ufffd+\ufffd!�w\ufffd\ufffdB\ufffdx\ufffdb\ufffdx\ufffd\ufffd+\u0781\ufffdr\ufffd;\ufffd\ufffd2\ufffd\ufffdk\ufffd\u039c\ufffdJ\ufffdY\ufffde\ufffdY\ufffd\ufffd7+|\ufffd\ufffdx\ufffdoS\ufffd\ufffd7+[\u019be\u021b\u05day\u07a2oV\ufffd\ufffd\u6d56-\u3b4c\ufffd\ufffd\ufffd"\ufffd\ufffd\ufffdR\ufffdW\ufffd*\ufffd\ufffd4Xq\ufffd\ufffdC\ufffd^J\ufffd[(\ufffd\ufffd^\ufffd1\ufffd�\ufffdy]\ufffd\ufffd\ufffdk\ufffd}\ufffdYM-x\ufffd\ufffd\ufffd\ufffdV\ufffdz\ufffd\ufffd\ufffd\ufffd\ufffd[YE\ufffdV\ufffdY\ufffd\ufffd\ufffd_}/7\ufffd*\ufffdY%\ufffd\ufffde\ufffd\u04ebq+\ufffd\ufffd:\ufffd\ufffd.\ufffd7\ufffdJ\ufffd\ufffd\ufffdE\ufffd/\ufffd3Y(Y\ufffd*A\ufffdW	R\ufffd\ufffdVJS\ufffd\ufffd\ufffd\ufffd\ufffd:(u@c\ufffd\ufffdD\ufffd]a*\ufffd\ufffdf)\ufffd9J\ufffd\ufffd\ufffd)\ufffdo,#\ufffd\\ufffdZ>M\ufffdU\ufffd\ufffd\\ufffdjPS\ufffd
{HS\ufffd\ufffdM\ufffd\ufffd\ufffdj\ufffd\ufffd\ufffd\ufffd{fk\ufffd\ufffd\ufffdyG\ufffdm[z*E\ufffdsa\ufffd\ufffd>\ufffd&\ufffd\u04eb\ufffd\ufffd\ufffdj%u\ufffd\ufffd\ufffd;\ufffd2^\ufffd\ufffd\ufffdW\ufffd[\ufffd\ufffd\ufffd�\ufffdv\ufffd[\ufffd\ufffd\ufffd2\ufffd\ucbf2u\ufffd[\ufffd\ufffd\ufffdP\ufffd:\ufffd\ufffd\ufffdV\u0321\ufffd\u0545>\ufffdM\ufffd\ufffdBi2.\u0126\ufffd\ufffd\ufffd\ufffd\u0507!\ufffd\ufffd\ufffdd\ufffdk\ufffd`\ufffd\ufffd\ufffd=o\ufffd\ufffdqW\u0795wdJF(\ufffdL164\ufffdU\ufffd\ufffd)\ufffdx0E\ufffd~\ufffd\ufffdZ?\ufffd=\ufffd\ufffd/\ufffd\ufffd\ufffd\ufffd\u03af\ufffd\ufffd\ufffd~:\ufffdo?$\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdO
 endstream
 endobj
-242 0 obj
+241 0 obj
 [259 1000 1000 1000 1000 1000 1000 1000 399 399 1000 1000 1000 1000 293 1000 1000 559 559 559 559 559 559 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 752 1000 667 767 652 621 769 1000 400 1000 1000 653 952 788 787 638 1000 707 585 652 747 698 1066 1000 1000 1000 1000 1000 1000 1000 1000 1000 599 648 526 648 570 407 560 666 352 345 636 352 985 666 612 645 1000 522 487 404 666 605 855 1000 579 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1
 000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000]
 endobj
-243 0 obj
-<< /Length1 6820
-/Length 4670
+242 0 obj
+<< /Length1 6920
+/Length 4731
 /Filter [/FlateDecode]
 >>
 stream
-x\ufffd\ufffd8tS\u0556g\ufffd\ufffdI\ufffd\ufffd\u0377ZJ\ufffd\u06e6-M\ufffdI\ufffd\ufffd\ufffdi\ufffd\u0690\ufffd%\ufffdH-M?`\ufffd\ufffd\ufffdO*<\ufffd\ufffd\ufffd\ufffd3\ufffd\ufffd@\ufffdEdg\u0525<\ufffdY\ufffd\ufffdx\ufffdax:\ufffd\ufffd\ufffd\ufffd\u03c7<{;\ufffd\ufffd{[\ufffdyk\u079aI\u05fe\ufffd\ufffds\ufffd\ufffd\ufffd\u03f9%@\ufffdCrI$y\ufffd\ufffd\ufffd}p.\\ufffdL\ufffd\ufffd{\ufffdw%g\ufffd\ufffdp~\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd*~UL\ufffd\ufffdI\ufffd\ufffd\ufffd{\ufffd\ufffdr\ufffdu\ufffd({z:\u06e3\ufffd\ufffdo\ufffd\ufffd~j_\ufffd\ufffd \ufffd"+\ufffd\ufffd\ufffdu\ufffd9\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd880<\ufffd\ufffd2'\ufffd\ufffd\\ufffd\ufffd\ufffd\ufffd}\ufffd\ufffd\ufffdp\ufffdiB\ufffd\ufffd	\ufffd9\ufffd\H^\ufffd}\ufffd\ufffd\ufffd\ufffd}\ufffd\ufffdP\ufffd`\ufffd\ufffd,-!s\ufffddw
v\ufffd\u015d\ufffd9\ufffd\ufe44\ufffd\u038e\ufffd#zXYO\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd'\ufffdAN\ufffd\ufffd\ufffd\ufffd1"\ufffdQ\ufffdfG\ufffd\u0319\u064cE(Uj\ufffdVO\ufffdy\ufffd\ufffd$/\ufffdR\ufffd\ufffd4\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd(\ufffdd\ufffd\ufffd\ufffd\u0373X\ufffdmvG\ufffd\ufffd�\ufffdg\ufffd\ufffd\ufffd\ufffd\u05d9\ufffd\ufffd~\ufffd\ufffd\u07c3\ufffd\ufffd\ufffd\ufffdUCdD\ufffd[e\ufffd\ufffd\ufffd\ufffdo"\ufffdb\ufffdk0\ufffd\ufffd&\ufffd2\ufffd\ufffd\ufffd\ufffdH"YH\ufffd\ufffdfupV\ufffd:N\ufffd\ufffd@\ufffdk\ufffd\ufffdB\ufffd\u02a7
-!\ufffd\ufffd'8\ufffdj\ufffd:\ufffd\u041fJx\ufffd}\ufffd}8\ufffd\ufffd?\ufffd\u0738\ufffd\u033dij\ufffdQ2\u076btXcA\ufffd\ufffdm:\ufffd\ufffd\ufffd\ufffd\ufffdei5\ufffdl\ufffd\ufffd\ufffd\ufffdma\ufffd\ufffdw\ufffd\ufffdK\ufffd
-\ufffd	Jc\ufffd\ufffdI\u0234v\ufffdb\ufffd\ufffd\ufffddB\ufffd\ufffd\ufffd\ufffd>E\ufffd"]\ufffd\ufffdHw$\ufffd[x\ufffd\ufffdu5\ufffd\ufffd5\ufffdOz*\ufffd5\ufffd)\ufffdo\ufffdl\ufffd	\ufffdf\ufffd
-\ufffd/x\ufffd\ufffd#P\ufffd\ufffd!\ufffdA\ufffdR@^.\ufffd\ufffdk\ufffd("\ufffd\u065e\ufffdf\u057d\ufffd\ufffd\ufffd\ufffd\ufffdz\ufffd\ufffd'p\ufffd\ubcc08�\ufffd\ufffd\ufffd\ufffd\ufffdO<
-\ufffd\ufffd\ufffdS?\ufffd)z\ufffd\u0111fI\ufffd%\ufffdjciJ6\ufffdw\ufffd&\ufffdj\ufffd\ufffd\ufffd\ufffd#\ufffd"\ufffdi\ufffd\ufffd]a\ufffd;\ufffdR!	\ufffd\ufffd
-\ufffd\ufffd\ufffd/-(\ufffdWS\ufffd}\ufffdX U&/\ufffd\ufffdq\ufffd\ufffd\ufffdghh\ufffdq\ufffdZ\ufffdc(z\u05a0JW\ufffdV\ufffd\ufffd\ufffd\ufffd\ufffdm\ufffdY\ufffdz\u04888>\ufffd9\ufffd\ufffd\ufffd\u0463:\ufffd\ufffd`S\ufffd\ufffd\ufffd\ufffdn\ufffd\ufffd\ufffd#\ufffd\ufffd\ufffdWV6\ufffd\ufffd\ufffd\ufffd\ufffdn7h>\ufffdXXcy\ufffd\ufffd3F\ufffd\ufffd8\ufffdgS\ufffd6\ufffdx\ufffdV\ufffd\ufffd\ufffdbL\ufffd%\ufffd\ufffdb\ufffd7f\ufffdM\ufffd\ufffd\ufffd(:\ufffd\ufffd@\ufffd\ufffd\ufffd\ufffdfl\ufffd\ufffdh\ufffd
\ufffdvK\ufffd\ufffd\'\ufffd\u06b4t'K<t9ZSwhi\ufffd\ufffd\ufffd\ufffdV\ufffd\ufffdZ\ufffd\u2b98<\ufffd\ufffd
1F\ufffd"\ufffda#\ufffd l\ufffd\ufffd\ufffd\ufffd	\ufffd[\ufffdOnj\ufffdG\ufffdCyrX,|\u0444L\ufffdN\ufffd\ufffd\ufffd\ufffdQ\ufffdx\ufffdjf\ufffd\u0422\ufffd6\ufffdc4?\ufffd\u079fQY\ufffd,-Z\ufffda\ufffd\ufffdu+\ufffd*\ufffd\ufffdx\ufffd\ufffd\ufffd\ufffd
\\ufffdJ\ufffdaL\ufffd\u04d1\ufffd;\ufffd\ufffd\ufffd7\ufffd$\ufffd\ufffd\ufffd\ufffdOew\ufffd]lr\ufffd\ufffdGV\ufffd\ufffd'X\ufffd\ufffd\ufffd\ufffdh\ufffd3*\ufffdBc\ufffdp?\ufffd\ufffdc\ufffd\ufffd
\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd	zi\ufffdU\ufffd-\ufffdC[*\ufffd\ufffd\ufffd\ufffd\u0300\ufffd\ufffd\u0432\ufffd*\ufffd-
-]22w\ufffd\ufffd-\ufffdW]V\ufffd\ufffd\ufffd\ufffd\ufffd^\ufffd%\ufffd\ufffde\ufffd\ufffd\ufffd\ufffd\u5b34G\ufffdE\ufffd\ufffd\ufffd]\ufffd\u0252@,\ufffd^#\u01ac\ufffd0\ufffd\ufffd'(\ufffdS\ufffda\ufffd8\ufffdW\u03eek>j\ufffd\u65cem\ufffd:R\ufffd\ufffdF\ufffd\ufffd{\ufffd{a\u057cW\u03de\ufffd-\u04d1\ufffd\ufffd#\ufffd\ufffd(1i\ufffd0-\ufffd\4\ufffdq\ufffd\ufffd\u031b\ufffdb\ufffdA\ufffd[\ufffd\ufffd%=;6\ufffdG\ufffd\ufffd\ufffd\ufffd\ufffdC\ufffd\ufffd\ufffd/0\ufffdC\ufffd0\ufffd\ufffd\u068bYc\ufffdSa\ufffd\ufffd\ufffd_\ufffd\ufffd
-\ufffd\ufffd_\ufffd\ufffd\u07fb\ufffd%7\ufffdI\ufffd\ufffd\ufffd\ufffdX\ufffdx9\ufffd\ufffd?\ufffd>\ufffd1D\ufffd\ufffd\ufffd\ufffd4\ufffd|o\ufffd|:B\ufffdTX\ufffd\ufffd\ufffdUJ\ufffd%Agd\ufffd\ufffdy\u2ada\ufffdd\ufffd\ufffdY\ufffd8z\ufffdX\ufffd\ufffd\ufffd\ufffd`+\ufffdi\ufffd\ufffd\ufffd\ufffd\ufffd{5\ufffd\ufffd([&zI\ufffd\ufffdp\ufffdkt\\ufffd\ufffdn\ufffd\ufffdvOc\ufffd,\ufffd\ufffd \ufffd_T\ufffd\ufffdD\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u0597/\ufffd+\ufffdny\ufffd~\ufffd\ufffd\ufffd\ufffdR\u03b3;\ufffdk\ufffd\ufffd'\ufffd\ufffd\ufffd\u038bz1\ufffdO\ufffd\ufffd\u0603z\ufffd\ufffdd|`\ufffd`\ufffd@\ufffd\u0244?\ufffd(\ufffd\ufffd\ufffd0\ufffdk\ufffd\ufffd_F5]\ufffd2#@\ufffd\ufffd\ufffdpn\ufffd\ufffd^\ufffdp\ufffd\ufffdD_\ufffdH4\ufffdT\ufffd6O\ufffd@\ufffd4\ufffd\ufffdh\ufffd\ufffdy&\ufffdF\ufffd\u05a3.\ufffdx\ufffdc*^)O1*\ufffd\ufffd\u0498"W\ufffd
-]\ufffd~\ufffd\ufffd\ufffd\ufffdRz\ufffd\ufffd\ufffd#\ufffd\ufffd\u47f7A\ufffdm\ufffda\ufffd\ufffd\ufffdx\ufffd\ufffdG\ufffd\ufffd\ufffd\ufffdPa\ufffdbu\ufffd\ufffdY\ufffd\ufffd\ufffdF{\ufffd\ufffd5YIIY\ufffd
-\ufffd\ufffd\ufffdC\ufffdk\ufffd\ufffdk\ufffd\ufffd\ufffd\ufffd>Q\ufffd5\ufffdSW1;\ufffd\ufffd
e\ufffd\ufffd\ufffd#dB\ufffdM%\ufffdn\ufffd3\ufffd\U000ac66e\ufffd\ufffd\u03bdAp6\ufffdv\ufffd\ufffd\ufffd\ufffd\ufffdR]sa\ufffd\ufffd\ufffd\ufffd\ufffdH\ufffd#\ufffd\ufffd*\u0450$AN\ufffda\ufffdK\u03c6,\ufffd\ufffdJ"\ufffd.-\ufffdYP\ufffdX\ufffd\ufffd[sQ\ufffd\ufffd\ufffdOr[kvg%\u0444\u04b6y454\ufffdIY\ufffd\ucf16\ufffd\ufffds\ufffd#\ufffdb\ufffdy\ufffdZ\ufffduX1\ufffdOHV$\ufffdmB\ufffd\ufffd\ufffd\ufffdv:#\ufffd:JMy\ufffdZ*\ufffd[G,%+\ufffdw\ufffd\ufffd[\ufffdWb\ufffd\ufffd\ufffd\ufffd\ufffdi|\ufffd\ufffd/\ufffd\ufffdJZt\ufffd\u0486\ufffdd\ufffdI\ufffdg|\ufffd!\ufffd\ufffd\ufffd\ufffd<\ufffd<\ufffd=\ufffdQ\ufffd#\ufffd \ufffd!.#0\ufffd\ufffd\ufffdZ\ufffd\u02f0	\ufffd\ufffdi
\ufffd,\ufffd\ufffdf7\ufffd\ufffdq\ufffdz]\ufffd\ufffdG\u0553\ufffdB\ufffd\ufffd\ufffdC\ufffd\ufffdp=\ufffdLn\ufffdk\ufffd\ufffd\ufffdF\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdSR\ufffd\ufffd\ufffd+\ufffdy\ufffd\ufffd5N\ufffd\ufffdy\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdI#\ufffd<\ufffd\ufffd\ufffd\ufffd|\ufffd\ufffd\ufffdx\ufffdk\ufffd\ufffdY\ufffdL\ufffd\ufffd\ufffdo\ufffd}\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdO\ufffd; \ufffd\ufffdXw\ufffd8K:\ufffd\ufffdc\ufffdl88\ufffd\u0330\ufffd*\ufffdSl\u0727\ufffd7\ufffd\ufffd:\ufffdzsZ\ufffd{v\ufffd\ufffdT
+e\ufffdX\ufffd\ufffdW\ufffdxX\ufffdi.\u02e0\ufffd\ufffdK\ufffdwG\ufffdk;rK\ufffde\ufffdT\ufffdlBWQ\u0346\ufffd8\ufffddeK\ufffd
\ufffd\ufffdk\ufffd\ufffd\u069e%~�\ufffd%\ufffd9\ufffd\ufffd\ufffd\ufffd'\ufffde\u0293kF\u028aJ\ufffd\ufffdqb\ufffd\ufffd\ufffd:\ufffdJ\ufffdL\ufffdXub\ufffd\u0324\ufffd]\ufffd+\ufffd\ufffds\ufffd\ufffdW
 \ufffd\ufffd-HK\ufffd).\ufffd\ufffd=\ufffd\ufffd\ufffd\u06ad\ufffd>4\ufffdk\ufffd\ufffd\ufffdQ\ufffd\ufffd\ufffd \ufffdX\ufffd\ufffd\ufffd\ufffd\ufffdi+\ufffd\ufffdV,\ufffd\ufffd\ufffd~V\ufffdMke\ufffd\ufffd==Ie\ufffd\ufffd\ufffdqL&\ufffd\ufffd\ufffdu\ufffd)RJ\ufffd8TH
-)\ufffd\ufffd*\ufffdS#D\u4926\ufffd[\ufffdwU{v\ufffd\ufffd\u02ae\ufffd\ufffd8\ufffd7|8\ufffd~~\ufffdV\ufffdIc\ufffd2M\ufffde\ufffdI\u036e\ua399v\ufffd\ufffd\ufffdV\ufffdfer>QYZ\ufffdq_\ufffdZ\ufffd(\ufffdo\ufffd\ufffd\ufffd8\ufffd\ufffd
-\ufffdT\ufffdk\ufffd\ufffd]
-\ufffd\ufffdH
\u04d1\u0556\ufffdb\ufffd\u062c\ufffd\ufffd�\ufffd\ufffd`\ufffdSy\u01dc\ufffd\u06664#\ufffd\ufffdo\ufffd^qz\u06bc\ufffd\ufffd\ufffd(\ufffd\ufffd'_\ufffd\ufffd\ufffd_<5k\ufffdkJ"\ufffd\ufffd\ufffd\ufffd\ufffdJ\ufffd\ufffd-\ufffdZE\ufffd\ufffdz\u0599s\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd_\ufffd\ufffd\ufffdqZ2\ufffd\ufffd-\ufffd\ufffda7\ufffd\ufffd\ufffdBhV\ufffd\ufffdi\ufffd^F\u06e9Y\ufffdT\ufffd5D\ufffdj\ufffd\ufffdSx\ufffd6\ufffd \ufffdH\ufffd\ufffd/v\ufffd-\ufffd\+\ufffd\ufffdj\ufffd&z\ufffdVr\u0285\ufffd<\ufffd&\ufffd\ufffd,\ufffdg\ufffd\u06f6<\ufffd\ufffd#=4j\ufffd&\ufffdu\ufffd\ufffd\ufffd	:\ufffd\ufffd^\u011d\ufffdn\ufffd\ufffd\ufffdi
\ufffd\ufffd\ufffdi\ufffde\ufffd\ufffd\u6ef5=I\U000224cf\ufffd\ufffdj\ufffd\ufffd\u01e4{\ufffd9\ufffdq6\ufffdk\ufffdt\ufffd\ufffdT8\ufffd\ufffdm\ufffd\ufffd\ufffd\ufffdh\ufffd-\ufffd\ufffd\ufffd\ufffd\ufffdu\ufffd\ufffd~\ufffd`s\ufffd\ufffd	6\ufffdYa\ufffd\ufffd\ufffd\ufffd:\ufffd\ufffdI\ufffd\ufffdB\u036ciP\ufffdU\ufffd\ufffd\ufffdQ\ufffd\ufffdl\ufffd%\ufffd\ufffd\ufffd\ufffd[\[\ufffd \ufffd^c\ufffd=\ufffd*\ufffdtz\ufffd\ufffd\ufffd7\u03f6\ufffd\ufffdj\ufffd\u043b\u052c\ufffdX\ufffd\ufffd\ufffd&|\ufffd_u\u05fd~\ufffd\u0555\ufffd_fT\ufffd\ufffd\ufffd\ufffd('Q\ufffd\ufffd\ufffd4\ufffd\ufffde\ufffd\ufffdV\ufffd}\ufffdlG\ufffd\u064e\ufffdv\ufffdF;Uo\ufffd?\u07f2\ufffd\ufffd\ufffdo\ufffd\ufffd\ufffd|M\ufffd\ufffdT\ufffdI5\ufffd$\ufffd $\ufffdBj:\ufffds\ufffd)\ufffd\ufffd\ufffd\ufffd3\u0516k\ufffd\ufffd>!.\ufffd\ufffd\ufffd\ufffd?\ufffd{\ufffd\ufffd\u05871\ufffd\ufffd\ufffdR\ufffd
-uC\ufffdi\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u0736PgO\ufffd\ufffd\ufffd"\ufffd\ufffd}\ufffd\ufffd\ufffdn\ufffd\ufffd\ufffd\ufffd\u0253\ufffdp\ufffd\ufffdB\ufffd\ufffd\ufffd/\ufffd\ufffd\ufffd�\ufffdN4*^\ufffd\ufffdQ\ufffd.[\ufffd\ufffd\ufffd\ufffd\ufffd[\u051b\ufffdK\ufffd9b\ufffdo#\ufffd\ufffd=gVw\ufffd\ufffd\ufffd\ufffd\ufffd%\ufffd\ufffd\ufffd]\ufffdXT\ufffdR\ufffd\u04b4\ufffd\ufffd.\ufffd\ufffdqIU;\ufffd\ufffd\ufffd\FV\ufffdI5IaE\ufffd\ufffd,a\ufffd\ufffd\ufffdi\ufffda\ufffdp[\ufffdaqa\ufffd\ufffd\ufffd\u0109\ufffd\u071c\ufffdl{\ufffd
-\ufffd\ufffd{'\ufffd\ufffd8\ufffd|vY,r\ufffd)\ufffd@#J\ufffdb5\ufffd\ufffdKX\ufffdN\ufffd\ufffd\ufffdg*\ufffd\ufffdh\ufffdQ\ufffd
-z\ufffdNS\ufffdL\ufffd\ufffd\ufffd\ufffd\ufffdd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd7z\ufffds\ufffd\ufffd\ufffd<\ufffd/\ufffd\ufffd=\ufffdK\ufffdhn\ufffd\ufffd\ufffdE\ufffd|F\ufffd\ufffd\ufffd\ufffd"\ufffdG\ufffd\ufffd?\ufffd\ufffd(\ufffd9X?Jg\ufffdx\u01ad7\ufffdwo\ufffd\ufffd\ufffdq\ufffd\ufffd \ufffd?\ufffd\ufffd\ufffd\ufffdc\ufffd\ufffd\ufffd\u0799\ufffd\ufffd\ufffd(\ufffd\ufffd1u\u022c\ufffd\u0475\ufffd\ufffdF}\ufffdo\ufffd\ufffd\ufffd\ufffd\u0264/\ufffd\ufffd9#.\ufffd\ufffdt2\ufffd\ufffdKc\ufffd|\ufffdy\ufffd?~uq\ufffdk\ufffd\ufffd	\ufffdt\ufffd=\ufffd\ufffd\ufffd\ufffd=\ufffdir\ufffd\ufffd#\ufffd\ufffd\ufffd]p\ufffd\ufffdM\ufffdD\ufffd4H{\ufffd\ufffd=C/\ufffd\ufffde12\ufffd, \ufffd_\ufffd]\ufffd}\ufffd\ufffdH\ufffd\ufffd\ufffdX1\ufffd`\u013e\ufffd\ufffd\ufffd"c"-\ufffd\u0351\ufffd#\ufffdE\ufffd\ufffd\ufffd\ufffd\ufffd\+7\ufffd\ufffd\ufffd~\ufffdNyX>!\ufffdR1_Q\ufffd*z;\ufffdQ\ufffd\ufffd\ufffdPL\ufffd\ufffd\ufffd5\ufffd\ufffd{\ufffd26!\ufffdF\u0214\ufffd\ufffdr\ufffd\ufffd|e\ufffd;\ufffd\ufffdE\ufffd"8\ufffd\ufffd\ufffd63B\ufffd\ufffdBHF\ufffdH<\ufffd\ufffd\ufffd\ufffd!\ufffd1\ufffd8\ufffd4g\ufffd]\ufffd4:$\ufffdJg\u0638\ufffd\ufffd6\u0666yYn\ufffd\ufffd\ufffd\ufffd}\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd%\ufffd\ufffd\ufffdo\ufffdf\ufffd\ufffd|\ufffd/\ufffd\ufffdR!\ufffdT\ufffd\ufffd\ufffd\\ufffd\ufffdF\ufffd\u0425\ufffd1\ufffd\ufffd=\ufffd\ufffdA\ufffd\ufffd\ufffd\ufffd\ufffdS\ufffd
-\ufffd5\ufffdFG\u03a2TF\ufffd\ufffd
-\ufffdSk\ufffdL~\ufffd8jvpY\ufffd^O\d6?%k\ufffd!\ufffdVp\ufffd\ufffdp\ufffd\ufffd/J\ufffd\ufffd\ufffd\u052f\ufffd\ufffd/\ufffd\ufffdB\ufffd\ufffd\ufffdD\ufffd\ufffd\ufffdJ\ufffd\ufffd[\ufffd
-\ufffdj0\ufffdt(\ufffd\ufffdp\ufffd=\ufffdF\ufffd$\ufffdd\ufffdL\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdsI\u04b3\ufffd|b#v\u0316\ufffd\ufffd\ufffd"\ufffdVw\ufffdr\ufffdY\ufffdq\ufffd\ufffdT\ufffdjR\ufffd\ufffdp)YFjIF\ufffdr\ufffd'\ufffd$\ufffd\ufffd|\ufffdd	\ufffd&\ufffdHF\ufffd]\ufffd\ufffd\ufffd\u0579\ufffde\ufffd\ufffdT	0\ufffd4)\ufffd\ufffd1K\ufffd6EZ\ufffd\ufffdKZ\ufffd\ufffdWZ\ufffdX\u01a4u\ufffd]q\ufffd\ufffd.C\ufffdwI\ufffd2\ufffd\ufffdUi=\ufffd\ufffdB\ufffd\ufffdA\ufffd`\ufffd\ufffdI\ufffdMZ\ufffd$\ufffd\ufffd-\ufffd\ufffdQ\ufffdViM0,\ufffdD7\ufffd\u0595D\ufffd\ufffd\ufffd\ufffd\ufffde	GIb\ufffdsa\ufffd\ufffd\ufffd%|Q\ufffd-	\ufffd$|\ufffd\ufffd\ufffd \ufffdy|\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd=#\ufffdzKn^\ufffd\ufffd\ufa6b
\ufffd\ufffd}\ufffd\ufffd\ufffd\ufffd\ufffdZ\ufffd\ufffd\ufffdX#V\ufffdn\ufffdCF\ufffdo\ufffd9=\ufffd\ufffdy-g\ufffdH>=\ufffdZ\ufffdD=\ufffd}\ufffd:\ufffdU%\ufffd \u037c\ufffd~	+\ufffd\ufffd~g\ufffdho\ufffd"u"\ufffdQ4v;\ufffd\ufffdx\ufffd\ufffd;\ufffd\ufffd\ufffd\}\ufffd^<\ufffdqq\ufffdb7[\ufffdLJd5\ufffd\ufffdkD\ufffd\ufffdB\ufffd N6
-\ufffd\u01f0\ufffd\ufffd\ufffd
-\u01e1\u06f9H33>\ufffd\ufffdj\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd94\ufffdz\ufffd_\ufffd\ufffd\ufffdk+\ufffd\ufffd\ufffd\ufffd\ufffda\ufffd\u0380\ufffd\ufffd'\ufffda#e\ufffds\ufffdg\ufffd
\ufffd\ufffd#e\ufffdD\ufffdgdd\ufffd0'GX6w\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdC\ufffd]L\ufffd\ufffd5\ufffd\ufffd\ufffdG\ufffd\u61589(\ufffd \ufffdEf\ufffdOQ\ufffda\ufffd1\ufffd\ufffdQ\ufffd\u0701\ufffd\ufffdf\u0310\ufffd\ufffd\ufffdAQ\ufffd\ufffdi\ufffd\ufffd\ufffd4\ufffd\ufffd\ufffdi\ufffd;\ufffd\u0122\ufffd\ufffd\ufffd\ufffdG\ufffd\ufffdb[\\ufffdI\ufffdX\ufffd>\ufffd\ufffd\ufffd\ufffd\ufffd85_vM\ufffd\ufffd5]#N\ufffd\ufffdCa\ufffdE\ufffd\ufffd(_\ufffd%\ufffdG\ufffd^\ufffd\u0233\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdqr\u04c2\ufffd<\ufffd5\ufffd\ufffdf&\ufffd0\ufffdx�|\ufffdp\ufffd\u06a60\ufffdJ\ufffd\ufffdv\ufffd\ufffdIX\ufffd\u0524\ufffdM\ufffd\sL\ufffdK\ufffd,s\ufffd\ufffd\ufffd\ufffd`%\ufffdd0\ufffde\ufffd\ufffds\ufffda\ufffd\u027a\ufffd\ufffd\ufffd;j\ufffd\ufffdH\ufffd\ufffd)\U000424c9\ufffd4%r\ufffdpdV0\ufffdY\ufffd$l45!\ufffdH\u04dc\ufffdfsXnz)\ufffd#w\ufffd\ufffd\ufffd\ufffd\ufffd0A2
-\ufffdK\ufffd�kf)\u02a4V\ufffd\ufffd�L\ufffdM\ufffd\ufffd$\ufffd\ufffd\u04aa9}8\ufffdX&\ufffd\ufffdx\ufffdx\ufffd\ufffdM
-
\ufffd\ufffd\ufffdq\ufffd\ufffd/\ufffd1\ufffd\ufffdE\u9509JR\ufffd6\ufffd?\u05091\ufffds\ufffd
-4\ufffd^\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdU"	\ufffd7\ufffdqF\ufffd\ufffdq\ufffd\ufffdqO;7\ufffd\ufffdv#v!&\ufffd\ufffd�N\ufffd\ufffdgbN%s
\ufffdD\ufffd\ufffd8\ufffdU\ufffd4
\ufffdl-\ufffd\ufffd\ufffd'$\ufffd>\ufffdO4\ufffd\ufffd)8\ufffd
-Us\ufffd~\ufffdz\ufffdkg\ufffd#l0\ufffd\ufffd\ufffd
j\ufffd[\ufffd`\ufffd/g\u05fe\ufffd\ufffd\ufffd5aG5&Tb|3[M\ufffdW\ufffd\ufffd\ufffd`q\ufffd[\ufffd\ufffd5\ufffdL\\ufffdr\ufffd\ufffd{J\ufffd\ufffd-<rC\ufffd=\ufffdAnJ\u03f9q\u038d\ufffdw\ufffd\ufffd'0\ufffd\ufffd;\ufffd'@8\ufffd\ufffd\ufffdy\ufffdI\u04fct\ufffd0\ufffd\ufffd]\ufffdaf\ufffd+\ufffdz~}\ufffd\ufffd\ufffd\ufffdi
+x\ufffd\ufffd8tSe\ufffd\ufffd\ufffd'MJm\ufffdj-%\ufffdm\u04d6&}$MR\ufffdH\u04f4
miH\ufffd\u0497`iJ\u0487}@A�@\ufffd#r\ufffd\ufffd\ufffda@t"0\ufffd\ufffd\ufffdQ\ufffd\ufffd9\ufffd.:\ufffd]\ufffdE\ufffd\ufffdpF\ufffd\ufffd:\ufffd\ufffd\ufffd\ufffd\ufffd{o\ufffd8sv\ufffdnr\ufffd\ufffd\ufffd\ufffd\ufffd{?\ufffd{	B\ufffd<A\ufffd\ufffd\ufffdi\ufffd\ufffdP\ufffd3\\ufffdL\ufffd\ufffd\ufffdm\}\ufffd\ufffd\ufffd\ufffd8\ufffdAHY\ufffd\ufffd\ufffd>\ufffd\ufffd[M\ufffd
+\ufffd\ufffd\ue7a1\ufffd\u0453\ufffdaB\ufffd\ufffd#Lbwwg{\ufffd\ufffd!\ufffdC\ufffd\ufffd\ufffd\ufffd>\ufffd!\ufffd\ufffd/\ufffd\_W\ufffdk)\ufffd}\ufffdQ\ufffd#~\ufffd\ufffd\ufffd78\ufffdB_Y!\ufffd\ufffd\ufffd\ufffdm\ufffd\ufffd\ufffd\ufffd?\ufffd\ufffd\ufffd	\ufffd9]HQ\ufffds\ufffd\ufffdD\ufffd\ufffd\ufffd:\ufffd\ufffd_gkq\ufffdy\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd3\ufffd\ufffdp~\ufffd\ufffd\u0671~HK#\ufffd	\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd'\ufffdAA\ufffd\ufffd\ufffd\ufffd^\ufffd\ufffd\ufffd\ufffdYQ\u0473\ufffdL\ufffd\ufffd\ufffd\ufffd\ufffdZ\ufffd\ufffd\ufffd'$\ufffd\ufffd\ufffdHR\ufffd\ufffd\ufffdzC*\ufffd\ufffdn\ufffd\ufffd@\ufffdf\ufffd\ufffd9\ufffdy\ufffdk\ufffd\ufffd\ufffd(\TT\R\ufffd,s\ufffd\ufffd+*\ufffd1\ufffd\ufffd\u04ef\ufffd\ufffd{\ufffd\ufffdA\ufffd\ufffd\ufffdfQ\ufffd\ufffdV'\ufffd\ufffdC\u0692W\ufffd\ufffdf\ufffd\ufffd \ufffd\ufffd&�\p\ufffd\ufffd\ufffd$\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdY\ufffdB\ufffdqB\ufffd\ufffdip-\u04d3P\ufffdR\ufffdU!l\ufffd	\ufffd\u06afa\ufffdM%\ufffd\ufffd\ufffd>\ufffd?\ufffd^\ufffdXn\ufffd`\ufffd\ufffd25\ufffd(\ufffd\ufffd\ufffdsXc .>\ufffd\ufffdr~IkGG\ufffdLj<\ufffd\ufffd\ufffd\ufffd`\ufffd \ufffd\ufffd\ufffd)9'\ufffd3\ufffd\ufffdA\ufffd\ufffd\ufffdq\ufffdB\u0242\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdAe\ufffd2C\ufffd\ufffd\ufffdp$dX\ufffdx\ufffd
\ufffd\ufffd\ufffd\ufffd\ufffdI~"\ufffd-\ufffd	Z`\ufffdj\ufffdq\ufffdV\ufffdr\ufffd\ufffdzP\ufffd\ufffdP\ufffd\ufffd!\ufffdA\ufffdRAQQA^\ufffdG19\ufffd\ufffd\ufffd6\ufffd\ufffd\ufffd
+\ufffdyS\ufffd\ufffd'\\ufffd\ufffd\ufffd\ufffd\ufffdjXB\ufffd\ufffda\-\ufffd\ufffd\ufffd\u046b$\ufffd$0M\ufffd-)TCSsh\ufffd4\ufffdV\ufffd\ufffdV\ufffd\ufffd\ufffd\ufffdT\ufffdN\ufffd\ufffd\u0755\ufffd\ufffdDK\ufffd\ufffd%\u032b(,T\zc^Ya!\ufffd\ufffd|\ufffd\ufffdG\ufffdib79\ufffdj\ufffd\ufffd:\ufffd_\ufffd\ufffda\ufffd\ufffd\ufffd\ufffd}"hY\ufffd*CisXU\ufffd\ufffd\ufffd\ufffd&@wB\ufffdo\u0364a\ufffdsy\ufffd8v\ufffd:\ufffdMm+\ufffdR\ufffd6\ufffd\u0562\ufffd*\ufffdM\ufffd'\ufffd_Q\ufffd\ufffdoyz\ufffd\ufffd\ufffd\u0760ysQ\ufffd\u554eO\ufffdr\ufffd\ufffd8\ufffdMC\ufffdX\ufffduZ\ufffd\\ufffd1�V\ufffd\ufffd\ufffd\ufffd
6A#\ufffd\ufffd?\ufffdGv|\ufffd\ufffd\u023c\ufffd(s\ufffd\ufffdU\ufffdm\ufffd\ufffd-U\ufffd\ufffd\ufffdj\ufffd1N\ufffdt\ufffdr\ufffd\ufffd&>\ufffd\u0212*wE\ufffd\ufffdpa\ufffd\ufffd\ufffd\ufffd8\ufffdNS\ufffd\ufffd\ufffd]\ufffd-N\ufffdg\ufffd\ufffd6\ufffd^\ufffd\ufffd\ufffdV\ufffd\ufffd\ufffd4\ufffd\ufffd\ufffdEf\ufffd\ufffdV\ufffd\ufffd\ufffd\ufffd\ufffdKn\ufffd\ufffd\ufffdr\ufffd\ufffd\ufffd\ufffdScC\ufffd\ufffdt[\ufffdU<\ufffd\ufffd@|\ufffd\ufffd\ufffdE\ufffdCsY|\ufffd\ufffdY\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdu\ufffd\ufffdc\ufffdM\ufffd18\ufffd9\ufffd\ufffd\u032aBgY\ufffd\ufffdM\ufffd7nX~W\ufffd\ufffd\ufffdSQ\ufffd\ufffdn\ufffdT\ufffdLc
+\ufffd\ufffd(,\ufffds|\ufffdh\ufffd\ufffd6\ufffd\ufffd;o\ufffd
+\ufffd\ufffd-\ufffd{\ufffd`\ufffdfW\ufffde\ufffd\ufffdra\ufffd\ufffd+\ufffdOE#\ufffd\ufffd	h\ufffd\ufffd\ufffd\ufffd.;\ufffdj^\ufffdL\ufffdL\ufffd\ufffd?\ufffdD\ufffd\u0472\ufffd\u03fch\ufffd\ufffd\ufffd>J\ufffd"\ufffdo<3\ufffdL\ufffdZ+C%\ufffdZ\ufffdK\ufffd#\ufffd\ufffd\ufffde\ufffdk\ufffdK\ufffd\ufffd!\ufffdS\ufffd\ufffd\ufffd\ufffd\ufffd^\ufffd\ufffd"\ufffd\ufffd?\ufffd\ufffdU\ufffd\ufffdh\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd=S\ufffd\ufffd\ufffdk\ufffd8p \ufffdC\ufffd8\ufffd\ufffduqw\ufffd'\ufffd\ufffdQu-\ufffd\ufffd\u0582\ufffd\ufffd-\u06c7\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdT\ufffd}\ufffd\ufffds\ufffd\ufffd2\ufffd?\ufffd\ufffdx\ufffd&\u01ad\ufffd\ufffdTH\ufffd\ufffd?\ufffd5\ufffd{\ufffd\ufffd\ufffd0h\ufffdd\ufffd.\u0524g\ufffd\u058a\u80b1\ufffd\ufffdz0\ufffd\ufffd\ufffd\u1ccc\ufffd_!O\ufffd%\ufffd\ufffdi\ufffd\ufffdS\ufffdo\ufffd\ufffd\ufffd\u05ef\ufffd<\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdM\ufffd\ufffd\ufffdR\ufffd\ufffd\\ufffdQq\ufffd\ufffd\ufffdAp]\ufffdz\ufffdG\ufffd\ufffd\u04cc\ufffd\ufffd\ufffd\ufffd\ufffdIWa\ufffdc6W\ufffd,	:#X-p\ufffd\ufffd_\ufffd6\ufffd SE\ufffdr\ufffd\ufffd#\ufffdZ\ufffd\\ufffd:\ufffdC\ufffd\ufffd:\ufffd\ufffd\ufffdM\ufffdW>\ufffd\ufffde\ufffd5\ufffd\ufffd1\ufffd\ufffdW\ufffd\ufffd\ufffd5<\uc98dn\ufffd\ufffd	\ufffdr\ufffd>\ufffd\u017a*A
Bp\ufffdmx
+\ufffd\ufffd\ufffdW\u033f+\ufffdny\ufffd~q\ufffd\ufffd\ufffd\ufffd\ufffdkw\ufffdu\ufffd\u01f1.n`5G\ufffd\ufffd\ufffd\ufffdPv\ufffdF\ufffd\ufffd~
+>\ufffd[0\ufffd\ufffdd\ufffd=\ufffd\ufffd9\ufffdu\ufffd5T\ufffd\ufffd\ucb61\ufffdVd\ufffd\ufffd.L\ufffd\ufffd\ufffd\ufffd3\ufffd\ufffd\ufffd\ufffd�*\ufffd\ufffd4<O\ufffd~\ufffd7y\ufffd\ufffd\ufffd\ufffdQ\ufffd(\ufffd\ufffdcY\u058b\ufffdS\ufffd\ufffd\ufffd{\ufffd1U\ufffd\ufffdr(t9\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdc\ufffd\ufffd\u01ce\ufffd\ufffd\ufffd\ufffd	m;w\ufffdG\ufffd\ufffd^\ufffd\ufffd\ufffdy6\ufffdM"\ufffd'x\ufffdRp\u02dd\ufffdV\ufffd\u0402\u0320\ufffd?\ufffd.PU\ufffd\ufffd\ufffd\ufffd\ufffd~\u06fd\ufffd\ufffd\ufffdw\ufffd\ufffd\u035f\ufffd\ufffd\ufffd\ufffd\ufffd\u0158\ufffd\ufffd\ufffd1\ufffd\ufffd\ufffd\ufffd\u03b2\ufffd		\\ufffd\ufffd\ufffd\ufffd\u02f7f\ufffdb\ufffdt\ufffdM\ufffdQ\ufffd\u06f1c;\ufffdFu-E>\ufffd\ufffdG6\ufffdG\ufffd\ufffdU\ufffd!\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd \ufffd+\ufffd\ufffdY8_V\ufffd;\ufffd\ufffd\ufffdXm\ufffd\ufffd!\u03df\ufffd\ufffd\ufffd\ufffd\ufffdN\ufffd	e+\ufffd\u04b4\u0425\ufffd\ufffd\ufffd\ufffdf\ufffd\ufffd\ufffd\ufffdK\ufffd\ufffd\ufffd#\ufffd\ufffd\ufffd\ufffdQ|B
+\ufffd\u011ba"\u0708\ufffd\u0130\ufffd!\ufffdQf\ufffd\ufffd\ufffd\ufffdZU\ufffd6d)]\ufffd\ufffdsE\ufffd}\ufffd\ufffdfq\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd9P\ufffd\ufffdQ\ufffd\ufffd\ufffd%
+S\ufffd&1\ufffd\ufffds\ufffdnL;\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd!\ufffd\ufffdn\ufffd\ufffd\ufffd	~)\ufffd(G\ufffdk\ufffd\ufffd\ufffd\ufffd\ufffdz[\ufffd\ufffdp\ufffd\ufffd\ufffd\ufffd\ufffd\u0249\ufffdr\ufffd\ufffd\ufffd'\ufffdC\ufffd\ufffdi\ufffdC\ufffd\ufffdp\ufffd\ufffdL\ufffd\ufffd\ufffdh\ufffd\u99e3\ufffdFt\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdStR\ufffd\ufffd\ufffd/\ufffd\ufffd>\ufffdZ'\ufffd\ufffd\ufffd\ufffd\ufffd'\ufffd\ufffd\ufffd\ufffdF\ufffdy\ufffd\ufffd\ufffdd\ufffd-\ufffd8\ufffd\ufffd\ufffd\ufffd&\u0588..\ufffd\ufffd\ufffd\ufffd48\ufffd\ufffdC{\ufffdh\ufffdz\ufffd\ufffd?\ufffd\ufffd|\ufffd\ufffd`t\ufffd\ufffd\ufffd,\ufffd,\ufffd\ufffd{\ufffd\ufffdT\ufffdT\ufffd\ufffd\ufffdO\ufffd2p\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd'\ufffd\ufffd,\ufffdoOa!\ufffd\ufffdjX![\ufffd\ufffd8\ufffd\ufffd\ufffd\ufffd
+OK\ufffdH&U?\ufffd\ufffd1)\ufffd\ufffdj\ufffd\ufffdH-]\u0316\ufffdR\u02b3	UE)VO\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd_\ufffd\ufffda\ufffd\ufffd\u0482\ufffd4m\ufffdr\u07d9\ufffd\ufffdY\ufffd\ufffd\ufffd\u06a1\ufffd\ufffd\ufffd|{\ufffd+B\ufffd\ufffd\ufffdX\ufffd\ufffd+V\ufffd+\ufffdC\ufffd\ufffd\ufffd]+rs\ufffdW\ufffd-LO\ufffd-)\ufffd\ufffd\ufffd)t\ufffd\ufffdv\ufffd\ufffd{\ufffd\ufffd\ufffd\ufffdu\ufffd0\ufffd9#\ufffd<\ufffd	>\ufffd\ufffd\ufffd\ufffd\ufffdXm\ufffdR_\ufffd"[a\ufffd\ufffdO+\ufffdy\ufffd\ufffd\ufffd\ufffd\ufffd;\ufffd|\ue0fb!&\ufffd\ufffd\ufffd\ufffd@\ufffd"\ufffdt\ufffdC\ufffd\ufffdS\ufffd\ufffdb:5\ufffd<7-\ufffd\ufffd\u07b2\ufffd\ufffd\ufffdsr\ufffdW\ufffd\ufffd*\ufffd\ufffd^\ufffd{}\ufffd\u01f6koLS\ufffd\ufffdi\\ufffd\ufffd'5ID\ufffd]\ufffdUb5\ufffd*\u04ed\ufffd\u03c7\ufffdUe%\ufffdZ\ufffdG\ufffdPk3\ufffd\ufffd\u33f2\ufffd\ufffd\ufffd\ufffdUM\ufffd\u010cm\ufffd<\ufffd\ufffd:\ufffd\ufffd2Yn9.\ufffd0\ufffd\ufffd:>\j\ufffdV>8\ufffdw\ufffd\ufffd\ufffd1\ufffd\ufffd\ufffd\ufffdp\ufffd\ufffdY\u936a\ufffdgwg:\ufffdZ8+\ufffd?\ufffd\ufffdaNTcNIb\ufffd`\ufffd\ufffd\ufffd4[	\ufffd\ufffdeZ\ufffd(\ufffdbK\ufffds\ufffd\ufffd\ufffd\ufffd\ufffdW?}S~\ufffd\ufffd\ufffdsWWS\ufffd\ufffdL=\ufffdI\u02e7o\ufffd\u07ff\ufffdZ\ufffd\ufffdd\ufffd\ufffd\u04e8;5\ufffd\ufffdJ\ufffd\ufffd(Y\ufffdl
+\ufffd}Y\ufffd\ufffd\ufffdq\ufffd\ufffd"w\ufffd\ufffd'\ufffd\ufffd\ufffd8Q\ufffd7\u04c9[)\ufffd\ufffd\ufffdj\ufffd\u041b\u82f3D\ufffd
o\ufffd:\ufffdw
u\ufffd\ufffd\u025b\ufffdsddD\ufffd\ufffde\ufffd"l\ufffd1;\ufffdJ\ufffd5\ufffd(2<\ufffd]\ufffd\ufffd\ufffd[\ufffd\ufffdv'\ufffdsN~\ufffd-W;}C8&\ufffd%/ \ufffdQ\uc7ad\ufffd2XQS9\ufffd\ufffd\u77ef|'\ufffd@#o\ufffd_OL\ufffd	\ufffd\ufffdO\ufffd\ufffd\ufffd\\ufffd\u908emVX0\ufffd\ufffd\ufffd'N'\ufffd\ufffdsf\ufffdP3mTb\ufffd\ufffdn\ufffdL\ufffd\ufffd\ufffdv\ufffd
Z{\ufffd\ufffd
+\ufffdg\ufffdk\ufffd\ufffd/#I\u0157Mw_qs\ufffd\u0696\ufffd\ufffdRj\ufffd\ufffd\ufffd\ufffdXCt\u04c8\ufffd\ufffd7\u0dfa\ufffdS\ufffd\u03d95\ufffd\ufffd!\ufffd.\ufffdM\ufffdkA\ufffd;\ufffd\ufffd~Z\ufffd
+\ufffdTh{\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdv\ufffdf;Uo\ufffd?\u06f6
R\ufffdi\ufffd\ufffd\ufffdrM\ufffd\ufffd4\ufffdI5\ufffd$\ufffd $\ufffdBh:\ufffdc\U00089037\ufffd\ufffd3\ufffd2\ufffd\ufffd\ufffd}B \\ufffdS\ufffdd\ufffd6\ufffd\ufffdf\ufffdc$\ufffdO\ufffd'\ufffd\ufffd\ufffd5K\ufffd\ufffd\ufffd\ufffdy+C\ufffd\ufffd-^\ufffd\ufffd\ufffd\ufffd]\ufffd\\ufffdm\ufffd#\ufffd\ufffdL\ufffd\ufffd\ufffd\ufffd`p\ufffd\ufffd\ufffd^\ufffd\ufffd\ufffd\ufffd\ufffd:Q\ufffdpt\ufffd=\ufffdG\ufffd\ufffd|\ufffd+\u0276(7\u04d7Ps\u0112#\ufffdF\ufffd\ufffd\ufffd;j\u03ac\ufffdL[WuGkpq\ufffd\ufffd\u0531\ufffd\ufffd\ufffd\ufffd\ufffdyi\ufffd>\ufffd\u9371\ufffd\ufffd{\ufffd)\fv\ufffdI5oqQe\ufffd\ufffd<\ufffd\ufffd\ufffd\ufffd)&\ufffd\ufffd\ufffd�\ufffd\ufffd\ufffdf\ufffd\u02e9S)y\ufffd\ufffd9\ufffd\ufffd;
+\ufffd7N\ufffdJ\ufffdqNETy,t\ufffd"\u0188\ufffd#R\ufffdb6\ufffd\ufffdKX\ufffdF\ufffd\ufffd\ufffd7\ufffd\ufffdq4\ufffd\ufffd\u03ec^\ufffd\ufffd!\ufffd)\ufffdv\ufffd\ufffd\ufffdXd0\ufffd\ufffd6z\ufffds\ufffd\ufffd\ufffd<\ufffd\ufffd\u0563}5K\ufffdi^\ufffdg\ufffd\ufffdV\ufffd=\ufffd\ufffd\ufffdK7\ufffd9>\ufffd\ufffd~\ufffd\ufffd\ufffdb=r\ufffdz\ufffd\ufffd.\ufffd\u06ba\ufffd\ufffd\ufffd-k\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd3
\ufffd\u0151$\ufffd\ufffd	#\ufffdY\ufffdEnS�z\ufffdo\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u03c1\ufffd1\ufffd",\ufffd\ufffdt2\ufffdNc\ufffd\ufffd\ufffdy\ufffd?yeq\ufffd\ufffd\ufffd	\ufffd\ufffd\ufffdW\ufffdx\ufffd\ufffd62@\ufffd\ufffd_\ufffd\ufffdwd\ufffd@\ufffd\ufffdi|4\ufffdz\ufffd:\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffde)2\ufffd\ufffdQ\ufffdUvB6.\ufffd\ufffd'\u02cb\ufffd>y\ufffd|\ufffd\ufffd)\ufffds\ufffdW\ufffd\ufffd#\ufffd\ufffd\ufffd\ufffd\ufffd"~\ufffda\ufffd7\ufffd(\ufffdQ\ufffdT\ufffd\ufffd\ufffdg\ufffdJ\ufffd\ufffd*+\ufffd\ufffd\ufffd;\ufffd\ufffdg\ufffd(\ufffd	\ufffd\ufffd5\ufffd\ufffd\ufffd
b\ufffd\u0136\ufffdlYR\ufffd"\ufffd<l%\ufffd\ufffd\ufffd\ufffd\ufffdcsHkl\ufffda\ufffdb\ufffdJ\ufffdl\ufffd\ufffdJlfl-l[
+6\ufffdD\ufffd+\ufffd\ufffdM\ufffdd0\ufffd\ufffd,\u0498\ufffd;$\ufffd\ufffd\ufffd\u04bcD\ufffd\ufffdb+\ufffd\ufffd\ufffd4-\ufffd\ufffdzg\ufffd{\ufffd=\ufffd\ufffdg\ufffd\ufffd\ufffd]\ufffd\ufffd\u02bfJZd�|\ufffdO\ufffd\ufffdx\ufffd\ufffd[(\ufffd/;\ufffd!B\u015e\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd+$h\ufffd,1\ufffdR\ufffd\ufffd+\ufffdN\ufffd]<\ufffd�\ufffd\ufffd\ufffd\ufffdz=q\ufffd(~J\ufffd65DZ\ufffdVp\ufffd\ufffdp\ufffd??\ufffd(	\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdE#\ufffd\ufffdh\ufffdXs\ufffd\u01a8B\ufffd\ufffd&\ufffd\ufffd\ufffd\u0754\ufffd\ufffd\ufffdtb$$\ufffdd\ufffd\ufffd\ufffdD\ufffd\ufffd\ufffd\ufffdG\ufffd\ufffd\ufffd\ufffdc\ufffd\ufffdE\ufffd\ufffd\ufffd;\ufffd\ufffdT\ufffdJR\ufffd\ufffd\ufffdjRCj\ufffd>.!K

<TRUNCATED>

[35/44] isis-site git commit: ISIS-1594: provide an 'edit' button

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/guides/rgcfg.html
----------------------------------------------------------------------
diff --git a/content/guides/rgcfg.html b/content/guides/rgcfg.html
index 6f52570..0f8ab75 100644
--- a/content/guides/rgcfg.html
+++ b/content/guides/rgcfg.html
@@ -1,12 +1,10 @@
 <!doctype html>
 <html class="no-js" lang="en">
-<head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-
-    <title>Core Config&#8217;n Properties</title>
-
-    <!--
+ <head> 
+  <meta charset="utf-8"> 
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"> 
+  <title>Core Config\u2019n Properties</title> 
+  <!--
         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
@@ -23,31 +21,21 @@
         KIND, either express or implied.  See the License for the
         specific language governing permissions and limitations
         under the License.
-    -->
-
-    <!-- No caching headers -->
-    <meta http-equiv="cache-control" content="no-cache" />
-    <meta http-equiv="pragma" content="no-cache" />
-    <meta http-equiv="expires" content="-1" />
-
-
-    <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
-    <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet" />
-    <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script>
-    <link href="../css/asciidoctor/colony.css" rel="stylesheet">
-    <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-
-
-
-    <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
-    <!--[if lt IE 9]>
+    --> 
+  <!-- No caching headers --> 
+  <meta http-equiv="cache-control" content="no-cache"> 
+  <meta http-equiv="pragma" content="no-cache"> 
+  <meta http-equiv="expires" content="-1"> 
+  <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line --> 
+  <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet"> 
+  <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script> 
+  <link href="../css/asciidoctor/colony.css" rel="stylesheet"> 
+  <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet"> 
+  <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet"> 
+  <!--[if lt IE 9]>
       <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
-    <![endif]-->
-
-
-
-    <style type="text/css">
+    <![endif]--> 
+  <style type="text/css">
         pre code {
             background-color: inherit;
             border-style: none;
@@ -192,9 +180,8 @@ table.CodeRay td.code>pre{padding:0}
         color:#fff;
         font-size: 1.1em;
     }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         @media only screen and (min-width: 40.063em) {
           .top-bar {
             .contain-to-grid .top-bar {
@@ -205,9 +192,8 @@ table.CodeRay td.code>pre{padding:0}
         .row {
             max-width: 80rem;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .extended-quote,
         .extended-quote-first {
             margin-left: 40px;
@@ -231,9 +217,8 @@ table.CodeRay td.code>pre{padding:0}
             text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
         }
         
-    </style>
-
-    <style>
+    </style> 
+  <style>
         body {
           position: relative;
         }
@@ -255,6 +240,7 @@ table.CodeRay td.code>pre{padding:0}
 
         div#doc-content {
             margin-top: 30px;
+            padding-top: 30px;
         }
 
         div.documentation-page table.frame-all {
@@ -286,9 +272,8 @@ table.CodeRay td.code>pre{padding:0}
             min-height: 2000px;
         }
 
-    </style>
-
-    <style>
+    </style> 
+  <style>
 
         @media only screen and (min-width: 768px) {
           #toc.toc2 ul ul { margin-left: -10px; }
@@ -316,15 +301,13 @@ table.CodeRay td.code>pre{padding:0}
         body div#toc2 li.tocify-item.active a {
             color: red;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         footer {
             margin-top: 1000px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* overriding colony.css stylesheet */
         .literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
            /*padding: 1.25em 1.5625em 1.125em 1.5625em;*/
@@ -372,9 +355,8 @@ table.CodeRay td.code>pre{padding:0}
         .imageblock img {
             margin-bottom: 10px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* from http://ben.balter.com/2014/03/13/pages-anchor-links/ */
         .header-link {
           position: absolute;
@@ -395,9 +377,8 @@ table.CodeRay td.code>pre{padding:0}
         h6:hover .header-link {
           opacity: 1;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .top-bar
         {
             -webkit-transition-duration: .5s;
@@ -425,1791 +406,1912 @@ table.CodeRay td.code>pre{padding:0}
             -webkit-transition-property: -webkit-transform;
             transition-property: transform;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         #doc-content a.guide {
             color: white;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
+        .tocify {
+            margin-top: 80px;
+        }
+    </style> 
+  <style>
         .tocify {
             margin-top: 80px;
         }
-    </style>
-
-
-</script>
-
-</head>
-<body>
-
-<<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
-    <div class="github-fork-ribbon">
-        <a href="https://github.com/apache/isis#fork-destination-box">Fork me on GitHub</a>
-    </div>
-</div>
-
-
-<div class="row">
-
-    <div class="fixed contain-to-grid header">
-        <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
-            <ul class="title-area">
-                <li class="name">
-                    <h1>
-                        <a href="/index.html">Apache Isis&trade;</a>
-                    </h1>
-                </li>
-                <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
-                <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
-            </ul>
-
-            <section class="top-bar-section">
-                <ul class="right">
-
-                    <li class="has-form">
-                       <FORM class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
-                        <div class="row collapse">
-                            <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
-                            <INPUT type="hidden" name="cof" value="FORID:0">
-                            <INPUT class="form-control" name="q" type="text" placeholder="Search">
-                        </div>
-                    </FORM>
-                     </li>
-
-                </ul>
-
-                <!-- Left Nav Section -->
-                <ul class="left">
-
-                    <li><a href="/documentation.html">Documentation</a></li>
-                    <li><a href="/downloads.html">Downloads</a></li>
-                    <li><a href="/help.html">Help</a></li>
-                    <li><a href="/asf.html">@ASF</a></li>
-
-                </ul>
-
-            </section>
-        </nav>
-    </div>
-</div>
-
-<div class="row">
-
-    <div id="doc-content-left" class="large-9 medium-9 columns">
-
-
-        <div id="doc-content">
-          <div class="sect1">
-<h2 id="_rgcfg">1. Configuration Properties</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Apache Isis' own configuration properties are simple key-value pairs, typically held in the <code>WEBINF/isis.properties</code>
-file and other related files.
-This guide describes how to configure an Apache Isis application.</p>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>This guide covers only the core configuration properties (relating to Apache Isis' metamodel and runtime management).
-Configuration properties for the viewers can be found in the <a href="ugvw.html">Wicket Viewer</a> guide and the <a href="ugvro.html">RestfulObjects viewer</a> guide.
-Likewise details of configuring security (Apache Shiro) can be
-found in the <a href="ugsec.html">Security</a> guide, and details for configuring the DataNucleus Object Store can be found in the <a href="ugodn.html">DataNucleus</a> guide.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="admonitionblock tip">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-tip" title="Tip"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>By default the configuration values are part of the built WAR file.
-Details on how to override these configuration properties externally for different environments can be found in the <a href="ugbtb.html#_ugbtb_deployment">Beyond the Basics</a> guide, (deployment chapter).</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="sect2">
-<h3 id="_other_guides">1.1. Other Guides</h3>
-<div class="paragraph">
-<p>Apache Isis documentation is broken out into a number of user, reference and "supporting procedures" guides.</p>
-</div>
-<div class="paragraph">
-<p>The user guides available are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="ugfun.html">Fundamentals</a></p>
-</li>
-<li>
-<p><a href="ugvw.html">Wicket viewer</a></p>
-</li>
-<li>
-<p><a href="ugvro.html">Restful Objects viewer</a></p>
-</li>
-<li>
-<p><a href="ugdno.html">DataNucleus object store</a></p>
-</li>
-<li>
-<p><a href="ugsec.html">Security</a></p>
-</li>
-<li>
-<p><a href="ugtst.html">Testing</a></p>
-</li>
-<li>
-<p><a href="ugbtb.html">Beyond the Basics</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The reference guides are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="rgant.html">Annotations</a></p>
-</li>
-<li>
-<p><a href="rgsvc.html">Domain Services</a></p>
-</li>
-<li>
-<p><a href="#">Configuration Properties</a> (this guide)</p>
-</li>
-<li>
-<p><a href="rgcms.html">Classes, Methods and Schema</a></p>
-</li>
-<li>
-<p><a href="rgmvn.html">Apache Isis Maven plugin</a></p>
-</li>
-<li>
-<p><a href="rgfis.html">Framework Internal Services</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The remaining guides are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="dg.html">Developers' Guide</a> (how to set up a development environment
-for Apache Isis and contribute back to the project)</p>
-</li>
-<li>
-<p><a href="cgcom.html">Committers' Guide</a> (release procedures and related practices)</p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_rgcfg_deployment-types">2. Deployment Types</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Apache Isis distinguishes between the application being run in development mode vs running in production mode.  The framework calls this the "deployment type" (corresponding internally to the <code>DeploymentType</code> class).</p>
-</div>
-<div class="paragraph">
-<p>(For mostly historical reasons) development mode is actually called <code>SERVER_PROTOTYPE</code>, while production mode is called just <code>SERVER</code>.  (There is also a deprecated mode called <code>SERVER_EXPLORATION</code>; for all intents and purposes this can considered as an alias of <code>SERVER_PROTOTYPE</code>).</p>
-</div>
-<div class="paragraph">
-<p>When running in development/prototyping mode, certain capabilities are enabled; most notably any actions restricted to prototyping mode (using <a href="rgant.html#_rgant-Action_restrictTo"><code>@Action#restrictTo()</code></a>) will be available.</p>
-</div>
-<div class="sect2">
-<h3 id="_using_the_wicket_viewer">2.1. Using the Wicket Viewer</h3>
-<div class="paragraph">
-<p>Most of the you&#8217;re likely to run Apache Isis using the <a href="ugvw.html">Wicket viewer</a>.  In this case Apache Isis' "deployment type" concept maps to Wicket&#8217;s "configuration" concept:</p>
-</div>
-<table class="tableblock frame-all grid-all spread">
-<caption class="title">Table 1. Apache Isis' deployment type corresponds to Apache Wicket&#8217;s configuration</caption>
-<colgroup>
-<col style="width: 25%;">
-<col style="width: 25%;">
-<col style="width: 50%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">Apache Isis<br>
-(Deployment Type)</th>
-<th class="tableblock halign-left valign-top">Apache Wicket<br>
-(Configuration)</th>
-<th class="tableblock halign-left valign-top">Notes</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>SERVER_PROTOTYPE</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>development</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">running in development/prototyping mode</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>SERVER</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>deployment</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">running in production mode</p></td>
-</tr>
-</tbody>
-</table>
-<div class="paragraph">
-<p>Wicket&#8217;s mechanism for specifying the "configuration" is to use a context parameter in <code>web.xml</code>; Apache Isis automatically infers its own deployment type from this.  In other words:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>to specify SERVER (production) mode, use:<br></p>
-<div class="listingblock">
-<div class="title"><code>web.xml</code></div>
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="xml"><span class="tag">&lt;context-param&gt;</span>
+    </style>  
+ </head> 
+ <body> 
+  <div class="row"> 
+   <div class="fixed contain-to-grid header"> 
+    <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem"> 
+     <ul class="title-area"> 
+      <li class="name"> <h1> <a href="/index.html">Apache Isis\u2122</a> </h1> </li> 
+      <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone --> 
+      <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li> 
+     </ul> 
+     <section class="top-bar-section"> 
+      <ul class="right"> 
+       <li class="has-form"> 
+        <form class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse"> 
+         <div class="row collapse"> 
+          <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya"> 
+          <input type="hidden" name="cof" value="FORID:0"> 
+          <input class="form-control" name="q" type="text" placeholder="Search"> 
+         </div> 
+        </form> </li> 
+      </ul> 
+      <!-- Left Nav Section --> 
+      <ul class="left"> 
+       <li><a href="/documentation.html">Documentation</a></li> 
+       <li><a href="/downloads.html">Downloads</a></li> 
+       <li><a href="/help.html">Help</a></li> 
+       <li><a href="/asf.html">@ASF</a></li> 
+      </ul> 
+     </section> 
+    </nav> 
+   </div> 
+  </div> 
+  <div class="row"> 
+   <div id="doc-content-left" class="large-9 medium-9 columns"> 
+    <div id="doc-content">
+     <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/rgcfg.adoc&quot;" style="float: right; font-size: small; padding: 6px;  "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+     <div class="sect1"> 
+      <h2 id="_rgcfg">1. Configuration Properties</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_rgcfg.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>Apache Isis' own configuration properties are simple key-value pairs, typically held in the <code>WEBINF/isis.properties</code> file and other related files. This guide describes how to configure an Apache Isis application.</p> 
+       </div> 
+       <div class="admonitionblock note"> 
+        <table> 
+         <tbody>
+          <tr> 
+           <td class="icon"> <i class="fa icon-note" title="Note"></i> </td> 
+           <td class="content"> 
+            <div class="paragraph"> 
+             <p>This guide covers only the core configuration properties (relating to Apache Isis' metamodel and runtime management). Configuration properties for the viewers can be found in the <a href="ugvw.html">Wicket Viewer</a> guide and the <a href="ugvro.html">RestfulObjects viewer</a> guide. Likewise details of configuring security (Apache Shiro) can be found in the <a href="ugsec.html">Security</a> guide, and details for configuring the DataNucleus Object Store can be found in the <a href="ugodn.html">DataNucleus</a> guide.</p> 
+            </div> </td> 
+          </tr> 
+         </tbody>
+        </table> 
+       </div> 
+       <div class="admonitionblock tip"> 
+        <table> 
+         <tbody>
+          <tr> 
+           <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td> 
+           <td class="content"> 
+            <div class="paragraph"> 
+             <p>By default the configuration values are part of the built WAR file. Details on how to override these configuration properties externally for different environments can be found in the <a href="ugbtb.html#_ugbtb_deployment">Beyond the Basics</a> guide, (deployment chapter).</p> 
+            </div> </td> 
+          </tr> 
+         </tbody>
+        </table> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_other_guides">1.1. Other Guides</h3> 
+        <div class="paragraph"> 
+         <p>Apache Isis documentation is broken out into a number of user, reference and "supporting procedures" guides.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The user guides available are:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><a href="ugfun.html">Fundamentals</a></p> </li> 
+          <li> <p><a href="ugvw.html">Wicket viewer</a></p> </li> 
+          <li> <p><a href="ugvro.html">Restful Objects viewer</a></p> </li> 
+          <li> <p><a href="ugdno.html">DataNucleus object store</a></p> </li> 
+          <li> <p><a href="ugsec.html">Security</a></p> </li> 
+          <li> <p><a href="ugtst.html">Testing</a></p> </li> 
+          <li> <p><a href="ugbtb.html">Beyond the Basics</a></p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The reference guides are:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><a href="rgant.html">Annotations</a></p> </li> 
+          <li> <p><a href="rgsvc.html">Domain Services</a></p> </li> 
+          <li> <p><a href="#">Configuration Properties</a> (this guide)</p> </li> 
+          <li> <p><a href="rgcms.html">Classes, Methods and Schema</a></p> </li> 
+          <li> <p><a href="rgmvn.html">Apache Isis Maven plugin</a></p> </li> 
+          <li> <p><a href="rgfis.html">Framework Internal Services</a></p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The remaining guides are:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><a href="dg.html">Developers' Guide</a> (how to set up a development environment for Apache Isis and contribute back to the project)</p> </li> 
+          <li> <p><a href="cgcom.html">Committers' Guide</a> (release procedures and related practices)</p> </li> 
+         </ul> 
+        </div> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_rgcfg_deployment-types">2. Deployment Types</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_rgcfg_deployment-types.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>Apache Isis distinguishes between the application being run in development mode vs running in production mode. The framework calls this the "deployment type" (corresponding internally to the <code>DeploymentType</code> class).</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>(For mostly historical reasons) development mode is actually called <code>SERVER_PROTOTYPE</code>, while production mode is called just <code>SERVER</code>. (There is also a deprecated mode called <code>SERVER_EXPLORATION</code>; for all intents and purposes this can considered as an alias of <code>SERVER_PROTOTYPE</code>).</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>When running in development/prototyping mode, certain capabilities are enabled; most notably any actions restricted to prototyping mode (using <a href="rgant.html#_rgant-Action_restrictTo"><code>@Action#restrictTo()</code></a>) will be available.</p> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_using_the_wicket_viewer">2.1. Using the Wicket Viewer</h3> 
+        <div class="paragraph"> 
+         <p>Most of the you\u2019re likely to run Apache Isis using the <a href="ugvw.html">Wicket viewer</a>. In this case Apache Isis' "deployment type" concept maps to Wicket\u2019s "configuration" concept:</p> 
+        </div> 
+        <table class="tableblock frame-all grid-all spread"> 
+         <caption class="title">
+          Table 1. Apache Isis' deployment type corresponds to Apache Wicket\u2019s configuration
+         </caption> 
+         <colgroup> 
+          <col style="width: 25%;"> 
+          <col style="width: 25%;"> 
+          <col style="width: 50%;"> 
+         </colgroup> 
+         <thead> 
+          <tr> 
+           <th class="tableblock halign-left valign-top">Apache Isis<br> (Deployment Type)</th> 
+           <th class="tableblock halign-left valign-top">Apache Wicket<br> (Configuration)</th> 
+           <th class="tableblock halign-left valign-top">Notes</th> 
+          </tr> 
+         </thead> 
+         <tbody> 
+          <tr> 
+           <td class="tableblock halign-left valign-top"><p class="tableblock"><code>SERVER_PROTOTYPE</code></p></td> 
+           <td class="tableblock halign-left valign-top"><p class="tableblock"><code>development</code></p></td> 
+           <td class="tableblock halign-left valign-top"><p class="tableblock">running in development/prototyping mode</p></td> 
+          </tr> 
+          <tr> 
+           <td class="tableblock halign-left valign-top"><p class="tableblock"><code>SERVER</code></p></td> 
+           <td class="tableblock halign-left valign-top"><p class="tableblock"><code>deployment</code></p></td> 
+           <td class="tableblock halign-left valign-top"><p class="tableblock">running in production mode</p></td> 
+          </tr> 
+         </tbody> 
+        </table> 
+        <div class="paragraph"> 
+         <p>Wicket\u2019s mechanism for specifying the "configuration" is to use a context parameter in <code>web.xml</code>; Apache Isis automatically infers its own deployment type from this. In other words:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p>to specify SERVER (production) mode, use:<br></p> 
+           <div class="listingblock"> 
+            <div class="title">
+             <code>web.xml</code>
+            </div> 
+            <div class="content"> 
+             <pre class="CodeRay highlight"><code data-lang="xml"><span class="tag">&lt;context-param&gt;</span>
     <span class="tag">&lt;param-name&gt;</span>configuration<span class="tag">&lt;/param-name&gt;</span>
     <span class="tag">&lt;param-value&gt;</span>deployment<span class="tag">&lt;/param-value&gt;</span>
-<span class="tag">&lt;/context-param&gt;</span></code></pre>
-</div>
-</div>
-</li>
-<li>
-<p>to specify <code>SERVER_PROTOTYPING</code> (development) mode, use:<br></p>
-<div class="listingblock">
-<div class="title"><code>web.xml</code></div>
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="xml"><span class="tag">&lt;context-param&gt;</span>
+<span class="tag">&lt;/context-param&gt;</span></code></pre> 
+            </div> 
+           </div> </li> 
+          <li> <p>to specify <code>SERVER_PROTOTYPING</code> (development) mode, use:<br></p> 
+           <div class="listingblock"> 
+            <div class="title">
+             <code>web.xml</code>
+            </div> 
+            <div class="content"> 
+             <pre class="CodeRay highlight"><code data-lang="xml"><span class="tag">&lt;context-param&gt;</span>
     <span class="tag">&lt;param-name&gt;</span>configuration<span class="tag">&lt;/param-name&gt;</span>
     <span class="tag">&lt;param-value&gt;</span>development<span class="tag">&lt;/param-value&gt;</span>
-<span class="tag">&lt;/context-param&gt;</span></code></pre>
-</div>
-</div>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_restful_objects_viewer_only">2.2. Restful Objects viewer only</h3>
-<div class="paragraph">
-<p>Most Apache Isis applications will consist of at least the <a href="ugvw.html">Wicket viewer</a> and optionally the <a href="ugvro.html">RestfulObjects viewer</a>.  When both viewers are deployed in the same app, then the bootstrapping is performed by Wicket, and so the deployment type is configured as described in the previous section.</p>
-</div>
-<div class="paragraph">
-<p>In some cases though you may be using Apache Isis to provide a REST API only, that is, you won&#8217;t have deployed the Wicket viewer.  In these cases your app will be bootstrapped using  Apache Isis' <a href="ugbtb.html#_ugbtb_web-xml_servlet-context-listeners"> <code>IsisWebAppBootstrapper</code></a>.</p>
-</div>
-<div class="paragraph">
-<p>In this case the deployment type is specified through an Apache Isis-specific context parameter, called <code>isis.deploymentType</code>:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>to specify <code>SERVER</code> (production) mode, use:<br></p>
-<div class="listingblock">
-<div class="title"><code>web.xml</code></div>
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="xml"><span class="tag">&lt;context-param&gt;</span>
+<span class="tag">&lt;/context-param&gt;</span></code></pre> 
+            </div> 
+           </div> </li> 
+         </ul> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_restful_objects_viewer_only">2.2. Restful Objects viewer only</h3> 
+        <div class="paragraph"> 
+         <p>Most Apache Isis applications will consist of at least the <a href="ugvw.html">Wicket viewer</a> and optionally the <a href="ugvro.html">RestfulObjects viewer</a>. When both viewers are deployed in the same app, then the bootstrapping is performed by Wicket, and so the deployment type is configured as described in the previous section.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>In some cases though you may be using Apache Isis to provide a REST API only, that is, you won\u2019t have deployed the Wicket viewer. In these cases your app will be bootstrapped using Apache Isis' <a href="ugbtb.html#_ugbtb_web-xml_servlet-context-listeners"> <code>IsisWebAppBootstrapper</code></a>.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>In this case the deployment type is specified through an Apache Isis-specific context parameter, called <code>isis.deploymentType</code>:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p>to specify <code>SERVER</code> (production) mode, use:<br></p> 
+           <div class="listingblock"> 
+            <div class="title">
+             <code>web.xml</code>
+            </div> 
+            <div class="content"> 
+             <pre class="CodeRay highlight"><code data-lang="xml"><span class="tag">&lt;context-param&gt;</span>
     <span class="tag">&lt;param-name&gt;</span>isis.deploymentType<span class="tag">&lt;/param-name&gt;</span>
     <span class="tag">&lt;param-value&gt;</span>server<span class="tag">&lt;/param-value&gt;</span>
-<span class="tag">&lt;/context-param&gt;</span></code></pre>
-</div>
-</div>
-</li>
-<li>
-<p>to specify <code>SERVER_PROTOTYPE</code> (development) mode, use:<br></p>
-<div class="listingblock">
-<div class="title"><code>web.xml</code></div>
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="xml"><span class="tag">&lt;context-param&gt;</span>
+<span class="tag">&lt;/context-param&gt;</span></code></pre> 
+            </div> 
+           </div> </li> 
+          <li> <p>to specify <code>SERVER_PROTOTYPE</code> (development) mode, use:<br></p> 
+           <div class="listingblock"> 
+            <div class="title">
+             <code>web.xml</code>
+            </div> 
+            <div class="content"> 
+             <pre class="CodeRay highlight"><code data-lang="xml"><span class="tag">&lt;context-param&gt;</span>
     <span class="tag">&lt;param-name&gt;</span>isis.deploymentType<span class="tag">&lt;/param-name&gt;</span>
     <span class="tag">&lt;param-value&gt;</span>server-prototype<span class="tag">&lt;/param-value&gt;</span>
-<span class="tag">&lt;/context-param&gt;</span></code></pre>
-</div>
-</div>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_overriding_the_deployment_type">2.3. Overriding the deployment type</h3>
-<div class="paragraph">
-<p>If bootstrapping the application using Apache Isis' <a href="ugbtb.html#_ugbtb_deployment_cmd-line"><code>org.apache.isis.WebServer</code></a> then it is possible to override the deployment type using the <code>-t</code> (or <code>--type</code>) flag.</p>
-</div>
-<div class="paragraph">
-<p>For example:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">java -jar ... org.apache.isis.WebServer -t SERVER</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>where "&#8230;&#8203;" is the (usually rather long) list of JAR files and class directories that will make up your application.</p>
-</div>
-<div class="paragraph">
-<p>This works for both the <a href="ugvw.html">Wicket viewer</a> and the <a href="ugvro.html">RestfulObjects viewer</a>.</p>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_rgcfg_configuration-files">3. Configuration Files</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>When running an Apache Isis webapp, configuration properties are read from configuration files held in the <code>WEB-INF</code> directory.</p>
-</div>
-<div class="paragraph">
-<p>The <code>WEBINF/isis.properties</code> file is always read and must exist.</p>
-</div>
-<div class="paragraph">
-<p>In addition, the following other properties are searched for and if present also read:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><code>viewer_wicket.properties</code> - if the <a href="ugvw.html">Wicket viewer</a> is in use</p>
-</li>
-<li>
-<p><code>viewer_restfulobjects.properties</code> - if the <a href="ugvro.html">RestfulObjects viewer</a> is in use</p>
-</li>
-<li>
-<p><code>viewer.properties</code> - for any other viewer configuration (but there are none currently)</p>
-</li>
-<li>
-<p><code>persistor_datanucleus.properties</code> - assuming the JDO/DataNucleus objectstore is in use</p>
-</li>
-<li>
-<p><code>persistor.properties</code> - for any other objectstore configuration. <br></p>
-<div class="paragraph">
-<p>This typically is used to hold <code>JDBC</code> <code>URL</code>s, which is arguably a slight violation of the file (because there&#8217;s nothing in Apache Isis to say that persistors have to use <code>JDBC</code>.  However, it is generally convenient to put these <code>JDBC</code> settings into a single location.  If you want, they could reside inin any of <code>persistor_datanucleus.properties</code>, <code>persistor.properties</code> or (even) <code>isis.properties</code></p>
-</div>
-</li>
-<li>
-<p><code>authentication_shiro.properties</code>, <code>authorization_shiro.properties</code></p>
-<div class="paragraph">
-<p>assuming the Shiro Security is in use (but there are no security-related config properties currently; use shiro.ini for Shiro config)</p>
-</div>
-</li>
-<li>
-<p><code>authentication.properties</code>, <code>authorization.properties</code><br></p>
-<div class="paragraph">
-<p>for any other security-related config properties (but there are none currently).</p>
-</div>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>You can if you wish simply store all properties in the <code>isis.properties</code> file; but we think that breaking properties out into sections is preferable.</p>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_rgcfg_configuring-components">4. Specifying components</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Bootstrapping an Apache Isis application involves identifying both:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>the major components (authentication, persistence mechanisms, viewers) of Apache Isis, and also</p>
-</li>
-<li>
-<p>specifying the domain services and persistent entities that make up the application itself.</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>As of 1.9.0 there are two different ways to perform this bootstrapping.  The recommended (newer) approach is to use an <a href="rgcms.html#_rgcms_classes_super_AppManifest"><code>AppManifest</code></a>, specified either programmatically or through the configuration properties.  This allows the components, services and entities to be specified from a single class.  The alternative (and older, pre 1.9.0) approach is to specify this information individually, through configuration properties.</p>
-</div>
-<div class="paragraph">
-<p>To specify the <code>AppManifest</code> as a configuration property, use:</p>
-</div>
-<table class="tableblock frame-all grid-all spread">
-<caption class="title">Table 2. Core Configuration Properties (ignored if <code>isis.appManifest</code> is present)</caption>
-<colgroup>
-<col style="width: 33.3333%;">
-<col style="width: 16.6666%;">
-<col style="width: 50.0001%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">Property</th>
-<th class="tableblock halign-left valign-top">Value<br>
-(<em>default value</em>)</th>
-<th class="tableblock halign-left valign-top">Implements</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.appManifest</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>FQCN</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>o.a.i.applib.AppManifest</code><br></p>
-</div>
-<div class="paragraph">
-<p>By convention this implementation resides in an <code>myapp-app</code> Maven module (as opposed to <code>myapp-dom</code> or <code>myapp-fixture</code>).  See the <a href="ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp archetype</a> for details.</p>
-</div></div></td>
-</tr>
-</tbody>
-</table>
-<div class="paragraph">
-<p>From this the framework can determine the domain services, persistent entities and security (authentication and authorization) mechanisms to use.  Other configuration (including fixtures) can also be specified this way.</p>
-</div>
-<div class="paragraph">
-<p>If the <code>AppManifest</code> approach is <em>not</em> being used, then the following configuration properties are used to specify the major components of Apache Isis to use:</p>
-</div>
-<table class="tableblock frame-all grid-all spread">
-<caption class="title">Table 3. Core Configuration Properties (ignored if <code>isis.appManifest</code> is present)</caption>
-<colgroup>
-<col style="width: 33.3333%;">
-<col style="width: 16.6666%;">
-<col style="width: 50.0001%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">Property</th>
-<th class="tableblock halign-left valign-top">Value<br>
-(<em>default value</em>)</th>
-<th class="tableblock halign-left valign-top">Implements</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.authentication</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>shiro</code>, <code>bypass</code>, <code>FQCN</code><br>
-(<code><em>shiro</em></code>)</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>o.a.i.core.runtime.authentication.</code> <code>AuthenticationManagerInstaller</code><br></p>
-</div>
-<div class="paragraph">
-<p>This property is IGNORED if the <code>isis.appManifest</code> configuration property is specified, or if an <a href="rgcms.html#_rgcms_classes_super_AppManifest"><code>AppManifest</code></a> is provided programmatically.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.authorization</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>shiro</code>, <code>bypass</code>, <code>FQCN</code><br>
-(<code><em>shiro</em></code>)</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>o.a.i.core.runtime.authorization.</code> <code>AuthorizationManagerInstaller</code><br></p>
-</div>
-<div class="paragraph">
-<p>This property is IGNORED if the <code>isis.appManifest</code> configuration property is specified, or if an <a href="rgcms.html#_rgcms_classes_super_AppManifest"><code>AppManifest</code></a> is provided programmatically.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.persistor</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>datanucleus</code>
-(<code><em>datanucleus</em></code>)</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>o.a.i.core.runtime.installerregistry.installerapi.</code> <code>PersistenceMechanismInstaller</code></p>
-</div>
-<div class="paragraph">
-<p>This property is IGNORED completely in 1.9.0+; the <code>datanucleus</code> implementation is always used.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.services-installer</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>configuration</code>, <code>configuration-and-annotation</code>, <code>FQCN</code><br>
-(<code><em>configuration</em></code>)</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>org.apache.isis.core.runtime.services.</code> <code>ServicesInstaller</code><br></p>
-</div>
-<div class="paragraph">
-<p>The mechanism to discover and load domain services:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><code>configuration-and-annotation</code> will search for <code>@DomainService</code>-annotated classes and also read from <code>isis.services</code> configuration property</p>
-</li>
-<li>
-<p><code>configuration</code> will only read from the <code>isis.services</code> configuration property.<br></p>
-</li>
-<li>
-<p>Otherwise an alternative implementation of the <code>o.a.i.core.runtime.services.ServicesInstaller</code> internal API can be provided.<br></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>This property is IGNORED if the <code>isis.appManifest</code> configuration property is specified, or if an <a href="rgcms.html#_rgcms_classes_super_AppManifest"><code>AppManifest</code></a> is provided programmatically.</p>
-</div>
-<div class="paragraph">
-<p>This property is also IGNORED completely in 1.13.0+; the <code>configuration-and-annotation</code> implementation is always used.</p>
-</div></div></td>
-</tr>
-</tbody>
-</table>
-<div class="admonitionblock tip">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-tip" title="Tip"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>The values <code>"shiro"</code>, <code>"bypass"</code> etc are actually aliases for concrete implementations.  It is also possible to specify a fully qualified class name to replace either of the two security components, implementing the appropriate interface.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>If the <code>AppManifest</code> is <em>not</em> being used then there are number of other configuration properties that also must be specified: <code>isis.services</code>, <code>isis.services.ServicesInstallerFromAnnotation.packagePrefix</code> and <code>isis.persistor.datanucleus.RegisterEntities.packagePrefix</code> and <code>isis.fixtures</code>; these are listed in the sections below.</p>
-</div>
-<div class="sect2">
-<h3 id="_viewer_configuration">4.1. Viewer Configuration</h3>
-<div class="paragraph">
-<p>Viewers are specified by way of the filters and servlets in the <a href="ugbtb.html#_ugbtb_web-xml"><code>web.xml</code></a> file; these are not bootstrapped by the framework, rather it is the other way around.</p>
-</div>
-<div class="paragraph">
-<p>In versions prior to <code>1.13.0</code>, the "isis.viewers" context parameter was used to hint which configuration files should be read (corresponding to the viewers in use).  As of <code>1.13.0</code>, however, the configuration property has no effect: the <code>viewer_wicket.properties</code> and <code>viewer_restulobjects.properties</code> are always loaded if available.</p>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_rgcfg_configuring-core">5. Configuring Core</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>This section lists the core/runtime configuration properties recognized by Apache Isis.</p>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>Configuration properties for the JDO/DataNucleus objectstore can be found in the <a href="ugodn.html#_ugodn_configuring">Configuring DataNucleus</a> section later in this chapter, while configuration properties for the viewers can be found in the their respective chapters, <a href="ugvw.html#_ugvw_configuration-properties">here for Wicket viewer</a>, and <a href="ugvro.html#_ugvro_configuration-properties">here for the Restful Objects viewer</a>.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="sect2">
-<h3 id="_rgcfg_configuring-core_domain-events">5.1. Domain Events</h3>
-<table class="tableblock frame-all grid-all spread">
-<caption class="title">Table 4. Core Configuration Properties for Domain Events</caption>
-<colgroup>
-<col style="width: 33.3333%;">
-<col style="width: 16.6666%;">
-<col style="width: 50.0001%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">Property</th>
-<th class="tableblock halign-left valign-top">Value<br>
-(default value)</th>
-<th class="tableblock halign-left valign-top">Description</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.reflector.facet.</code><br>
-<code>actionAnnotation.</code><br>
-<code>domainEvent.postForDefault</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>true</code>,<code>false</code><br>
-(<code>true</code>)</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Whether an event should be posted if <a href="rgant.html#_rgant-Action_domainEvent"><code>@Action#domainEvent()</code></a> is not specified (is set to <code>ActionDomainEvent.Default</code>).</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.reflector.facet.</code><br>
-<code>collectionAnnotation.</code><br>
-<code>domainEvent.postForDefault</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>true</code>,<code>false</code><br>
-(<code>true</code>)</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Whether an event should be posted if <a href="rgant.html#_rgant-Collection_domainEvent"><code>@Collection#domainEvent()</code></a> is not specified (is set to <code>CollectionDomainEvent.Default</code>).</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.reflector.facet.</code><br>
-<code>propertyAnnotation.</code><br>
-<code>domainEvent.postForDefault</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>true</code>,<code>false</code><br>
-(<code>true</code>)</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Whether an event should be posted if <a href="rgant.html#_rgant-Property_domainEvent"><code>@Property#domainEvent()</code></a> is not specified (is set to <code>PropertyDomainEvent.Default</code>).</p>
-</div></div></td>
-</tr>
-</tbody>
-</table>
-</div>
-<div class="sect2">
-<h3 id="_rgcfg_configuring-core_lifecycle-events">5.2. Lifecycle Events</h3>
-<table class="tableblock frame-all grid-all spread">
-<caption class="title">Table 5. Core Configuration Properties for Lifecycle Events</caption>
-<colgroup>
-<col style="width: 33.3333%;">
-<col style="width: 16.6666%;">
-<col style="width: 50.0001%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">Property</th>
-<th class="tableblock halign-left valign-top">Value<br>
-(default value)</th>
-<th class="tableblock halign-left valign-top">Description</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.reflector.facet.</code><br>
-<code>domainObjectAnnotation.</code><br>
-<code>createdLifecycleEvent.</code><br>
-<code>postForDefault</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>true</code>,<code>false</code><br>
-(<code>true</code>)</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Whether an event should be posted if <a href="rgant.html#_rgant-DomainObject_createdLifecycleEvent"><code>@DomainObject#createdLifecycleEvent()</code></a> is not specified (is set to <code>ObjectCreatedEvent.Default</code>).</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.reflector.facet.</code><br>
-<code>domainObjectAnnotation.</code><br>
-<code>loadedLifecycleEvent.</code><br>
-<code>postForDefault</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>true</code>,<code>false</code><br>
-(<code>true</code>)</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Whether an event should be posted if <a href="rgant.html#_rgant-DomainObject_loadedLifecycleEvent"><code>@DomainObject#loadedLifecycleEvent()</code></a> is not specified (is set to <code>ObjectLoadedEvent.Default</code>).</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.reflector.facet.</code><br>
-<code>domainObjectAnnotation.</code><br>
-<code>persistingLifecycleEvent.</code><br>
-<code>postForDefault</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>true</code>,<code>false</code><br>
-(<code>true</code>)</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Whether an event should be posted if <a href="rgant.html#_rgant-DomainObject_persistingLifecycleEvent"><code>@DomainObject#persistingLifecycleEvent()</code></a> is not specified (is set to <code>ObjectPersistingEvent.Default</code>).</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.reflector.facet.</code><br>
-<code>domainObjectAnnotation.</code><br>
-<code>persistedLifecycleEvent.</code><br>
-<code>postForDefault</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>true</code>,<code>false</code><br>
-(<code>true</code>)</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Whether an event should be posted if <a href="rgant.html#_rgant-DomainObject_persistedLifecycleEvent"><code>@DomainObject#persistedLifecycleEvent()</code></a> is not specified (is set to <code>ObjectPersistedEvent.Default</code>).</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.reflector.facet.</code><br>
-<code>domainObjectAnnotation.</code><br>
-<code>removingLifecycleEvent.</code><br>
-<code>postForDefault</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>true</code>,<code>false</code><br>
-(<code>true</code>)</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Whether an event should be posted if <a href="rgant.html#_rgant-DomainObject_removingLifecycleEvent"><code>@DomainObject#removingLifecycleEvent()</code></a> is not specified (is set to <code>ObjectRemovingEvent.Default</code>).</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.reflector.facet.</code><br>
-<code>domainObjectAnnotation.</code><br>
-<code>updatingLifecycleEvent.</code><br>
-<code>postForDefault</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>true</code>,<code>false</code><br>
-(<code>true</code>)</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Whether an event should be posted if <a href="rgant.html#_rgant-DomainObject_updatingLifecycleEvent"><code>@DomainObject#updatingLifecycleEvent()</code></a> is not specified (is set to <code>ObjectUpdatingEvent.Default</code>).</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.reflector.facet.</code><br>
-<code>domainObjectAnnotation.</code><br>
-<code>updatedLifecycleEvent.</code><br>
-<code>postForDefault</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>true</code>,<code>false</code><br>
-(<code>true</code>)</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Whether an event should be posted if <a href="rgant.html#_rgant-DomainObject_updatedLifecycleEvent"><code>@DomainObject#updatedLifecycleEvent()</code></a> is not specified (is set to <code>ObjectUpdatedEvent.Default</code>).</p>
-</div></div></td>
-</tr>
-</tbody>
-</table>
-</div>
-<div class="sect2">
-<h3 id="_rgcfg_configuring-core_ui-events">5.3. UI Events</h3>
-<table class="tableblock frame-all grid-all spread">
-<caption class="title">Table 6. Core Configuration Properties for UI Events</caption>
-<colgroup>
-<col style="width: 33.3333%;">
-<col style="width: 16.6666%;">
-<col style="width: 50.0001%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">Property</th>
-<th class="tableblock halign-left valign-top">Value<br>
-(default value)</th>
-<th class="tableblock halign-left valign-top">Description</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.reflector.facet.</code><br>
-<code>domainObjectLayoutAnnotation.</code><br>
-<code>cssClassUiEvent.postForDefault</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>true</code>,<code>false</code><br>
-(<code>true</code>)</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Whether an event should be posted if <a href="rgant.html#_rgant-DomainObjectLayout_cssClassUiEvent"><code>@DomainObjectLayout#cssClassUiEvent()</code></a> is not specified (is set to <code>CssClassUiEvent.Default</code>).</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.reflector.facet.</code><br>
-<code>domainObjectLayoutAnnotation.</code><br>
-<code>iconUiEvent.postForDefault</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>true</code>,<code>false</code><br>
-(<code>true</code>)</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Whether an event should be posted if <a href="rgant.html#_rgant-DomainObjectLayout_iconUiEvent"><code>@DomainObjectLayout#iconUiEvent()</code></a> is not specified (is set to <code>IconUiEvent.Default</code>).</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.reflector.facet.</code><br>
-<code>domainObjectLayoutAnnotation.</code><br>
-<code>titleUiEvent.postForDefault</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>true</code>,<code>false</code><br>
-(<code>true</code>)</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Whether an event should be posted if <a href="rgant.html#_rgant-DomainObjectLayout_titleUiEvent"><code>@DomainObjectLayout#titleUiEvent()</code></a> is not specified (is set to <code>TitleUiEvent.Default</code>).</p>
-</div></div></td>
-</tr>
-</tbody>
-</table>
-</div>
-<div class="sect2">
-<h3 id="_rgcfg_configuring-core_services">5.4. Services</h3>
-<table class="tableblock frame-all grid-all spread">
-<caption class="title">Table 7. Core Configuration Properties for Services</caption>
-<colgroup>
-<col style="width: 33.3333%;">
-<col style="width: 16.6666%;">
-<col style="width: 50.0001%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">Property</th>
-<th class="tableblock halign-left valign-top">Value<br>
-(default value)</th>
-<th class="tableblock halign-left valign-top">Description</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.services</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>FQCN</code>,<code>FQCN2</code>,&#8230;&#8203;</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Fully qualified class names of classes to be instantiated as domain services. <br></p>
-</div>
-<div class="paragraph">
-<p>Each entry can be optionally prefixed by "n:" specifying the relative order on the menu (corresponds to <a href="rgant.html#_rgant-DomainServiceLayout_menuOrder"><code>@DomainServiceLayout#menuOrder()</code></a>).</p>
-</div>
-<div class="paragraph">
-<p>This property is IGNORED if the <a href="#_rgcfg_configuring-components"><code>isis.appManifest</code></a> configuration property is specified, or if an <a href="rgcms.html#_rgcms_classes_super_AppManifest"><code>AppManifest</code></a> is provided programmatically.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.services.</code><br>
-<code>applicationFeatures.</code><br>
-<code>init</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>lazy</code>, <code>eager</code><br>
-(<code>lazy</code>)</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Whether the application features repository (which surfaces the framework&#8217;s metamodel) should be
-initialized lazily or eagerly. <br></p>
-</div>
-<div class="paragraph">
-<p>Lazy initialization can speed up bootstrapping, useful while developing and running tests.  The default prior to <code>1.13.0</code> was eager initialization.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.services.</code><br>
-<code>audit.</code><br>
-<code>objects</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>all</code>, <code>none</code><br>
-(<code>all</code>)</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Whether the changed properties of objects should be automatically audited (for objects annotated with <a href="rgant.html#_rgant-DomainObject_auditing"><code>@DomainObject(auditing=Auditing.AS_CONFIGURED)</code></a>.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.services.</code><br>
-<code>command.</code><br>
-<code>actions</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>all</code>, <code>ignoreSafe</code>, <code>none</code> (<code>all</code>)</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Whether action invocations should be automatically reified into commands (for actions annotated with <a href="rgant.html#_rgant-Action_command"><code>@Action(command=CommandReification.AS_CONFIGURED)</code></a>. <br></p>
-</div>
-<div class="paragraph">
-<p><code>ignoreQueryOnly</code> is an alias for <code>ignoreSafe</code>.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.services.</code><br>
-<code>command.</code><br>
-<code>properties</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>all</code>, <code>none</code> (<code>all</code>)</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>(Whether property edits should be automatically reified into commands (for properties annotated with <a href="rgant.html#_rgant-Property_command"><code>@Property(command=CommandReification.AS_CONFIGURED)</code></a>. <br></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.services.</code><br>
-<code>container.</code><br>
-<code>disableAutoFlush</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>true</code>,<code>false</code><br>
-(<code>false</code>)</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Whether the <code>DomainObjectContainer</code> should automatically flush pending changes prior to querying (via <code>allMatches()</code>, <code>firstMatch()</code> and so on).</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.services.</code><br>
-<code>ContentNegotiation-</code><br>
-<code>ServiceXRoDomainType</code><br>
-.<code>prettyPrint</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>true</code>,<code>false</code><br>
-(depends)</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>If a domain object has been mapped to the specified JAXB <code>x-ro-domain-type</code>, then determines whether the result is pretty-printed or not.<br></p>
-</div>
-<div class="paragraph">
-<p>If no configuration property is available, then the defaults is determined by the <a href="#_rgcfg_deployment-types">deployment type</a>: production mode disables pretty printing, while prototype mode enables it.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.service.</code><br>
-<code>email.</code><br>
-<code>override.bcc</code><br></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">email address</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>intended to simplify testing, if specified then the email&#8217;s <code>bcc</code> address will be that specified (rather than the email address(es) passed in as an argument to <code>EmailService#send(&#8230;&#8203;)</code>). <br></p>
-</div>
-<div class="paragraph">
-<p>NB: note that the key is mis-spelt, (<code>isis.service.email</code> rather than <code>isis.services.email</code>)</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.service.</code><br>
-<code>email.</code><br>
-<code>override.cc</code><br></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">email address</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>intended to simplify testing, if specified then the email&#8217;s <code>cc</code> address will be that specified (rather than the email address(es) passed in as an argument to <code>EmailService#send(&#8230;&#8203;)</code>). <br></p>
-</div>
-<div class="paragraph">
-<p>NB: note that the key is mis-spelt, (<code>isis.service.email</code> rather than <code>isis.services.email</code>)</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.service.</code><br>
-<code>email.</code><br>
-<code>override.to</code><br></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">email address</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>intended to simplify testing, if specified then the email&#8217;s <code>to</code> address will be that specified (rather than the email address(es) passed in as an argument to <code>EmailService#send(&#8230;&#8203;)</code>). <br></p>
-</div>
-<div class="paragraph">
-<p>NB: note that the key is mis-spelt, (<code>isis.service.email</code> rather than <code>isis.services.email</code>)</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.service.</code><br>
-<code>email.</code><br>
-<code>port</code><br></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">port number (<code><em>587</em></code>)</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>The port number for the SMTP service on the the external SMTP host (used by <a href="rgsvc.html#_rgsvc_api_EmailService"><code>EmailService</code></a>). <br></p>
-</div>
-<div class="paragraph">
-<p>NB: note that the key is mis-spelt, (<code>isis.service.email</code> rather than <code>isis.services.email</code>)</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.service.</code><br>
-<code>email.</code><br>
-<code>sender.address</code><br></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">email address</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>The email address to use for sending out email (used by <a href="rgsvc.html#_rgsvc_api_EmailService"><code>EmailService</code></a>).
-<strong>Mandatory</strong>. <br></p>
-</div>
-<div class="paragraph">
-<p>NB: note that the key is mis-spelt, (<code>isis.service.email</code> rather than <code>isis.services.email</code>)</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.service.</code><br>
-<code>email.</code><br>
-<code>sender.hostname</code><br></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">host (<code><em>smtp.gmail.com</em></code>)</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>The hostname of the external SMTP provider (used by <a href="rgsvc.html#_rgsvc_api_EmailService"><code>EmailService</code></a>). <br></p>
-</div>
-<div class="paragraph">
-<p>NB: note that the key is mis-spelt, (<code>isis.service.email</code> rather than <code>isis.services.email</code>)</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.service.</code><br>
-<code>email.</code><br>
-<code>sender.password</code><br></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">email password</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>The corresponding password for the email address to use for sending out email (used by <a href="rgsvc.html#_rgsvc_api_EmailService"><code>EmailService</code></a>).
-<strong>Mandatory</strong>. <br></p>
-</div>
-<div class="paragraph">
-<p>NB: note that the key is mis-spelt, (<code>isis.service.email</code> rather than <code>isis.services.email</code>)</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.service.</code><br>
-<code>email.</code><br>
-<code>socket</code><br>
-<code>ConnectionTimeout</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">milliseconds<br>
-(2000)</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>The socket connection timeout</p>
-</div>
-<div class="paragraph">
-<p>NB: note that the key is mis-spelt, (<code>isis.service.email</code> rather than <code>isis.services.email</code>)</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.service.</code><br>
-<code>email.</code><br>
-<code>socketTimeout</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">milliseconds<br>
-(2000)</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>The socket timeout</p>
-</div>
-<div class="paragraph">
-<p>NB: note that the key is mis-spelt, (<code>isis.service.email</code> rather than <code>isis.services.email</code>)</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.service.</code><br>
-<code>email.</code><br>
-<code>throwExceptionOnFail</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>true</code>,<code>false</code><br>
-(<code>true</code>)</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Whether to throw an exception if there the email cannot be sent (probably because of some misconfiguration).</p>
-</div>
-<div class="paragraph">
-<p>This behaviour is (now) the default; the old behaviour (of just returning <code>false</code> from the <code>send()</code> method) can be re-enabled by setting this property to <code>false</code>.</p>
-</div>
-<div class="paragraph">
-<p>NB: note that the key is mis-spelt, (<code>isis.service.email</code> rather than <code>isis.services.email</code>)</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.service.</code><br>
-<code>email.</code><br>
-<code>tls.enabled</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>true</code>,<code>false</code><br>
-(<code>true</code>)</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Whether to enable TLS for the email SMTP connection (used by <a href="rgsvc.html#_rgsvc_api_EmailService"><code>EmailService</code></a>). <br></p>
-</div>
-<div class="paragraph">
-<p>NB: note that the key is mis-spelt, (<code>isis.service.email</code> rather than <code>isis.services.email</code>)</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.services.</code><br>
-<code>eventbus.</code><br>
-<code>implementation</code><br></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>guava</code>, <code>axon</code>,<br>
-FQCN (<code><em>guava</em></code>)</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>which implementation to use by the <a href="rgsvc.html#_rgsvc_api_EventBusService"><code>EventBusService</code></a> as the underlying event bus.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.services.</code><br>
-<code>eventbus.</code><br>
-<code>allowLate</code><br>
-<code>Registration</code><br></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>true</code>,<code>false</code><br>
-(<code>false</code>)</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>whether a domain service can register with the <a href="rgsvc.html#_rgsvc_api_EventBusService"><code>EventBusService</code></a> after any events have posted.<br></p>
-</div>
-<div class="paragraph">
-<p>Since this almost certainly constitutes a bug in application code, by default this is disallowed.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.services.</code><br>
-<code>exceprecog.</code><br>
-<code>logRecognized</code><br>
-<code>Exceptions</code><br></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>true</code>,<code>false</code><br>
-(<code>false</code>)</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>whether recognized exceptions should also be logged.<br></p>
-</div>
-<div class="paragraph">
-<p>Generally a recognized exception is one that is expected (for example a uniqueness constraint violated in the database) and which does not represent an error condition.
-This property logs the exception anyway, useful for debugging.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.services.</code><br>
-<code>ExceptionRecognizer</code><br>
-<code>CompositeFor</code><br>
-<code>JdoObjectStore.</code><br>
-<code>disable</code><br></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>true</code>,<code>false</code><br>
-(<code>false</code>)</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>whether to disable the default recognizers registered by <code>ExceptionRecognizerCompositeForJdoObjectStore</code>.<br></p>
-</div>
-<div class="paragraph">
-<p>This implementation provides a default set of recognizers to convert RDBMS constraints into user-friendly messages.
-In the (probably remote) chance that this functionality isn&#8217;t required, they can be disabled through this flag.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.services.</code><br>
-<code>injector.</code><br>
-<code>injectPrefix</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>true</code>,<code>false</code> <br>
-(<code>false</code>)</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>(Whether the framework should support <code>inject&#8230;&#8203;()</code> as a prefix for injecting domain services into other domain objects.</p>
-</div>
-<div class="paragraph">
-<p>+
-By default this is disabled.
-The default prior to <code>1.13.0</code> was enabled.
-If the setting is left as disabled then this may reduce application start-up times.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.services.</code><br>
-<code>injector.</code><br>
-<code>setPrefix</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>true</code>,<code>false</code> <br>
-(<code>true</code>)</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Whether the framework should support <code>set&#8230;&#8203;()</code> as a prefix for injecting domain services into other domain objects.</p>
-</div>
-<div class="paragraph">
-<p>+
-By default this is enabled (no change in <code>1.13.0</code>).
-If the setting is changed to disabled then this may reduce application start-up times.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.services.</code><br>
-<code>publish.</code><br>
-<code>objects</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>all</code>, <code>none</code><br>
-(<code>all</code>)</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Whether changed objects should be automatically published (for objects annotated with <a href="rgant.html#_rgant-DomainObject_publishing"><code>@DomainObject(publishing=Publishing.AS_CONFIGURED)</code></a>.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.services.</code><br>
-<code>publish.</code><br>
-<code>actions</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>all</code>, <code>ignoreSafe</code>, <code>none</code> (<code>none</code>)</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Whether actions should be automatically published (for actions annotated with <a href="rgant.html#_rgant-Action_publishing"><code>@Action(publishing=Publishing.AS_CONFIGURED)</code></a>.<br></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.services.</code><br>
-<code>publish.</code><br>
-<code>properties</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>all</code>, <code>none</code> (<code>none</code>)</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Whether properties should be automatically published (for properties annotated with <a href="rgant.html#_rgant-Action_publishing"><code>@Property(publishing=Publishing.AS_CONFIGURED)</code></a>.<br></p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.services.</code><br>
-<code>ServicesInstaller</code><br>
-<code>FromAnnotation.</code><br>
-<code>packagePrefix</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">fully qualified package names (CSV)</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>to search for domain services (including all subpackages).</p>
-</div>
-<div class="paragraph">
-<p>This property is IGNORED if the <a href="#_rgcfg_configuring-components"><code>isis.appManifest</code></a> configuration property is specified, or if an <a href="rgcms.html#_rgcms_classes_super_AppManifest"><code>AppManifest</code></a> is provided programmatically.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.services.</code><br>
-<code>translation.</code><br>
-<code>po.mode</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>read</code>,<code>write</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Whether to force the <code>TranslationService</code> into either read or write mode.<br></p>
-</div>
-<div class="paragraph">
-<p>See <a href="ugbtb.html#_ugbtb_i18n">i18n support</a> to learn more about the translation service.</p>
-</div></div></td>
-</tr>
-</tbody>
-</table>
-</div>
-<div class="sect2">
-<h3 id="_rgcfg_configuring-core_metamodel-validation">5.5. MetaModel Validation</h3>
-<table class="tableblock frame-all grid-all spread">
-<caption class="title">Table 8. Metamodel Validation</caption>
-<colgroup>
-<col style="width: 33.3333%;">
-<col style="width: 16.6666%;">
-<col style="width: 50.0001%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">Property</th>
-<th class="tableblock halign-left valign-top">Value<br>
-(default value)</th>
-<th class="tableblock halign-left valign-top">Description</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.reflector.validator</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>FQCN</code></p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Custom implementation of <code>MetaModelValidator</code> (in the <code>org.apache.isis.core.metamodel.specloader.validator</code> package)<br></p>
-</div>
-<div class="paragraph">
-<p>See <a href="ugbtb.html#_ugbtb_programming-model_custom-validator">Custom Validator</a> to learn more.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.reflector.validator.</code><br>
-<code>actionCollection</code><br>
-<code>ParameterChoices</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>true</code>,<code>false</code><br>
-(<code>true</code>)</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Whether to check that collection action parameters have a corresponding choices or autoComplete facet.<br></p>
-</div>
-<div class="paragraph">
-<p>In the current implementation such a facet is always required, so this configuration option has only been introduced as a feature flag in case it needs to be disabled for some reason.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.reflector.validator.</code><br>
-<code>allowDeprecated</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>true</code>,<code>false</code><br>
-(<code>true</code>)</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Whether deprecated annotations or naming conventions are tolerated or not.
-If not, then a metamodel validation error will be triggered, meaning the app won&#8217;t boot (fail-fast).<br></p>
-</div>
-<div class="paragraph">
-<p>See also <code>isis.reflector.facets.ignoreDeprecated</code>.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.reflector.validator.</code><br>
-<code>explicitObjectType</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>true</code>,<code>false</code><br>
-(<code>false</code>)</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Whether to check that the class has an object type explicitly specified somehow.</p>
-</div>
-<div class="paragraph">
-<p>The object type is used by the framework as an alias for the object&#8217;s concrete class; it is one part of the object&#8217;s OID and can be seen in the URLs of the <a href="ugvw.html">Wicket viewer</a> and <a href="ugvro.html">Restful Objects viewer</a>, and is encoded in the <code>Bookmark</code>s returned by the <a href="rgsvc.html#_rgsvc_api_BookmarkService"><code>BookmarkService</code></a>.
-In this was it may also be persisted, for example in polymorphic associations or command or auditing tables.</p>
-</div>
-<div class="paragraph">
-<p>If the object type is not specified explicitly, then this can cause data migration issues if the class is subsequently refactored (eg renamed, or moved to a different package).</p>
-</div>
-<div class="paragraph">
-<p>This configuration property can be used to enforce a rule that the object type must always be specified (for persistent entities and view models).</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.reflector.validator.</code><br>
-<code>jdoqlFromClause</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>true</code>,<code>false</code><br>
-(<code>true</code>)</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Whether to check that the class name in JDOQL <code>FROM</code> clause matches or is a supertype of the class on which it is annotated.<br></p>
-</div>
-<div class="paragraph">
-<p>Only "SELECT" queries are validated; "UPDATE" queries etc are simply ignored.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.reflector.validator.</code><br>
-<code>jdoqlVariablesClause</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>true</code>,<code>false</code><br>
-(<code>true</code>)</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Whether to check that the class name in JDOQL <code>VARIABLES</code> clause is a recognized class.<br></p>
-</div>
-<div class="paragraph">
-<p>Note that although JDOQL syntax supports multiple <code>VARIABLES</code> classes, currently the validator only checks the first class name found.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.reflector.validator.</code><br>
-<code>mixinsOnly</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>true</code>,<code>false</code><br>
-(<code>false</code>)</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Mixins provide a simpler programming model to contributed domain services.<br></p>
-</div>
-<div class="paragraph">
-<p>If enabled, this configuration property will treat any contributed service as invalid.
-This is by way of possibly deprecating and eventually moving contributed services from the Apache Isis programming model.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.reflector.validator.</code><br>
-<code>noParamsOnly</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>true</code>,<code>false</code><br>
-(<code>false</code>)</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>When searching for  <a href="rgcms.html#_rgcms_methods_prefixes_disable"><code>disableXxx()</code></a> or <a href="rgcms.html#_rgcms_methods_prefixes_hide"><code>hideXxx()</code></a> methods, whether to search only for the no-param version (or also for supporting methods that match the parameter types of the action).<br></p>
-</div>
-<div class="paragraph">
-<p>If enabled then will not search for supporting methods with the exact set of arguments as the method it was supporting (and any supporting methods that have additional parameters will be treated as invalid).
-Note that this in effect means that <a href="rgcms.html#_rgcms_classes_mixins">mixins</a> must be used instead of <a href="ugbtb.html#_ugbtb_decoupling_contributions">contributed services</a>.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.reflector.validator.</code><br>
-<code>serviceActionsOnly</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>true</code>,<code>false</code><br>
-(<code>false</code>)</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Domain services are stateless (at least conceptually) and so should not have any properties or collections; any that are defined will not be rendered by the viewers.<br></p>
-</div>
-<div class="paragraph">
-<p>If enabled, this configuration property will ensure that domain services only declare actions.</p>
-</div></div></td>
-</tr>
-</tbody>
-</table>
-</div>
-<div class="sect2">
-<h3 id="_rgcfg_configuring-core_other">5.6. Other Config Properties</h3>
-<table class="tableblock frame-all grid-all spread">
-<caption class="title">Table 9. Other Core Configuration Properties</caption>
-<colgroup>
-<col style="width: 33.3333%;">
-<col style="width: 16.6666%;">
-<col style="width: 50.0001%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">Property</th>
-<th class="tableblock halign-left valign-top">Value<br>
-(default value)</th>
-<th class="tableblock halign-left valign-top">Description</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.objects.</code><br>
-<code>editing</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>true</code>,<code>false</code><br>
-(<code>true</code>)</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Whether objects' properties and collections can be edited directly (for objects annotated with <a href="rgant.html#_rgant-DomainObject_editing"><code>@DomainObject#editing()</code></a>); see <a href="#_rgcfg_configuring-core_isis-objects-editing">below</a> for further discussion.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.persistor.</code><br>
-<code>disable</code><br>
-<code>ConcurrencyChecking</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>true</code>,<code>false</code><br>
-(<code>false</code>)</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Disables concurrency checking globally. <br></p>
-</div>
-<div class="paragraph">
-<p>Only intended for "emergency use" as a workaround while pending fix/patch to Apache Isis itself.  (Note that there is no "datanucleus" in the property).</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.reflector.facet.</code><br>
-<code>cssClass.patterns</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">regex:css1, regex2:css2,&#8230;&#8203;</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Comma separated list of key:value pairs, where the key is a regex matching action names (eg <code>delete.*</code>) and the value is a <a href="http://getbootstrap.com/css/">Bootstrap</a> CSS button class (eg <code>btn-warning) to be applied (as per `@CssClass()</code>) to all action members matching the regex.<br></p>
-</div>
-<div class="paragraph">
-<p>See <a href="ugfun.html#_ugfun_how-tos_ui-hints_action-icons-and-css">UI hints</a> for more details.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.reflector.facet.</code><br>
-<code>cssClassFa.patterns</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">regex:fa-icon,regex2:fa-icon2,&#8230;&#8203;</p></td>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p>Comma separated list of key:value pairs, where the key is a regex matching action names (eg <code>create.*</code>) and the value is a <a href="http://fortawesome.github.io/Font-Awesome/icons/">font-awesome</a> icon name (eg <code>fa-plus</code>) to be applied (as per <code>@CssClassFa()</code>) to all action members matching the regex.<br></p>
-</div>
-<div class="paragraph">
-<p>See <a href="ugfun.html#_ugfun_how-tos_ui-hints_action-icons-and-css">UI hints</a> for more details.</p>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><div><div class="paragraph">
-<p><code>isis.reflector.facet.</code><br>
-<code>filterVisibility</code></p>
-</div></div></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>true</code>,<code>fals

<TRUNCATED>

[29/44] isis-site git commit: ISIS-1594: provide an 'edit' button

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/83a3755a/content/guides/rgmvn.html
----------------------------------------------------------------------
diff --git a/content/guides/rgmvn.html b/content/guides/rgmvn.html
index f9908a4..00c924c 100644
--- a/content/guides/rgmvn.html
+++ b/content/guides/rgmvn.html
@@ -1,12 +1,10 @@
 <!doctype html>
 <html class="no-js" lang="en">
-<head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-
-    <title>Apache Isis Maven plugin</title>
-
-    <!--
+ <head> 
+  <meta charset="utf-8"> 
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"> 
+  <title>Apache Isis Maven plugin</title> 
+  <!--
         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
@@ -23,31 +21,21 @@
         KIND, either express or implied.  See the License for the
         specific language governing permissions and limitations
         under the License.
-    -->
-
-    <!-- No caching headers -->
-    <meta http-equiv="cache-control" content="no-cache" />
-    <meta http-equiv="pragma" content="no-cache" />
-    <meta http-equiv="expires" content="-1" />
-
-
-    <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line -->
-    <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet" />
-    <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script>
-    <link href="../css/asciidoctor/colony.css" rel="stylesheet">
-    <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-
-
-
-    <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet" />
-    <!--[if lt IE 9]>
+    --> 
+  <!-- No caching headers --> 
+  <meta http-equiv="cache-control" content="no-cache"> 
+  <meta http-equiv="pragma" content="no-cache"> 
+  <meta http-equiv="expires" content="-1"> 
+  <!-- TODO: need to (re)instate CDN in the future (not using for now just so can develop off-line --> 
+  <link href="../css/foundation/5.5.1/foundation.css" rel="stylesheet"> 
+  <script src="../js/foundation/5.5.1/vendor/modernizr.js"></script> 
+  <link href="../css/asciidoctor/colony.css" rel="stylesheet"> 
+  <link href="../css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet"> 
+  <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.css" rel="stylesheet"> 
+  <!--[if lt IE 9]>
       <link href="../css/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.ie.css" rel="stylesheet" />
-    <![endif]-->
-
-
-
-    <style type="text/css">
+    <![endif]--> 
+  <style type="text/css">
         pre code {
             background-color: inherit;
             border-style: none;
@@ -192,9 +180,8 @@ table.CodeRay td.code>pre{padding:0}
         color:#fff;
         font-size: 1.1em;
     }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         @media only screen and (min-width: 40.063em) {
           .top-bar {
             .contain-to-grid .top-bar {
@@ -205,9 +192,8 @@ table.CodeRay td.code>pre{padding:0}
         .row {
             max-width: 80rem;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .extended-quote,
         .extended-quote-first {
             margin-left: 40px;
@@ -231,9 +217,8 @@ table.CodeRay td.code>pre{padding:0}
             text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
         }
         
-    </style>
-
-    <style>
+    </style> 
+  <style>
         body {
           position: relative;
         }
@@ -255,6 +240,7 @@ table.CodeRay td.code>pre{padding:0}
 
         div#doc-content {
             margin-top: 30px;
+            padding-top: 30px;
         }
 
         div.documentation-page table.frame-all {
@@ -286,9 +272,8 @@ table.CodeRay td.code>pre{padding:0}
             min-height: 2000px;
         }
 
-    </style>
-
-    <style>
+    </style> 
+  <style>
 
         @media only screen and (min-width: 768px) {
           #toc.toc2 ul ul { margin-left: -10px; }
@@ -316,15 +301,13 @@ table.CodeRay td.code>pre{padding:0}
         body div#toc2 li.tocify-item.active a {
             color: red;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         footer {
             margin-top: 1000px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* overriding colony.css stylesheet */
         .literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] {
            /*padding: 1.25em 1.5625em 1.125em 1.5625em;*/
@@ -372,9 +355,8 @@ table.CodeRay td.code>pre{padding:0}
         .imageblock img {
             margin-bottom: 10px;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         /* from http://ben.balter.com/2014/03/13/pages-anchor-links/ */
         .header-link {
           position: absolute;
@@ -395,9 +377,8 @@ table.CodeRay td.code>pre{padding:0}
         h6:hover .header-link {
           opacity: 1;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         .top-bar
         {
             -webkit-transition-duration: .5s;
@@ -425,220 +406,155 @@ table.CodeRay td.code>pre{padding:0}
             -webkit-transition-property: -webkit-transform;
             transition-property: transform;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
         #doc-content a.guide {
             color: white;
         }
-    </style>
-
-    <style>
+    </style> 
+  <style>
+        .tocify {
+            margin-top: 80px;
+        }
+    </style> 
+  <style>
         .tocify {
             margin-top: 80px;
         }
-    </style>
-
-
-</script>
-
-</head>
-<body>
-
-<<div class="github-fork-ribbon-wrapper right" style="position: fixed;">
-    <div class="github-fork-ribbon">
-        <a href="https://github.com/apache/isis#fork-destination-box">Fork me on GitHub</a>
-    </div>
-</div>
-
-
-<div class="row">
-
-    <div class="fixed contain-to-grid header">
-        <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem">
-            <ul class="title-area">
-                <li class="name">
-                    <h1>
-                        <a href="/index.html">Apache Isis&trade;</a>
-                    </h1>
-                </li>
-                <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
-                <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
-            </ul>
-
-            <section class="top-bar-section">
-                <ul class="right">
-
-                    <li class="has-form">
-                       <FORM class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
-                        <div class="row collapse">
-                            <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
-                            <INPUT type="hidden" name="cof" value="FORID:0">
-                            <INPUT class="form-control" name="q" type="text" placeholder="Search">
-                        </div>
-                    </FORM>
-                     </li>
-
-                </ul>
-
-                <!-- Left Nav Section -->
-                <ul class="left">
-
-                    <li><a href="/documentation.html">Documentation</a></li>
-                    <li><a href="/downloads.html">Downloads</a></li>
-                    <li><a href="/help.html">Help</a></li>
-                    <li><a href="/asf.html">@ASF</a></li>
-
-                </ul>
-
-            </section>
-        </nav>
-    </div>
-</div>
-
-<div class="row">
-
-    <div id="doc-content-left" class="large-9 medium-9 columns">
-
-
-        <div id="doc-content">
-          <div class="sect1">
-<h2 id="_rgmvn">1. Apache Isis Maven plugin</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>This reference guide describes the goals provided by Apache Isis' Maven plugin.</p>
-</div>
-<div class="sect2">
-<h3 id="_other_guides">1.1. Other Guides</h3>
-<div class="paragraph">
-<p>Apache Isis documentation is broken out into a number of user, reference and "supporting procedures" guides.</p>
-</div>
-<div class="paragraph">
-<p>The user guides available are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="ugfun.html">Fundamentals</a></p>
-</li>
-<li>
-<p><a href="ugvw.html">Wicket viewer</a></p>
-</li>
-<li>
-<p><a href="ugvro.html">Restful Objects viewer</a></p>
-</li>
-<li>
-<p><a href="ugdno.html">DataNucleus object store</a></p>
-</li>
-<li>
-<p><a href="ugsec.html">Security</a></p>
-</li>
-<li>
-<p><a href="ugtst.html">Testing</a></p>
-</li>
-<li>
-<p><a href="ugbtb.html">Beyond the Basics</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The reference guides are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="rgant.html">Annotations</a></p>
-</li>
-<li>
-<p><a href="rgsvc.html">Domain Services</a></p>
-</li>
-<li>
-<p><a href="rgcfg.html">Configuration Properties</a></p>
-</li>
-<li>
-<p><a href="rgcms.html">Classes, Methods and Schema</a></p>
-</li>
-<li>
-<p><a href="#">Apache Isis Maven plugin</a> (this guide)</p>
-</li>
-<li>
-<p><a href="rgfis.html">Framework Internal Services</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The remaining guides are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="dg.html">Developers' Guide</a> (how to set up a development environment
-for Apache Isis and contribute back to the project)</p>
-</li>
-<li>
-<p><a href="cgcom.html">Committers' Guide</a> (release procedures and related practices)</p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_rgmvn_intro">2. Introduction</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>The Apache Isis Maven plugin defines three goals:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><code>validate</code><br></p>
-<div class="paragraph">
-<p>Use to verify at build time that the metamodel of an application is valid.  This runs the <code>MetaModelValidator</code> that is also run when the application is started up.</p>
-</div>
-</li>
-<li>
-<p><code>swagger</code><br></p>
-<div class="paragraph">
-<p>Uses the <a href="rgsvc.html#_rgsvc_api_SwaggerService"><code>SwaggerService</code></a> to generate <a href="http://swagger.io">Swagger</a> spec files that describe the public and/or private RESTful APIs exposed by the <a href="ugvro.html">RestfulObjects viewer</a>.</p>
-</div>
-</li>
-<li>
-<p><code>xsd</code><br></p>
-<div class="paragraph">
-<p>Uses the <a href="rgsvc.html#_rgsvc_api_JaxbService"><code>JaxbService</code></a> to generate XSD schemas from any JAXB-annotated view models/DTOs.<br></p>
-</div>
-<div class="paragraph">
-<p>This is instead of and preferable to using the JAXB <a href="https://jaxb.java.net/2.2.4/docs/schemagen.html">schemagen</a> tool, because it uses the framework&#8217;s support (via <a href="rgant.html#_rgant-XmlJavaTypeAdapter"><code>@XmlJavaTypeAdapter</code></a>) to translate any references to domain objects into <code>OidDto</code>s (as defined by the Apache Isis <a href="rgcms.html#_rgcms_schema-common">common schema</a>).</p>
-</div>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The <code>validate</code> goal is by default bound to the <code>test</code> phase, and the <code>swagger</code> goal is by default bound to the <code>package</code> phase; both are typically of your application&#8217;s <code>dom</code> sub-module.  The <code>xsd</code> goal meanwhile defaults to the <code>generate-resources</code> phase, and this is generally used in a completely separate sub-module.  An example can be found in the (non-ASF) <a href="http://github.com/isisaddons/isis-app-todoapp">Isis addons' todoapp</a> example app; the separate submodule that uses the <code>xsd</code> goal is (also) called <code>todoapp-xsd</code>.</p>
-</div>
-<div class="paragraph">
-<p>All of these goals require an <a href="rgcms.html#_rgcms_classes_AppManifest-bootstrapping"><code>AppManifest</code></a> to point the plugin at, so that
-it knows how to bootstrap an Isis runtime.  This is discussed below, followed by sections on configuring the two goals.</p>
-</div>
-<div class="sect2">
-<h3 id="_rgmvn_intro_app-manifest">2.1. <code>AppManifest</code></h3>
-<div class="paragraph">
-<p>As noted in the introduction, all the goals require an <a href="rgcms.html#_rgcms_classes_AppManifest-bootstrapping"><code>AppManifest</code></a>
-to point the plugin at, so that it knows how to bootstrap an Isis runtime.</p>
-</div>
-<div class="paragraph">
-<p>This can be extremely minimal; it isn&#8217;t necessary to use the main <code>AppManifest</code> (in the <code>app</code> module) used to
-bootstrap the application, you can instead use a cut-down one.  This then allows the plugins to be run during the
-build of the <code>dom</code> module, rather than having to run in the context of the <code>integtest</code> module.</p>
-</div>
-<div class="paragraph">
-<p>For example, the <a href="ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp</a>'s
-manifest is:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="keyword">package</span> <span class="namespace">domainapp.dom</span>;
+    </style>  
+ </head> 
+ <body> 
+  <div class="row"> 
+   <div class="fixed contain-to-grid header"> 
+    <nav class="top-bar" data-topbar role="navigation" style="max-width: 80rem"> 
+     <ul class="title-area"> 
+      <li class="name"> <h1> <a href="/index.html">Apache Isis\u2122</a> </h1> </li> 
+      <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone --> 
+      <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li> 
+     </ul> 
+     <section class="top-bar-section"> 
+      <ul class="right"> 
+       <li class="has-form"> 
+        <form class="searchbox navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse"> 
+         <div class="row collapse"> 
+          <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya"> 
+          <input type="hidden" name="cof" value="FORID:0"> 
+          <input class="form-control" name="q" type="text" placeholder="Search"> 
+         </div> 
+        </form> </li> 
+      </ul> 
+      <!-- Left Nav Section --> 
+      <ul class="left"> 
+       <li><a href="/documentation.html">Documentation</a></li> 
+       <li><a href="/downloads.html">Downloads</a></li> 
+       <li><a href="/help.html">Help</a></li> 
+       <li><a href="/asf.html">@ASF</a></li> 
+      </ul> 
+     </section> 
+    </nav> 
+   </div> 
+  </div> 
+  <div class="row"> 
+   <div id="doc-content-left" class="large-9 medium-9 columns"> 
+    <div id="doc-content">
+     <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/rgmvn.adoc&quot;" style="float: right; font-size: small; padding: 6px;  "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+     <div class="sect1"> 
+      <h2 id="_rgmvn">1. Apache Isis Maven plugin</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_rgmvn.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>This reference guide describes the goals provided by Apache Isis' Maven plugin.</p> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_other_guides">1.1. Other Guides</h3> 
+        <div class="paragraph"> 
+         <p>Apache Isis documentation is broken out into a number of user, reference and "supporting procedures" guides.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The user guides available are:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><a href="ugfun.html">Fundamentals</a></p> </li> 
+          <li> <p><a href="ugvw.html">Wicket viewer</a></p> </li> 
+          <li> <p><a href="ugvro.html">Restful Objects viewer</a></p> </li> 
+          <li> <p><a href="ugdno.html">DataNucleus object store</a></p> </li> 
+          <li> <p><a href="ugsec.html">Security</a></p> </li> 
+          <li> <p><a href="ugtst.html">Testing</a></p> </li> 
+          <li> <p><a href="ugbtb.html">Beyond the Basics</a></p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The reference guides are:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><a href="rgant.html">Annotations</a></p> </li> 
+          <li> <p><a href="rgsvc.html">Domain Services</a></p> </li> 
+          <li> <p><a href="rgcfg.html">Configuration Properties</a></p> </li> 
+          <li> <p><a href="rgcms.html">Classes, Methods and Schema</a></p> </li> 
+          <li> <p><a href="#">Apache Isis Maven plugin</a> (this guide)</p> </li> 
+          <li> <p><a href="rgfis.html">Framework Internal Services</a></p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The remaining guides are:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><a href="dg.html">Developers' Guide</a> (how to set up a development environment for Apache Isis and contribute back to the project)</p> </li> 
+          <li> <p><a href="cgcom.html">Committers' Guide</a> (release procedures and related practices)</p> </li> 
+         </ul> 
+        </div> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_rgmvn_intro">2. Introduction</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_rgmvn_intro.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>The Apache Isis Maven plugin defines three goals:</p> 
+       </div> 
+       <div class="ulist"> 
+        <ul> 
+         <li> <p><code>validate</code><br></p> 
+          <div class="paragraph"> 
+           <p>Use to verify at build time that the metamodel of an application is valid. This runs the <code>MetaModelValidator</code> that is also run when the application is started up.</p> 
+          </div> </li> 
+         <li> <p><code>swagger</code><br></p> 
+          <div class="paragraph"> 
+           <p>Uses the <a href="rgsvc.html#_rgsvc_api_SwaggerService"><code>SwaggerService</code></a> to generate <a href="http://swagger.io">Swagger</a> spec files that describe the public and/or private RESTful APIs exposed by the <a href="ugvro.html">RestfulObjects viewer</a>.</p> 
+          </div> </li> 
+         <li> <p><code>xsd</code><br></p> 
+          <div class="paragraph"> 
+           <p>Uses the <a href="rgsvc.html#_rgsvc_api_JaxbService"><code>JaxbService</code></a> to generate XSD schemas from any JAXB-annotated view models/DTOs.<br></p> 
+          </div> 
+          <div class="paragraph"> 
+           <p>This is instead of and preferable to using the JAXB <a href="https://jaxb.java.net/2.2.4/docs/schemagen.html">schemagen</a> tool, because it uses the framework\u2019s support (via <a href="rgant.html#_rgant-XmlJavaTypeAdapter"><code>@XmlJavaTypeAdapter</code></a>) to translate any references to domain objects into <code>OidDto</code>s (as defined by the Apache Isis <a href="rgcms.html#_rgcms_schema-common">common schema</a>).</p> 
+          </div> </li> 
+        </ul> 
+       </div> 
+       <div class="paragraph"> 
+        <p>The <code>validate</code> goal is by default bound to the <code>test</code> phase, and the <code>swagger</code> goal is by default bound to the <code>package</code> phase; both are typically of your application\u2019s <code>dom</code> sub-module. The <code>xsd</code> goal meanwhile defaults to the <code>generate-resources</code> phase, and this is generally used in a completely separate sub-module. An example can be found in the (non-ASF) <a href="http://github.com/isisaddons/isis-app-todoapp">Isis addons' todoapp</a> example app; the separate submodule that uses the <code>xsd</code> goal is (also) called <code>todoapp-xsd</code>.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>All of these goals require an <a href="rgcms.html#_rgcms_classes_AppManifest-bootstrapping"><code>AppManifest</code></a> to point the plugin at, so that it knows how to bootstrap an Isis runtime. This is discussed below, followed by sections on configuring the two goals.</p> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_rgmvn_intro_app-manifest">2.1. <code>AppManifest</code></h3> 
+        <div class="paragraph"> 
+         <p>As noted in the introduction, all the goals require an <a href="rgcms.html#_rgcms_classes_AppManifest-bootstrapping"><code>AppManifest</code></a> to point the plugin at, so that it knows how to bootstrap an Isis runtime.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>This can be extremely minimal; it isn\u2019t necessary to use the main <code>AppManifest</code> (in the <code>app</code> module) used to bootstrap the application, you can instead use a cut-down one. This then allows the plugins to be run during the build of the <code>dom</code> module, rather than having to run in the context of the <code>integtest</code> module.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>For example, the <a href="ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp</a>'s manifest is:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="java"><span class="keyword">package</span> <span class="namespace">domainapp.dom</span>;
 ...
 public <span class="type">class</span> <span class="class">DomainAppDomManifest</span> <span class="directive">implements</span> AppManifest {
     <span class="annotation">@Override</span>
@@ -657,102 +573,85 @@ public <span class="type">class</span> <span class="class">DomainAppDomManifest<
     <span class="directive">public</span> <span class="predefined-type">List</span>&lt;<span class="predefined-type">Class</span>&lt;? <span class="directive">extends</span> FixtureScript&gt;&gt; getFixtures() { <span class="keyword">return</span> <span class="predefined-constant">null</span>; }
     <span class="annotation">@Override</span>
     <span class="directive">public</span> <span class="predefined-type">Map</span>&lt;<span class="predefined-type">String</span>, <span class="predefined-type">String</span>&gt; getConfigurationProperties() { <span class="keyword">return</span> <span class="predefined-constant">null</span>; }
-}</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>where <code>DomainAppDomainModule</code> simply identifies the package for the manifest to search under:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="keyword">package</span> <span class="namespace">domainapp.dom</span>;
-<span class="directive">public</span> <span class="directive">final</span> <span class="type">class</span> <span class="class">DomainAppDomainModule</span> { }</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>The downside of using a minimal <code>AppManifest</code> in the <code>dom</code> module is that any contributed actions/associations will
-be ignored.</p>
-</div>
-<div class="paragraph">
-<p>We recommend the following:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>run the <code>validate</code> goal in the <code>dom</code> submodule; this will give early warning if there are any syntactic errors in the
-model, eg orphaned supporting methods</p>
-</li>
-<li>
-<p>run the <code>swagger</code> goal in the <code>integtest</code> submodule; this ensures that the generated Swagger spec files correctly
-include any contributed actions/associations.</p>
-</li>
-<li>
-<p>run the <code>xsd</code> plugin in a new <code>xsd</code> submodule; contributed actions are irrelevant for this particular goal; having a
-separate submodule allows the configuration of both the <code>xsd</code> goal (to generate the XSD schemas) and any other XSD-related configuration to be kept in a single place.</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The <a href="ug.html#_ug_getting-started_simpleapp-archetype">SimpleApp archetype</a> reflects these recommendations for
-the <code>validate</code> and <code>swagger</code> goals.  You can find an example of the <code>xsd</code> plugin in the (non-ASF) <a href="http://github.com/isisaddons/isis-app-todoapp">Isis addons' todoapp</a> application.</p>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_rgmvn_validate">3. <code>validate</code> goal</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>The Apache Isis programming model requires that a number of naming conventions are followed.</p>
-</div>
-<div class="paragraph">
-<p>For example, the validator will detect any orphaned supporting methods (eg <code>hideXxx()</code>) if the corresponding property
-or action has been renamed or deleted but the supporting method was not also updated.  Another example is that a class
-cannot have a title specified both using <code>title()</code> method and also using <code>@Title</code> annotation.</p>
-</div>
-<div class="paragraph">
-<p>When running the application these are enforced by the <code>MetaModelValidator</code> component that detects these errors, failing fast.</p>
-</div>
-<div class="paragraph">
-<p>The purpose of the <code>validate</code> goal of the <code>isis-maven-plugin</code> is to enforce these naming conventions at build time,
-typically enforced by way of a continuous integration server.</p>
-</div>
-<div class="paragraph">
-<p>The <code>validate</code> goal defines a single property:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><code>appManifest</code> - fully qualified class name for the app manifest used to bootstrap the application (see discussion above)</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>The sections below explain how to configure the plugin within an app.</p>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>The instructions given here relate to <code>1.10.0</code>.   This goal was also released for <code>1.9.0</code>, but with a slightly
-different configuration; see the final section for differences.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="sect2">
-<h3 id="__code_dom_code_submodule">3.1. <code>dom</code> submodule</h3>
-<div class="paragraph">
-<p>Update the <code>pom.xml</code> (we recommend in your project&#8217;s <code>dom</code> module, and with a <a href="#_rgmvn_intro_app-manifest">minimal AppManifest</a>):</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="xml"><span class="tag">&lt;profile&gt;</span>
+}</code></pre> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>where <code>DomainAppDomainModule</code> simply identifies the package for the manifest to search under:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="java"><span class="keyword">package</span> <span class="namespace">domainapp.dom</span>;
+<span class="directive">public</span> <span class="directive">final</span> <span class="type">class</span> <span class="class">DomainAppDomainModule</span> { }</code></pre> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The downside of using a minimal <code>AppManifest</code> in the <code>dom</code> module is that any contributed actions/associations will be ignored.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>We recommend the following:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p>run the <code>validate</code> goal in the <code>dom</code> submodule; this will give early warning if there are any syntactic errors in the model, eg orphaned supporting methods</p> </li> 
+          <li> <p>run the <code>swagger</code> goal in the <code>integtest</code> submodule; this ensures that the generated Swagger spec files correctly include any contributed actions/associations.</p> </li> 
+          <li> <p>run the <code>xsd</code> plugin in a new <code>xsd</code> submodule; contributed actions are irrelevant for this particular goal; having a separate submodule allows the configuration of both the <code>xsd</code> goal (to generate the XSD schemas) and any other XSD-related configuration to be kept in a single place.</p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The <a href="ug.html#_ug_getting-started_simpleapp-archetype">SimpleApp archetype</a> reflects these recommendations for the <code>validate</code> and <code>swagger</code> goals. You can find an example of the <code>xsd</code> plugin in the (non-ASF) <a href="http://github.com/isisaddons/isis-app-todoapp">Isis addons' todoapp</a> application.</p> 
+        </div> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_rgmvn_validate">3. <code>validate</code> goal</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_rgmvn_validate.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>The Apache Isis programming model requires that a number of naming conventions are followed.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>For example, the validator will detect any orphaned supporting methods (eg <code>hideXxx()</code>) if the corresponding property or action has been renamed or deleted but the supporting method was not also updated. Another example is that a class cannot have a title specified both using <code>title()</code> method and also using <code>@Title</code> annotation.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>When running the application these are enforced by the <code>MetaModelValidator</code> component that detects these errors, failing fast.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>The purpose of the <code>validate</code> goal of the <code>isis-maven-plugin</code> is to enforce these naming conventions at build time, typically enforced by way of a continuous integration server.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>The <code>validate</code> goal defines a single property:</p> 
+       </div> 
+       <div class="ulist"> 
+        <ul> 
+         <li> <p><code>appManifest</code> - fully qualified class name for the app manifest used to bootstrap the application (see discussion above)</p> </li> 
+        </ul> 
+       </div> 
+       <div class="paragraph"> 
+        <p>The sections below explain how to configure the plugin within an app.</p> 
+       </div> 
+       <div class="admonitionblock note"> 
+        <table> 
+         <tbody>
+          <tr> 
+           <td class="icon"> <i class="fa icon-note" title="Note"></i> </td> 
+           <td class="content"> 
+            <div class="paragraph"> 
+             <p>The instructions given here relate to <code>1.10.0</code>. This goal was also released for <code>1.9.0</code>, but with a slightly different configuration; see the final section for differences.</p> 
+            </div> </td> 
+          </tr> 
+         </tbody>
+        </table> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="__code_dom_code_submodule">3.1. <code>dom</code> submodule</h3> 
+        <div class="paragraph"> 
+         <p>Update the <code>pom.xml</code> (we recommend in your project\u2019s <code>dom</code> module, and with a <a href="#_rgmvn_intro_app-manifest">minimal AppManifest</a>):</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="xml"><span class="tag">&lt;profile&gt;</span>
     <span class="tag">&lt;id&gt;</span>isis-validate<span class="tag">&lt;/id&gt;</span>
     <span class="tag">&lt;activation&gt;</span>
         <span class="tag">&lt;property&gt;</span>
@@ -792,84 +691,86 @@ different configuration; see the final section for differences.</p>
             <span class="tag">&lt;/plugin&gt;</span>
         <span class="tag">&lt;/plugins&gt;</span>
     <span class="tag">&lt;/build&gt;</span>
-<span class="tag">&lt;/profile&gt;</span></code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td>the profile is active by default, though can be disabled using <code>-Dskip.isis-validate</code></td>
-</tr>
-<tr>
-<td><i class="conum" data-value="2"></i><b>2</b></td>
-<td>set to <code>1.10.0</code> (or any later version)</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="3"></i><b>3</b></td>
-<td>the manifest discussed <a href="#_rgmvn_intro_app-manifest">previously</a>; adjust as required</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="4"></i><b>4</b></td>
-<td>the <code>dom</code> module for the project; adjust as required</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="5"></i><b>5</b></td>
-<td>binds the plugin&#8217;s <code>validate</code> goal to the Maven <code>test</code> lifecycle phase (ie the goal will be called when <code>mvn test</code> is run).</td>
-</tr>
-</table>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_to_run">3.2. To run</h3>
-<div class="paragraph">
-<p>The plugin is activated by default, so is run simply using:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">mvn test</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>This will run any tests, and then also - because the plugin is activated by the <code>isis-validate</code> property and bound to the <code>test</code> phase, will run the plugin&#8217;s <code>validate</code> goal.</p>
-</div>
-<div class="paragraph">
-<p>If for any reason you want to disable the validation, use:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">mvn test -Dskip.isis-validate</code></pre>
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_example_of_failure">3.3. Example of failure</h3>
-<div class="paragraph">
-<p>In the <a href="ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp</a> application the <code>SimpleObject</code> defines an <code>updateName</code> action.  This has a supporting method:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> SimpleObject updateName( ... ) { ... }
-<span class="directive">public</span> <span class="predefined-type">String</span> default0UpdateName() { ... }</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>We can introduce an error by misspelling the supporting method, for example:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="predefined-type">String</span> default0XUpdateName() { ... }</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Running <code>mvn test</code> then generates this output:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">[error]
+<span class="tag">&lt;/profile&gt;</span></code></pre> 
+         </div> 
+        </div> 
+        <div class="colist arabic"> 
+         <table> 
+          <tbody>
+           <tr> 
+            <td><i class="conum" data-value="1"></i><b>1</b></td> 
+            <td>the profile is active by default, though can be disabled using <code>-Dskip.isis-validate</code></td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="2"></i><b>2</b></td> 
+            <td>set to <code>1.10.0</code> (or any later version)</td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="3"></i><b>3</b></td> 
+            <td>the manifest discussed <a href="#_rgmvn_intro_app-manifest">previously</a>; adjust as required</td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="4"></i><b>4</b></td> 
+            <td>the <code>dom</code> module for the project; adjust as required</td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="5"></i><b>5</b></td> 
+            <td>binds the plugin\u2019s <code>validate</code> goal to the Maven <code>test</code> lifecycle phase (ie the goal will be called when <code>mvn test</code> is run).</td> 
+           </tr> 
+          </tbody>
+         </table> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_to_run">3.2. To run</h3> 
+        <div class="paragraph"> 
+         <p>The plugin is activated by default, so is run simply using:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="bash">mvn test</code></pre> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>This will run any tests, and then also - because the plugin is activated by the <code>isis-validate</code> property and bound to the <code>test</code> phase, will run the plugin\u2019s <code>validate</code> goal.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>If for any reason you want to disable the validation, use:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="bash">mvn test -Dskip.isis-validate</code></pre> 
+         </div> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_example_of_failure">3.3. Example of failure</h3> 
+        <div class="paragraph"> 
+         <p>In the <a href="ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp</a> application the <code>SimpleObject</code> defines an <code>updateName</code> action. This has a supporting method:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> SimpleObject updateName( ... ) { ... }
+<span class="directive">public</span> <span class="predefined-type">String</span> default0UpdateName() { ... }</code></pre> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>We can introduce an error by misspelling the supporting method, for example:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="predefined-type">String</span> default0XUpdateName() { ... }</code></pre> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Running <code>mvn test</code> then generates this output:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="bash">[error]
 [error]
 [error]
-[error] domainapp.dom.simple.SimpleObject#default0XUpdateName: has prefix default, is probably a supporting method for a property, collection or action.  If the method is intended to be an action, then rename and use @ActionLayout(named=&quot;...&quot;) or ignore completely using @Programmatic
+[error] domainapp.dom.simple.SimpleObject#default0XUpdateName: has prefix default, is probably a supporting method for a property, collection or action.  If the method is intended to be an action, then rename and use @ActionLayout(named="...") or ignore completely using @Programmatic
 [error]
 [error]
 [error]
@@ -886,42 +787,42 @@ different configuration; see the final section for differences.</p>
 [INFO] BUILD FAILURE
 [INFO] ------------------------------------------------------------------------
 [INFO] ...
-[ERROR] Failed to execute goal org.apache.isis.tool:isis-maven-plugin:1.13.0:validate (default) on project simpleapp-dom: 1 problems found. -&gt; [Help 1]</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>If one were to attempt to run the application, the same error would appear in the log files on startup (and the application would not boot).</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_custom_validation_rules">3.4. Custom validation rules</h3>
-<div class="paragraph">
-<p>It is also possible to customize the validation, explained <a href="ugbtb.html#_ugbtb_programming-model_custom-validator">here</a>.  For example, you could enforce project-specific conventions by implementing a custom <code>MetaModelValidator</code>, and registering using a configuration property.</p>
-</div>
-<div class="paragraph">
-<p>To support this using <code>AppManifest`s, override its `getConfigurationProperties()</code> method:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="ini">public class DomainAppDomManifest implements AppManifest {
+[ERROR] Failed to execute goal org.apache.isis.tool:isis-maven-plugin:1.13.0:validate (default) on project simpleapp-dom: 1 problems found. -&gt; [Help 1]</code></pre> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>If one were to attempt to run the application, the same error would appear in the log files on startup (and the application would not boot).</p> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_custom_validation_rules">3.4. Custom validation rules</h3> 
+        <div class="paragraph"> 
+         <p>It is also possible to customize the validation, explained <a href="ugbtb.html#_ugbtb_programming-model_custom-validator">here</a>. For example, you could enforce project-specific conventions by implementing a custom <code>MetaModelValidator</code>, and registering using a configuration property.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>To support this using <code>AppManifest`s, override its `getConfigurationProperties()</code> method:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="ini">public class DomainAppDomManifest implements AppManifest {
     ...
     public Map&lt;String, String&gt; getConfigurationProperties() {
         final Map&lt;String, String&gt; map = Maps.newTreeMap();
-        map.put(&quot;isis.reflector.validator&quot;,&quot;com.mycompany.myapp.MyMetaModelValidator&quot;);
+        map.put("isis.reflector.validator","com.mycompany.myapp.MyMetaModelValidator");
         return map;
     }
-}</code></pre>
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_1_9_0_version">3.5. 1.9.0 version</h3>
-<div class="paragraph">
-<p>The <code>1.9.0</code> version of the plugin requires slightly different configuration.  Rather than using an <code>AppManifest</code>, instead the configuration directory containing <code>isis.properties</code> is specified:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="xml"><span class="tag">&lt;profile&gt;</span>
+}</code></pre> 
+         </div> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_1_9_0_version">3.5. 1.9.0 version</h3> 
+        <div class="paragraph"> 
+         <p>The <code>1.9.0</code> version of the plugin requires slightly different configuration. Rather than using an <code>AppManifest</code>, instead the configuration directory containing <code>isis.properties</code> is specified:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="xml"><span class="tag">&lt;profile&gt;</span>
     <span class="tag">&lt;id&gt;</span>isis-validate<span class="tag">&lt;/id&gt;</span>
     <span class="tag">&lt;activation&gt;</span>
         <span class="tag">&lt;activeByDefault&gt;</span>false<span class="tag">&lt;/activeByDefault&gt;</span>                                        <i class="conum" data-value="1"></i><b>(1)</b>
@@ -959,98 +860,89 @@ different configuration; see the final section for differences.</p>
             <span class="tag">&lt;/plugin&gt;</span>
         <span class="tag">&lt;/plugins&gt;</span>
     <span class="tag">&lt;/build&gt;</span>
-<span class="tag">&lt;/profile&gt;</span></code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td>activated using the <code>-P</code> profile flag rather than a <code>-D</code> system property</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="2"></i><b>2</b></td>
-<td>specify the <code>isisConfigDir</code> directory (containing the <code>isis.properties</code> file).</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>To use the <code>1.9.0</code> version, use:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">mvn -P isis-validate test</code></pre>
-</div>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>Note that the <code>isisConfigDir</code> property was removed in <code>1.10.0</code>; only the <code>AppManifest</code> approach is supported.</p>
-</div>
-</td>
-</tr>
-</table>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_rgmvn_swagger">4. <code>swagger</code> goal</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>The <code>swagger</code> goal of the <code>isis-maven-plugin</code> uses the <a href="rgsvc.html#_rgsvc_api_SwaggerService"><code>SwaggerService</code></a> to
-generate <a href="http://swagger.io">Swagger</a> spec files to describe the public and/or private RESTful APIs exposed by the <a href="ugvro.html">RestfulObjects viewer</a>.</p>
-</div>
-<div class="paragraph">
-<p>These spec files, once generated, can then be used in the build pipeline to generate client-side stubs, typically using Swagger&#8217;s own <a href="https://github.com/swagger-api/swagger-codegen/tree/master/modules/swagger-codegen-maven-plugin">swagger-codegen-maven</a> plugin.</p>
-</div>
-<div class="paragraph">
-<p>The <code>swagger</code> goal defines the following properties:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><code>appManifest</code> - fully qualified class name for the app manifest used to bootstrap the application (see discussion above)</p>
-</li>
-<li>
-<p><code>fileNamePrefix</code> - (optional) a prefix to the generated file names (is suffixed by the requested visibilities, see below).<br></p>
-<div class="paragraph">
-<p>Defaults to <code>swagger</code>.</p>
-</div>
-</li>
-<li>
-<p><code>visibilities</code> - (optional) list of required visibilities.<br></p>
-<div class="paragraph">
-<p>Defaults to [<code>PUBLIC</code>, <code>PRIVATE</code>] (meaning that two spec files will be created).</p>
-</div>
-</li>
-<li>
-<p><code>format</code> - (optional) which format to generate, either <code>JSON</code> or <code>YAML</code>.<br></p>
-<div class="paragraph">
-<p>Defaults to <code>JSON</code>.</p>
-</div>
-</li>
-<li>
-<p><code>output</code> - (optional) subdirectory under the <code>target</code> directory to generate the swagger spec files<br></p>
-<div class="paragraph">
-<p>Defaults to <code>generated-resources/isis-swagger</code></p>
-</div>
-</li>
-</ul>
-</div>
-<div class="sect2">
-<h3 id="__code_integtest_code_submodule">4.1. <code>integtest</code> submodule</h3>
-<div class="paragraph">
-<p>Update the <code>pom.xml</code> (in your project&#8217;s <code>integtest</code> module):</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="xml"><span class="tag">&lt;profile&gt;</span>
+<span class="tag">&lt;/profile&gt;</span></code></pre> 
+         </div> 
+        </div> 
+        <div class="colist arabic"> 
+         <table> 
+          <tbody>
+           <tr> 
+            <td><i class="conum" data-value="1"></i><b>1</b></td> 
+            <td>activated using the <code>-P</code> profile flag rather than a <code>-D</code> system property</td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="2"></i><b>2</b></td> 
+            <td>specify the <code>isisConfigDir</code> directory (containing the <code>isis.properties</code> file).</td> 
+           </tr> 
+          </tbody>
+         </table> 
+        </div> 
+        <div class="paragraph"> 
+         <p>To use the <code>1.9.0</code> version, use:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="bash">mvn -P isis-validate test</code></pre> 
+         </div> 
+        </div> 
+        <div class="admonitionblock note"> 
+         <table> 
+          <tbody>
+           <tr> 
+            <td class="icon"> <i class="fa icon-note" title="Note"></i> </td> 
+            <td class="content"> 
+             <div class="paragraph"> 
+              <p>Note that the <code>isisConfigDir</code> property was removed in <code>1.10.0</code>; only the <code>AppManifest</code> approach is supported.</p> 
+             </div> </td> 
+           </tr> 
+          </tbody>
+         </table> 
+        </div> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_rgmvn_swagger">4. <code>swagger</code> goal</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_rgmvn_swagger.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>The <code>swagger</code> goal of the <code>isis-maven-plugin</code> uses the <a href="rgsvc.html#_rgsvc_api_SwaggerService"><code>SwaggerService</code></a> to generate <a href="http://swagger.io">Swagger</a> spec files to describe the public and/or private RESTful APIs exposed by the <a href="ugvro.html">RestfulObjects viewer</a>.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>These spec files, once generated, can then be used in the build pipeline to generate client-side stubs, typically using Swagger\u2019s own <a href="https://github.com/swagger-api/swagger-codegen/tree/master/modules/swagger-codegen-maven-plugin">swagger-codegen-maven</a> plugin.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>The <code>swagger</code> goal defines the following properties:</p> 
+       </div> 
+       <div class="ulist"> 
+        <ul> 
+         <li> <p><code>appManifest</code> - fully qualified class name for the app manifest used to bootstrap the application (see discussion above)</p> </li> 
+         <li> <p><code>fileNamePrefix</code> - (optional) a prefix to the generated file names (is suffixed by the requested visibilities, see below).<br></p> 
+          <div class="paragraph"> 
+           <p>Defaults to <code>swagger</code>.</p> 
+          </div> </li> 
+         <li> <p><code>visibilities</code> - (optional) list of required visibilities.<br></p> 
+          <div class="paragraph"> 
+           <p>Defaults to [<code>PUBLIC</code>, <code>PRIVATE</code>] (meaning that two spec files will be created).</p> 
+          </div> </li> 
+         <li> <p><code>format</code> - (optional) which format to generate, either <code>JSON</code> or <code>YAML</code>.<br></p> 
+          <div class="paragraph"> 
+           <p>Defaults to <code>JSON</code>.</p> 
+          </div> </li> 
+         <li> <p><code>output</code> - (optional) subdirectory under the <code>target</code> directory to generate the swagger spec files<br></p> 
+          <div class="paragraph"> 
+           <p>Defaults to <code>generated-resources/isis-swagger</code></p> 
+          </div> </li> 
+        </ul> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="__code_integtest_code_submodule">4.1. <code>integtest</code> submodule</h3> 
+        <div class="paragraph"> 
+         <p>Update the <code>pom.xml</code> (in your project\u2019s <code>integtest</code> module):</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="xml"><span class="tag">&lt;profile&gt;</span>
     <span class="tag">&lt;id&gt;</span>isis-swagger<span class="tag">&lt;/id&gt;</span>
     <span class="tag">&lt;activation&gt;</span>
         <span class="tag">&lt;property&gt;</span>
@@ -1095,152 +987,127 @@ generate <a href="http://swagger.io">Swagger</a> spec files to describe the publ
             <span class="tag">&lt;/plugin&gt;</span>
         <span class="tag">&lt;/plugins&gt;</span>
     <span class="tag">&lt;/build&gt;</span>
-<span class="tag">&lt;/profile&gt;</span></code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td>the profile is active by default, though can be disabled using <code>-Dskip.isis-swagger</code></td>
-</tr>
-<tr>
-<td><i class="conum" data-value="2"></i><b>2</b></td>
-<td>set to <code>1.11.0</code> (or any later version)</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="3"></i><b>3</b></td>
-<td>the manifest discussed <a href="#_rgmvn_intro_app-manifest">previously</a>; adjust as required</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="4"></i><b>4</b></td>
-<td>the visibilities to create (one swagger spec file per visibility listed)</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="5"></i><b>5</b></td>
-<td>which file format to generate the spec files as.</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="6"></i><b>6</b></td>
-<td>the <code>dom</code> module for the project; adjust as required</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="7"></i><b>7</b></td>
-<td>binds the plugin&#8217;s <code>swagger</code> goal to the Maven <code>package</code> lifecycle phase (ie the goal will be called when <code>mvn package</code> is run).</td>
-</tr>
-</table>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_to_run_2">4.2. To run</h3>
-<div class="paragraph">
-<p>The plugin is activated by default, so is run simply using:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">mvn package</code></pre>
-</div>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_rgmvn_xsd">5. <code>xsd</code> goal</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>The <code>xsd</code> goal of the <code>isis-maven-plugin</code> uses the <a href="rgsvc.html#_rgsvc_api_JaxbService"><code>JaxbService</code></a> to
-generate XSD schemas from any JAXB-annotated <a href="ugbtb.html#_ugbtb_view-models">view model/DTOs</a>.</p>
-</div>
-<div class="paragraph">
-<p>This is instead of and preferable to using the JAXB <a href="https://jaxb.java.net/2.2.4/docs/schemagen.html">schemagen</a>
-tool, because it uses the framework&#8217;s support (via
-<a href="rgant.html#_rgant-XmlJavaTypeAdapter"><code>@XmlJavaTypeAdapter</code></a>) to translate any references to domain
-objects into <code>OidDto</code>s (as defined by the Apache Isis <a href="rgcms.html#_rgcms_schema-common">common schema</a>).</p>
-</div>
-<div class="paragraph">
-<p>The <code>xsd</code> goal defines the following properties:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><code>appManifest</code> - fully qualified class name for the app manifest used to bootstrap the application (see discussion above)</p>
-</li>
-<li>
-<p><code>jaxbClasses</code> - a list of <a href="rg.html#_ugbtb_view-models_jaxb">JAXB-annotated view model</a> classes;</p>
-</li>
-<li>
-<p><code>output</code> - (optional) subdirectory under the <code>target</code> directory to generate the XSDs<br></p>
-<div class="paragraph">
-<p>Defaults to <code>generated-resources/isis-xsd</code></p>
-</div>
-</li>
-<li>
-<p><code>separate</code> - (optional) whether to create separate directories for each JAXB-class.<br></p>
-<div class="paragraph">
-<p>Defaults to <code>false</code>.  Most DTO classes will reference one another or the <a href="rgcms.html#_rgcms_schema-common">common schema</a>.  Normally it&#8217;s fine to merge all these XSDs together.  This property, if set, results in each a separate directory for each generation of its XSD or XSDs.</p>
-</div>
-</li>
-<li>
-<p><code>commonSchemas</code> - (optional) whether to also generate the isis common schema(s).<br></p>
-<div class="paragraph">
-<p>Defaults to <code>false</code>; if set then the call to <a href="rgsvc.html#_rgsvc_api_JaxbService"><code>JaxbService</code></a> will set <code>IsisSchemas.INCLUDE</code> flag.</p>
-</div>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>As a convenience to any (Java) consumers, the XSDs generated from the view models can then in turn be generated
-into DTOs.  The original view models and these DTOs are similar but not identical: while the view models can only be used
-within the Isis application (they may reference underlying domain entities) whereas the DTO classes generated from the
-XSDs can be used standalone, eg by a Java subscriber running on an ESB such as Apache Camel.</p>
-</div>
-<div class="paragraph">
-<p>The rest of this section explains how to configure a new <code>xsd</code> submodule that uses the <code>isis-maven-plugin</code> along with
-other standard plugins in order to generate both XSDs and DTOs.  The <code>pom.xml</code> described below uses Maven profiles
-to separate out these two responsibilities.</p>
-</div>
-<div class="sect2">
-<h3 id="_rgmvn_xsd">5.1. <code>xsd</code> submodule</h3>
-<div class="paragraph">
-<p>We recommend creating a new submodule that will perform the following build steps:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>run the <code>xsd</code> goal (in the <code>generate-resources</code> phase) to generate the XSDs from the specified view model/DTOs</p>
-</li>
-<li>
-<p>use the <a href="http://maven.apache.org/plugins/maven-assembly-plugin/">maven-assembly-plugin</a> to bundle the
-generated XSD files into a zip file.</p>
-</li>
-<li>
-<p>use the <code>xjc-gen</code> to generate corresponding DTO classes from the XSDs.<br></p>
-<div class="paragraph">
-<p>These are <em>not</em> the same as the original view models; they are provided as a convenience for subscribers to marshall XML documents into Java classes, but running as a standalone process (not part of the Isis app)</p>
-</div>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>These two main responsibilities can then be placed into separate Maven profiles, for better modularity.  The diagram
-below shows the overall design:</p>
-</div>
-<div class="imageblock">
-<div class="content">
-<a class="image" href="images/maven-plugin/xsd-goal.png"><img src="images/maven-plugin/xsd-goal.png" alt="xsd goal" width="800px"></a>
-</div>
-</div>
-<div class="paragraph">
-<p>For example, here is the <code>pom.xml</code> file for the (non-ASF)
-<a href="http://github.com/isisaddons/isis-app-todoapp">Isis addons' todoapp</a> example app&#8217;s <code>todoapp-xsd</code> submodule.</p>
-</div>
-<div class="paragraph">
-<p>First, the usual boilerplate:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="xml"><span class="preprocessor">&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;</span>
-<span class="tag">&lt;project</span> <span class="attribute-name">xmlns</span>=<span class="string"><span class="delimiter">&quot;</span><span class="content">http://maven.apache.org/POM/4.0.0</span><span class="delimiter">&quot;</span></span> <span class="attribute-name">xmlns:xsi</span>=<span class="string"><span class="delimiter">&quot;</span><span class="content">http://www.w3.org/2001/XMLSchema-instance</span><span class="delimiter">&quot;</span></span> <span class="attribute-name">xsi:schemaLocation</span>=<span class="string"><span class="delimiter">&quot;</span><span class="content">http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd</span><span class="delimiter">&quot;</span></span><span class="tag">&gt;</span>
+<span class="tag">&lt;/profile&gt;</span></code></pre> 
+         </div> 
+        </div> 
+        <div class="colist arabic"> 
+         <table> 
+          <tbody>
+           <tr> 
+            <td><i class="conum" data-value="1"></i><b>1</b></td> 
+            <td>the profile is active by default, though can be disabled using <code>-Dskip.isis-swagger</code></td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="2"></i><b>2</b></td> 
+            <td>set to <code>1.11.0</code> (or any later version)</td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="3"></i><b>3</b></td> 
+            <td>the manifest discussed <a href="#_rgmvn_intro_app-manifest">previously</a>; adjust as required</td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="4"></i><b>4</b></td> 
+            <td>the visibilities to create (one swagger spec file per visibility listed)</td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="5"></i><b>5</b></td> 
+            <td>which file format to generate the spec files as.</td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="6"></i><b>6</b></td> 
+            <td>the <code>dom</code> module for the project; adjust as required</td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="7"></i><b>7</b></td> 
+            <td>binds the plugin\u2019s <code>swagger</code> goal to the Maven <code>package</code> lifecycle phase (ie the goal will be called when <code>mvn package</code> is run).</td> 
+           </tr> 
+          </tbody>
+         </table> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_to_run_2">4.2. To run</h3> 
+        <div class="paragraph"> 
+         <p>The plugin is activated by default, so is run simply using:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="bash">mvn package</code></pre> 
+         </div> 
+        </div> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_rgmvn_xsd">5. <code>xsd</code> goal</h2>
+      <button type="button" class="button secondary" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/_rgmvn_xsd.adoc&quot;" style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>The <code>xsd</code> goal of the <code>isis-maven-plugin</code> uses the <a href="rgsvc.html#_rgsvc_api_JaxbService"><code>JaxbService</code></a> to generate XSD schemas from any JAXB-annotated <a href="ugbtb.html#_ugbtb_view-models">view model/DTOs</a>.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>This is instead of and preferable to using the JAXB <a href="https://jaxb.java.net/2.2.4/docs/schemagen.html">schemagen</a> tool, because it uses the framework\u2019s support (via <a href="rgant.html#_rgant-XmlJavaTypeAdapter"><code>@XmlJavaTypeAdapter</code></a>) to translate any references to domain objects into <code>OidDto</code>s (as defined by the Apache Isis <a href="rgcms.html#_rgcms_schema-common">common schema</a>).</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>The <code>xsd</code> goal defines the following properties:</p> 
+       </div> 
+       <div class="ulist"> 
+        <ul> 
+         <li> <p><code>appManifest</code> - fully qualified class name for the app manifest used to bootstrap the application (see discussion above)</p> </li> 
+         <li> <p><code>jaxbClasses</code> - a list of <a href="rg.html#_ugbtb_view-models_jaxb">JAXB-annotated view model</a> classes;</p> </li> 
+         <li> <p><code>output</code> - (optional) subdirectory under the <code>target</code> directory to generate the XSDs<br></p> 
+          <div class="paragraph"> 
+           <p>Defaults to <code>generated-resources/isis-xsd</code></p> 
+          </div> </li> 
+         <li> <p><code>separate</code> - (optional) whether to create separate directories for each JAXB-class.<br></p> 
+          <div class="paragraph"> 
+           <p>Defaults to <code>false</code>. Most DTO classes will reference one another or the <a href="rgcms.html#_rgcms_schema-common">common schema</a>. Normally it\u2019s fine to merge all these XSDs together. This property, if set, results in each a separate directory for each generation of its XSD or XSDs.</p> 
+          </div> </li> 
+         <li> <p><code>commonSchemas</code> - (optional) whether to also generate the isis common schema(s).<br></p> 
+          <div class="paragraph"> 
+           <p>Defaults to <code>false</code>; if set then the call to <a href="rgsvc.html#_rgsvc_api_JaxbService"><code>JaxbService</code></a> will set <code>IsisSchemas.INCLUDE</code> flag.</p> 
+          </div> </li> 
+        </ul> 
+       </div> 
+       <div class="paragraph"> 
+        <p>As a convenience to any (Java) consumers, the XSDs generated from the view models can then in turn be generated into DTOs. The original view models and these DTOs are similar but not identical: while the view models can only be used within the Isis application (they may reference underlying domain entities) whereas the DTO classes generated from the XSDs can be used standalone, eg by a Java subscriber running on an ESB such as Apache Camel.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>The rest of this section explains how to configure a new <code>xsd</code> submodule that uses the <code>isis-maven-plugin</code> along with other standard plugins in order to generate both XSDs and DTOs. The <code>pom.xml</code> described below uses Maven profiles to separate out these two responsibilities.</p> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_rgmvn_xsd">5.1. <code>xsd</code> submodule</h3> 
+        <div class="paragraph"> 
+         <p>We recommend creating a new submodule that will perform the following build steps:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p>run the <code>xsd</code> goal (in the <code>generate-resources</code> phase) to generate the XSDs from the specified view model/DTOs</p> </li> 
+          <li> <p>use the <a href="http://maven.apache.org/plugins/maven-assembly-plugin/">maven-assembly-plugin</a> to bundle the generated XSD files into a zip file.</p> </li> 
+          <li> <p>use the <code>xjc-gen</code> to generate corresponding DTO classes from the XSDs.<br></p> 
+           <div class="paragraph"> 
+            <p>These are <em>not</em> the same as the original view models; they are provided as a convenience for subscribers to marshall XML documents into Java classes, but running as a standalone process (not part of the Isis app)</p> 
+           </div> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>These two main responsibilities can then be placed into separate Maven profiles, for better modularity. The diagram below shows the overall design:</p> 
+        </div> 
+        <div class="imageblock"> 
+         <div class="content"> 
+          <a class="image" href="images/maven-plugin/xsd-goal.png"><img src="images/maven-plugin/xsd-goal.png" alt="xsd goal" width="800px"></a> 
+         </div> 
+        </div> 
+        <div class="paragraph"> 
+         <p>For example, here is the <code>pom.xml</code> file for the (non-ASF) <a href="http://github.com/isisaddons/isis-app-todoapp">Isis addons' todoapp</a> example app\u2019s <code>todoapp-xsd</code> submodule.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>First, the usual boilerplate:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="xml"><span class="preprocessor">&lt;?xml version="1.0" encoding="UTF-8"?&gt;</span>
+<span class="tag">&lt;project</span> <span class="attribute-name">xmlns</span>=<span class="string"><span class="delimiter">"</span><span class="content">http://maven.apache.org/POM/4.0.0</span><span class="delimiter">"</span></span> <span class="attribute-name">xmlns:xsi</span>=<span class="string"><span class="delimiter">"</span><span class="content">http://www.w3.org/2001/XMLSchema-instance</span><span class="delimiter">"</span></span> <span class="attribute-name">xsi:schemaLocation</span>=<span class="string"><span class="delimiter">"</span><span class="content">http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd</span><span class="delimiter">"</span></span><span class="tag">&gt;</span>
     <span class="tag">&lt;modelVersion&gt;</span>4.0.0<span class="tag">&lt;/modelVersion&gt;</span>
 
     <span class="tag">&lt;parent&gt;</span>
@@ -1269,33 +1136,35 @@ below shows the overall design:</p>
             ...
         <span class="tag">&lt;/profile&gt;</span>
         <span class="tag">&lt;/profiles&gt;</span>
-<span class="tag">&lt;/project&gt;</span></code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td>depends on the rest of the application&#8217;s modules</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="2"></i><b>2</b></td>
-<td>XSD generation, to run the <code>xsd</code> goal and then assemble into a zip file; within a profile for modularity</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="3"></i><b>3</b></td>
-<td>XJC generation, to run the <code>xjc</code> to generate Java DTO classes from XSDs; within a profile for modularity</td>
-</tr>
-</table>
-</div>
-<div class="sect3">
-<h4 id="_xsd_profile">5.1.1. XSD profile</h4>
-<div class="paragraph">
-<p>The <code>isis-xsd</code> profile runs the <code>xsd</code> goal of the <code>isis-maven-plugin</code>; these are then zipped up by the assembly plugin:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="xml"><span class="tag">&lt;profile&gt;</span>
+<span class="tag">&lt;/project&gt;</span></code></pre> 
+         </div> 
+        </div> 
+        <div class="colist arabic"> 
+         <table> 
+          <tbody>
+           <tr> 
+            <td><i class="conum" data-value="1"></i><b>1</b></td> 
+            <td>depends on the rest of the application\u2019s modules</td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="2"></i><b>2</b></td> 
+            <td>XSD generation, to run the <code>xsd</code> goal and then assemble into a zip file; within a profile for modularity</td> 
+           </tr> 
+           <tr> 
+            <td><i class="conum" data-value="3"></i><b>3</b></td> 
+            <td>XJC generation, to run the <code>xjc</code> to generate Java DTO classes from XSDs; within a profile for modularity</td> 
+           </tr> 
+          </tbody>
+         </table> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_xsd_profile">5.1.1. XSD profile</h4> 
+         <div class="paragraph"> 
+          <p>The <code>isis-xsd</code> profile runs the <code>xsd</code> goal of the <code>isis-maven-plugin</code>; these are then zipped up by the assembly plugin:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="xml"><span class="tag">&lt;profile&gt;</span>
     <span class="tag">&lt;id&gt;</span>isis-xsd<span class="tag">&lt;/id&gt;</span>
     <span class="tag">&lt;activation&gt;</span>
         <span class="tag">&lt;property&gt;</span>
@@ -1354,51 +1223,52 @@ below shows the overall design:</p>
             <span class="tag">&lt;/plugin&gt;</span>
         <span class="tag">&lt;/plugins&gt;</span>
     <span class="tag">&lt;/build&gt;</span>
-<span class="tag">&lt;/profile&gt;</span></code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td>enabled <em>unless</em> <code>skip.isis-xsd</code> property specified</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="2"></i><b>2</b></td>
-<td>specify the app manifest to bootstrap the Isis runtime within the maven plugin</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="3"></i><b>3</b></td>
-<td>enumerate all JAXB-annotated view models</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="4"></i><b>4</b></td>
-<td>workaround to avoid conflict with plexus-default</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="5"></i><b>5</b></td>
-<td>by default is bound to <code>generate-resources</code>, but bind instead to <code>generate-sources</code> if also running the <code>xjc</code> profile: the XSD are an input to <code>xjc</code>, but it is bound by default to <code>generate-sources</code> and the <code>generate-sources</code> phase runs before the <code>generate-resources</code>.</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="6"></i><b>6</b></td>
-<td>run the <code>xsd</code> goal</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="7"></i><b>7</b></td>
-<td>define the assembly plugin</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="8"></i><b>8</b></td>
-<td>assembles the XSD schemas into a zip file, as defined by the <code>dep.xml</code> file (see below).</td>
-</tr>
-</table>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="xml"><span class="tag">&lt;assembly</span> <span class="attribute-name">xmlns</span>=<span class="string"><span class="delimiter">&quot;</span><span class="content">http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2</span><span class="delimiter">&quot;</span></span>
-          <span class="attribute-name">xmlns:xsi</span>=<span class="string"><span class="delimiter">&quot;</span><span class="content">http://www.w3.org/2001/XMLSchema-instance</span><span class="delimiter">&quot;</span></span>
-          <span class="attribute-name">xsi:schemaLocation</span>=<span class="string"><span class="delimiter">&quot;</span><span class="content">http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2</span>
-                              <span class="content">http://maven.apache.org/xsd/assembly-1.1.2.xsd</span><span class="delimiter">&quot;</span></span><span class="tag">&gt;</span>
+<span class="tag">&lt;/profile&gt;</span></code></pre> 
+          </div> 
+         </div> 
+         <div class="colist arabic"> 
+          <table> 
+           <tbody>
+            <tr> 
+             <td><i class="conum" data-value="1"></i><b>1</b></td> 
+             <td>enabled <em>unless</em> <code>skip.isis-xsd</code> property specified</td> 
+            </tr> 
+            <tr> 
+             <td><i class="conum" data-value="2"></i><b>2</b></td> 
+             <td>specify the app manifest to bootstrap the Isis runtime within the maven plugin</td> 
+            </tr> 
+            <tr> 
+             <td><i class="conum" data-value="3"></i><b>3</b></td> 
+             <td>enumerate all JAXB-annotated view models</td> 
+            </tr> 
+            <tr> 
+             <td><i class="conum" data-value="4"></i><b>4</b></td> 
+             <td>workaround to avoid conflict with plexus-default</td> 
+            </tr> 
+            <tr> 
+             <td><i class="conum" data-value="5"></i><b>5</b></td> 
+             <td>by default is bound to <code>generate-resources</code>, but bind instead to <code>generate-sources</code> if also running the <code>xjc</code> profile: the XSD are an input to <code>xjc</code>, but it is bound by default to <code>generate-sources</code> and the <code>generate-sources</code> phase runs before the <code>generate-resources</code>.</td> 
+            </tr> 
+            <tr> 
+             <td><i class="conum" data-value="6"></i><b>6</b></td> 
+             <td>run the <code>xsd</code> goal</td> 
+            </tr> 
+            <tr> 
+             <td><i class="conum" data-value="7"></i><b>7</b></td> 
+             <td>define the assembly plugin</td> 
+            </tr> 
+            <tr> 
+             <td><i class="conum" data-value="8"></i><b>8</b></td> 
+             <td>assembles the XSD schemas into a zip file, as defined by the <code>dep.xml</code> file (see below).</td> 
+            </tr> 
+           </tbody>
+          </table> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="xml"><span class="tag">&lt;assembly</span> <span class="attribute-name">xmlns</span>=<span class="string"><span class="delimiter">"</span><span class="content">http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2</span><span class="delimiter">"</span></span>
+          <span class="attribute-name">xmlns:xsi</span>=<span class="string"><span class="delimiter">"</span><span class="content">http://www.w3.org/2001/XMLSchema-instance</span><span class="delimiter">"</span></span>
+          <span class="attribute-name">xsi:schemaLocation</span>=<span class="string"><span class="delimiter">"</span><span class="content">http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2</span> <span class="content">http://maven.apache.org/xsd/assembly-1.1.2.xsd</span><span class="delimiter">"</span></span><span class="tag">&gt;</span>
     <span class="tag">&lt;id&gt;</span>xsd<span class="tag">&lt;/id&gt;</span>
     <span class="tag">&lt;formats&gt;</span>
         <span class="tag">&lt;format&gt;</span>zip<span class="tag">&lt;/format&gt;</span>
@@ -1409,31 +1279,31 @@ below shows the overall design:</p>
             <span class="tag">&lt;outputDirectory&gt;</span>/<span class="tag">&lt;/outputDirectory&gt;</span>
         <span class="tag">&lt;/fileSet&gt;</span>
     <span class="tag">&lt;/fileSets&gt;</span>
-<span class="tag">&lt;/assembly&gt;</span></code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td>the location that the <code>xsd</code> goal writes to.</td>
-</tr>
-</table>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_xjc_profile">5.1.2. XJC profile</h4>
-<div class="paragraph">
-<p>The <code>xjc</code> profile reads the XSD generated by the <code>xsd</code> goal, and from it generates Java DTOs.  Note that this isn&#8217;t
-round-tripping: the original view model is only for use within the Isis app, whereas the DTO generated from the XSDs
-is for use in a standalone context, eg in a Java subscriber on an event bus.</p>
-</div>
-<div class="paragraph">
-<p>The <code>xjc</code> profile is defined as:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="xml"><span class="tag">&lt;profile&gt;</span>
+<span class="tag">&lt;/assembly&gt;</span></code></pre> 
+          </div> 
+         </div> 
+         <div class="colist arabic"> 
+          <table> 
+           <tbody>
+            <tr> 
+             <td><i class="conum" data-value="1"></i><b>1</b></td> 
+             <td>the location that the <code>xsd</code> goal writes to.</td> 
+            </tr> 
+           </tbody>
+          </table> 
+         </div> 
+        </div> 
+        <div class="sect3"> 
+         <h4 id="_xjc_profile">5.1.2. XJC profile</h4> 
+         <div class="paragraph"> 
+          <p>The <code>xjc</code> profile reads the XSD generated by the <code>xsd</code> goal, and from it generates Java DTOs. Note that this isn\u2019t round-tripping: the original view model is only for use within the Isis app, whereas the DTO generated from the XSDs is for use in a standalone context, eg in a Java subscriber on an event bus.</p> 
+         </div> 
+         <div class="paragraph"> 
+          <p>The <code>xjc</code> profile is defined as:</p> 
+         </div> 
+         <div class="listingblock"> 
+          <div class="content"> 
+           <pre class="CodeRay highlight"><code data-lang="xml"><span class="tag">&lt;profile&gt;</span>
     <span class="tag">&lt;id&gt;</span>xjc<span class="tag">&lt;/id&gt;</span>
     <span class="tag">&lt;activation&gt;</span>
         <span class="tag">&lt;property&gt;</span>
@@ -1488,169 +1358,147 @@ is for use in a standalone context, eg in a Java subscriber on an event bus.</p>
             <span class="tag">&lt;/plugin&gt;</span>
         <span class="tag">&lt;/plugins&gt;</span>
     <span class="tag">&lt;/build&gt;</span>
-<span class="tag">&lt;/profile&gt;</span></code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td>enabled <em>unless</em> <code>skip.xjc</code> property specified</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="2"></i><b>2</b></td>
-<td>specifies the directory that the XSD schemas were generated to by the <code>isis-maven-plugin</code></td>
-</tr>
-<tr>
-<td><i class="conum" data-value="3"></i><b>3</b></td>
-<td>specify each of the XSDs to be processed</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="4"></i><b>4</b></td>
-<td>catalog file indicates the location of the referenced <a href="_rgcms_schema-common">common schema</a> XSDs.</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="5"></i><b>5</b></td>
-<td>the <code>build-helper-maven-plugin</code> adds the Java source generated by the <code>xjc</code> plugin so that it can be compiled and
-packaged as any other code</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="6"></i><b>6</b></td>
-<td>the location that the <code>xjc</code> plugin generates its source code.</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>The referenced <code>catalog.xml</code> file instructs the <code>xjc</code> plugin how to resolve referenced schema locations.  Only a
-reference for the Apache Isis <a href="_rgcms_schema-common">common schema</a> is likely to be needed:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="xml"><span class="preprocessor">&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;</span>
-<span class="doctype">&lt;!DOCTYPE catalog
-            PUBLIC &quot;-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN&quot;
-            &quot;http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd&quot;&gt;</span>
-<span class="tag">&lt;catalog</span> <span class="attribute-name">xmlns</span>=<span class="string"><span class="delimiter">&quot;</span><span class="content">urn:oasis:names:tc:entity:xmlns:xml:catalog</span><span class="delimiter">&quot;</span></span><span class="tag">&gt;</span>
-    <span class="tag">&lt;public</span> <span class="attribute-name">publicId</span>=<span class="string"><span class="delimiter">&quot;</span><span class="content">http://isis.apache.org/schema/common</span><span class="delimiter">&quot;</span></span>
-            <span class="attribute-name">uri</span>=<span class="string"><span class="delimiter">&quot;</span><span class="content">http://isis.apache.org/schema/common/common.xsd</span><span class="delimiter">&quot;</span></span><span class="tag">/&gt;</span>                             <i class="conum" data-value="1"></i><b>(1)</b>
-<span class="tag">&lt;/catalog&gt;</span></code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td>resolve the common schema from the Apache Isis website</td>
-</tr>
-</table>
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_to_run_3">5.2. To run</h3>
-<div class="paragraph">
-<p>The plugin is activated by default, so is run simply using:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">mvn package</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>This will generate the XSDs, the DTOs from the XSDs, and package up the XSDs into a ZIP file and the generated DTO
-class files into a regular JAR package.</p>
-</div>
-<div class="paragraph">
-<p>If for any reason you want to disable the generation of the DTOs, use:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">mvn package -Dskip.xjc</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>If you want to disable the generation of both the XSDs and the DTOs, use:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="CodeRay highlight"><code data-lang="bash">mvn package -Dskip.xjc -Dskip.isis-xsd</code></pre>
-</div>
-</div>
-</div>
-</div>
-</div>
-        </div>
-
-        <footer>
-          <hr>
-          <p class="small">
-          Copyright &copy; 2010~2016 The Apache&nbsp;Software&nbsp;Foundation, licensed under the Apache&nbsp;License,&nbsp;v2.0.
-          <br/>
-          Apache, the Apache feather logo, Apache&nbsp;Isis, and the Apache&nbsp;Isis project logo are all trademarks of The&nbsp;Apache&nbsp;Software&nbsp;Foundation.
-          </p>
-        </footer>
-
-    </div>
-
-    <div id="doc-content-right" class="large-3 medium-3 xcolumns">
-        <div id="toc" class="toc2">
-            <div class="fallback-toc">
-                <ul class="sectlevel1">
-<li><a href="#_rgmvn">1. Apache Isis Maven plugin</a>
-<ul class="sectlevel2">
-<li><a href="#_other_guides">1.1. Other Guides</a></li>
-</ul>
-</li>
-<li><a href="#_rgmvn_intro">2. Introduction</a>
-<ul class="sectlevel2">
-<li><a href="#_rgmvn_intro_app-manifest">2.1. <code>AppManifest</code></a></li>
-</ul>
-</li>
-<li><a href="#_rgmvn_validate">3. <code>validate</code> goal</a>
-<ul class="sectlevel2">
-<li><a href="#__code_dom_code_submodule">3.1. <code>dom</code> submodule</a></li>
-<li><a href="#_to_run">3.2. To run</a></li>
-<li><a href="#_example_of_failure">3.3. Example of failure</a></li>
-<li><a href="#_custom_validation_rules">3.4. Custom validation rules</a></li>
-<li><a href="#_1_9_0_version">3.5. 1.9.0 version</a></li>
-</ul>
-</li>
-<li><a href="#_rgmvn_swagger">4. <code>swagger</code> goal</a>
-<ul class="sectlevel2">
-<li><a href="#__code_integtest_code_submodule">4.1. <code>integtest</code> submodule</a></li>
-<li><a href="#_to_run_2">4.2. To run</a></li>
-</ul>
-</li>
-<li><a href="#_rgmvn_xsd">5. <code>xsd</code> goal</a>
-<ul class="sectlevel2">
-<li><a href="#_rgmvn_xsd">5.1. <code>xsd</code> submodule</a>
-<ul class="sectlevel3">
-<li><a href="#_xsd_profile">5.1.1. XSD profile</a></li>
-<li><a href="#_xjc_profile">5.1.2. XJC profile</a></li>
-</ul>
-</li>
-<li><a href="#_to_run_3">5.2. To run</a></li>
-</ul>
-</li>
-</ul>
-            </div>
-        </div>
-    </div>
-
-</div>
-
-
-<script src="../../../js/foundation/5.5.1/vendor/jquery.js"></script>
-<script src="../../../js/foundation/5.5.1/foundation.min.js"></script>
-
-
-<link href="../../../css/jquery.tocify/1.9.0/jquery.tocify.css" rel="stylesheet">
-<script src="../../../js/jqueryui/1.11.4/jquery-ui.min.js"></script>
-<script src="../../../js/jquery.tocify/1.9.0/jquery.tocify.js"></script>
-
-
-
-<script type="text/javascript">
+<span class="tag">&lt;/profile&gt;</span></code></pre> 
+          </div> 
+         </div> 
+         <div class="colist arabic"> 
+          <table> 
+           <tbody>
+            <tr> 
+             <td><i class="conum" data-value="1"></i><b>1</b></td> 
+             <td>enabled <em>unless</em> <code>skip.xjc</code> property specified</td> 
+            </tr> 
+            <tr> 
+             <td><i class="conum" data-value="2"></i><b>2</b></td> 
+             <td>specifies the directory that the XSD schemas were generated to by the <code>isis-maven-plugin</code></td> 
+            </tr> 
+           

<TRUNCATED>