Fixed malformed included files
diff --git a/.jekyll-cache/Jekyll/Cache/Jekyll--Converters--Markdown/15/6a9132ef565be03e5da90c0ca3205e1e1a17a680f52aeb4a282322a4ef3b46 b/.jekyll-cache/Jekyll/Cache/Jekyll--Converters--Markdown/15/6a9132ef565be03e5da90c0ca3205e1e1a17a680f52aeb4a282322a4ef3b46
deleted file mode 100644
index 26847e7..0000000
--- a/.jekyll-cache/Jekyll/Cache/Jekyll--Converters--Markdown/15/6a9132ef565be03e5da90c0ca3205e1e1a17a680f52aeb4a282322a4ef3b46
+++ /dev/null
@@ -1,139 +0,0 @@
-I"±<h2 id="mailing-lists">Mailing lists</h2>
-
-<p>For users of the Wicket community we run the following email lists:</p>
-
-<div class="button-bar">
-    <a class="button" href="#user"><i class="fa fa-comments"></i><br />Users</a>
-    <a class="button" href="#dev"><i class="fa fa-code-fork"></i><br />Developers</a>
-    <a class="button" href="#announce"><i class="fa fa-bullhorn"></i><br />Announcements</a>
-    <a class="button" href="#commit"><i class="fa fa-file-code-o"></i><br />Commits</a>
-    <a class="button" href="#security"><i class="fa fa-lock"></i><br />Security</a>
-</div>
-
-<p>Learn more about these lists below.</p>
-
-<hr />
-
-<h2 id="user">The Users list</h2>
-
-<p>Ask your questions and answer questions of other users on the users
-list. It is a medium traffic list with a couple of messages per day.
-Community members ask and answer questions on this list. Announcements
-and security updates are also sent to this list.</p>
-
-<p>You have to subscribe to this list if you want to ask a question and
-see the replies.</p>
-
-<ul>
-  <li>Traffic: medium</li>
-  <li><a href="http://mail-archives.apache.org/mod_mbox/wicket-users/">Browse</a> the archives</li>
-  <li><a href="http://wicket-user.markmail.org">Search</a> the list</li>
-  <li><a href="mailto:users-subscribe@wicket.apache.org?subject=Subscribe+to+Apache+Wicket+User+list">Subscribe</a> to the list</li>
-  <li><a href="mailto:users-unsubscribe@wicket.apache.org?subject=Unsubscribe+from+Apache+Wicket+User+list">Unsubscribe</a> from the list</li>
-  <li><a href="mailto:users-help@wicket.apache.org?subject=Get+help+for+Apache+Wicket+User+list">Help for subscriptions</a></li>
-</ul>
-
-<p>Only subscribers can post to this list.</p>
-
-<p>If you are only interested in updates about the Wicket project,
-consider just subscribing to the announcements list.</p>
-
-<hr />
-
-<h2 id="dev">The Developers list</h2>
-
-<p>Discuss internals of the framework. The traffic is low with just a couple of messages per week.</p>
-
-<p>You have to subscribe to this list if you want to participate in discussions.</p>
-
-<ul>
-  <li>Traffic: low</li>
-  <li><a href="http://mail-archives.apache.org/mod_mbox/wicket-dev/">Browse</a> the archives</li>
-  <li><a href="http://wicket-dev.markmail.org">Search</a> the list</li>
-  <li><a href="mailto:dev-subscribe@wicket.apache.org?subject=Subscribe+to+Apache+Wicket+Dev+list">Subscribe</a> to the list</li>
-  <li><a href="mailto:dev-unsubscribe@wicket.apache.org?subject=Unsubscribe+from+Apache+Wicket+Dev+list">Unsubscribe</a> from the list</li>
-  <li><a href="mailto:dev-help@wicket.apache.org?subject=Get+help+for+Apache+Wicket+Dev+list">Help for subscriptions</a></li>
-</ul>
-
-<p>Only subscribers can post to this list.</p>
-
-<hr />
-
-<h2 id="announce">The Announcements list</h2>
-
-<p>The announcements list is used for publishing news about releases and
-security updates. It is a very low traffic list.</p>
-
-<p>You should subscribe to this list if you only want to keep up to date
-with Wicket concerning releases and security announcements.</p>
-
-<ul>
-  <li>Traffic: low</li>
-  <li><a href="http://mail-archives.apache.org/mod_mbox/wicket-announce">Browse</a>  the archives</li>
-  <li><a href="http://wicket-announce.markmail.org">Search</a> the list</li>
-  <li><a href="mailto:announce-subscribe@wicket.apache.org?subject=Subscribe+to+Apache+Wicket+announcements+list">Subscribe</a> to the list</li>
-  <li><a href="mailto:announce-unsubscribe@wicket.apache.org?subject=Unsubscribe+from+Apache+Wicket+announcements+list">Unsubscribe</a> from the list</li>
-  <li><a href="mailto:announce-help@wicket.apache.org?subject=Get+help+for+Apache+Wicket+announcements+list">Help for subscriptions</a></li>
-</ul>
-
-<p>Only Apache Wicket project members can post to this list.</p>
-
-<hr />
-
-<h2 id="commit">The Commit list</h2>
-
-<p>The commit list is used for publishing commit messages, bug tracker
-updates and other automatically generated messages.</p>
-
-<p>You should subscribe to this list if you want to keep up to date with
-Wicket development, like which commits happen, which issues are updated
-and other things.</p>
-
-<ul>
-  <li>Traffic: high</li>
-  <li><a href="http://mail-archives.apache.org/mod_mbox/wicket-commits">Browse</a> the archives</li>
-  <li><a href="http://wicket-commits.markmail.org">Search</a> the list</li>
-  <li><a href="mailto:commits-subscribe@wicket.apache.org?subject=Subscribe+to+Apache+Wicket+commits+list">Subscribe</a> to the list</li>
-  <li><a href="mailto:commits-unsubscribe@wicket.apache.org?subject=Unsubscribe+from+Apache+Wicket+commits+list">Unsubscribe</a> from the list</li>
-  <li><a href="mailto:commits-help@wicket.apache.org?subject=Get+help+for+Apache+Wicket+commits+list">Help for subscriptions</a></li>
-</ul>
-
-<p>This list is read only, and only Apache build systems can publish to it.</p>
-
-<hr />
-
-<h2 id="security">Report a security issue</h2>
-
-<p>The Apache Software Foundation takes a very active stance in
-eliminating security problems against the Apache Wicket web framework.</p>
-
-<p>For reporting and discussing a security issue you should contact the
-Wicket PMC privately.</p>
-
-<p><strong>** PLEASE DO NOT CREATE A SECURITY REPORT IN OUR ISSUE TRACKER **</strong></p>
-
-<p>The issue tracker for Wicket is not the appropriate venue for reporting
-security issues as the issue tracker is publicly accessible. Instead,
-contact the Wicket PMC privately.</p>
-
-<h3 id="contact-the-wicket-pmc-privately">Contact the Wicket PMC privately</h3>
-
-<p>Send your security issue to <strong>private at wicket.apache.org</strong>. This list
-is not publicly available so we can discuss and fix the issue in
-private without leaking the info to any bad guys.</p>
-
-<p><a class="button" href="mailto:private@wicket.apache.org?subject=Security%20issue" onclick="window.location.href='mailto:private@wicket.apache.org?subject=Security%20issue';return false;">
-    <i class="fa fa-shield"></i>
-    REPORT A SECURITY ISSUE
-</a></p>
-
-<p>We treat all security issues seriously and will try to fix them as soon
-as possible in all affected versions that we still support.</p>
-
-<h3 id="report-normal-bugs-in-jira">Report normal bugs in JIRA</h3>
-
-<p>The Security Team cannot accept regular bug reports or other queries,
-we ask that you use our <a href="/help/#reportbug">bug reporting page</a>
-for normal, non-security bugs.</p>
-
-:ET
\ No newline at end of file
diff --git a/.jekyll-cache/Jekyll/Cache/Jekyll--Converters--Markdown/85/f4035764bad689360ff7f9227bfa3dc588b1bef8ab12d1e7d8a260cc57d36f b/.jekyll-cache/Jekyll/Cache/Jekyll--Converters--Markdown/3a/1ddd94a27668f25de8f2f406cb192948dadf303cb113af070e9332d95fe61e
similarity index 95%
rename from .jekyll-cache/Jekyll/Cache/Jekyll--Converters--Markdown/85/f4035764bad689360ff7f9227bfa3dc588b1bef8ab12d1e7d8a260cc57d36f
rename to .jekyll-cache/Jekyll/Cache/Jekyll--Converters--Markdown/3a/1ddd94a27668f25de8f2f406cb192948dadf303cb113af070e9332d95fe61e
index 7b1f0c6..5b906f3 100644
--- a/.jekyll-cache/Jekyll/Cache/Jekyll--Converters--Markdown/85/f4035764bad689360ff7f9227bfa3dc588b1bef8ab12d1e7d8a260cc57d36f
+++ b/.jekyll-cache/Jekyll/Cache/Jekyll--Converters--Markdown/3a/1ddd94a27668f25de8f2f406cb192948dadf303cb113af070e9332d95fe61e
@@ -1,10 +1,4 @@
-I"%<h2 id="friends">Friends</h2>
-
-<hr />
-<p>layout: default
-title: Friend projects
-subtitle: Apache projects using Wicket 
-—</p>
+I"Ã<h2 id="friends">Friends</h2>
 
 <p>Being a member of the Apache Software Foundation creates opportunities
 for communities to collaborate and stand on one’s shoulders. The
diff --git a/.jekyll-cache/Jekyll/Cache/Jekyll--Converters--Markdown/8d/4bb8d8127c1402c253c4d4bcf8803e836a1c96b5ce1aad6030ff353f410b79 b/.jekyll-cache/Jekyll/Cache/Jekyll--Converters--Markdown/8d/4bb8d8127c1402c253c4d4bcf8803e836a1c96b5ce1aad6030ff353f410b79
deleted file mode 100644
index b6d3aa7..0000000
--- a/.jekyll-cache/Jekyll/Cache/Jekyll--Converters--Markdown/8d/4bb8d8127c1402c253c4d4bcf8803e836a1c96b5ce1aad6030ff353f410b79
+++ /dev/null
@@ -1,81 +0,0 @@
-I"<h2 id="friends">Friends</h2>
-
-<hr />
-<p>layout: default
-title: Friend projects
-subtitle: Apache projects using Wicket 
-—
-Being a member of the Apache Software Foundation creates opportunities
-for communities to collaborate and stand on one’s shoulders. The
-following friends within the Apache community are proud members using
-Wicket.</p>
-
-<h3 id="apache-isis">Apache Isis</h3>
-
-<p><a href="http://isis.apache.org">Apache Isis</a> is a full-stack framework for rapidly developing domain
-driven apps and RESTful APIs in Java. It uses Wicket
-6.x as a <a href="http://isis.apache.org/documentation.html#wicket-viewer">default viewer for Isis domain model</a>.</p>
-
-<h3 id="apache-oodt">Apache OODT</h3>
-
-<p><a href="http://oodt.apache.org">Apache OODT</a> is a data grid framework for transparent search
-and discovery of disparate science resources. It uses Apache Wicket for
-its CAS File Manager and CAS Workflow monitor.</p>
-
-<h3 id="apache-openmeetings">Apache Openmeetings</h3>
-
-<p><a href="http://openmeetings.apache.org">Apache Openmeetings</a> provides video conferencing, instant messaging,
-white board, collaborative document editing and other groupware tools
-using API functions of the Red5 Streaming Server for Remoting and
-Streaming. It uses Apache Wicket for its web interfaces.</p>
-
-<h3 id="apache-syncope">Apache Syncope</h3>
-
-<p><a href="https://syncope.apache.org">Apache Syncope</a> is an Open Source system for managing
-digital identities in enterprise environments. It uses Apache Wicket
-for its <a href="https://syncope.apache.org/architecture.html#The_console">web management console</a>.</p>
-
-<h3 id="apache-nutch">Apache Nutch</h3>
-
-<p><a href="https://nutch.apache.org">Apache Nutch</a> is a well matured, production ready web
-crawler. Since version 2.3 it uses Apache Wicket for its <a href="https://nutch.apache.org/#22-september-2014-wicket-webapp-now-part-of-nutch-2x-codebase">web
-management console</a>.</p>
-
-<h3 id="apache-fortress">Apache Fortress</h3>
-
-<p><a href="https://directory.apache.org/fortress/">Apache Fortress</a> is a standards based and Open Source
-Identity Access Management Java SDK for LDAP v3 compliant systems.
-Fortress is 100% compliant with RBAC, ARBAC02 and IETF’s password
-policy draft. It uses Apache Wicket for its <a href="https://directory.apache.org/fortress/overview.html">RBAC Web Management UI</a>.</p>
-
-<h3 id="apache-asterixdb">Apache AsterixDB</h3>
-
-<p><a href="https://asterixdb.apache.org/">Apache AsterixDB</a>  is a BDMS (Big Data Management System) with a rich 
-feature set that sets it apart from other Big Data platforms. Its submodule Hyracks
-uses Apache Wicket for its administration console.</p>
-
-<h2 id="license">License</h2>
-
-<p>All projects of the Apache Wicket project are licensed using the
-<a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, version 2.0</a> (<a href="http://www.apache.org/licenses/LICENSE-2.0.txt">TXT</a> or
-<a href="http://www.apache.org/licenses/LICENSE-2.0.html">HTML</a>).</p>
-
-<p>You can read more about the current status of the license at the
-<a href="http://www.apache.org/licenses/">foundation license page</a>.</p>
-
-<h2 id="thanks">Thanks</h2>
-
-<p>The Apache Software Foundation could not exist without the continued
-generous support from the community. We would like to take this
-opportunity to thank our <a href="http://apache.org/foundation/thanks.html">Sponsors</a>. If you are
-interested in sponsoring the ASF, please read our <a href="http://www.apache.org/foundation/sponsorship.html">sponsorship page</a>.</p>
-
-<p>The Wicket project would like to thank the following companies for
-their support of the project.</p>
-
-<ul>
-  <li><a href="http://jetbrains.com">JetBrains</a> for their IntelliJ open source license for our developers</li>
-  <li><a href="http://comsysto.com">ComSysto</a> for contributing the User Guide</li>
-</ul>
-
-:ET
\ No newline at end of file
diff --git a/.jekyll-cache/Jekyll/Cache/Jekyll--Converters--Markdown/d2/eb230b5ea748604c1c282fea5b093f8aaa71bf6295e9347c9148d526c00c15 b/.jekyll-cache/Jekyll/Cache/Jekyll--Converters--Markdown/e5/80ec5e22b215cf186be46670539625609060167ca29f82252c9401d633f390
similarity index 97%
rename from .jekyll-cache/Jekyll/Cache/Jekyll--Converters--Markdown/d2/eb230b5ea748604c1c282fea5b093f8aaa71bf6295e9347c9148d526c00c15
rename to .jekyll-cache/Jekyll/Cache/Jekyll--Converters--Markdown/e5/80ec5e22b215cf186be46670539625609060167ca29f82252c9401d633f390
index 44bf0a4..45fa5a4 100644
--- a/.jekyll-cache/Jekyll/Cache/Jekyll--Converters--Markdown/d2/eb230b5ea748604c1c282fea5b093f8aaa71bf6295e9347c9148d526c00c15
+++ b/.jekyll-cache/Jekyll/Cache/Jekyll--Converters--Markdown/e5/80ec5e22b215cf186be46670539625609060167ca29f82252c9401d633f390
@@ -1,4 +1,4 @@
-I"Ä-<div class="l-button-table">
+I"6-<div class="l-button-table">
     <div class="l-two-third">
       <div class="button-bar">
         <a class="button" href="#security"><i class="fa fa-lock"></i><br />Security</a>
@@ -248,12 +248,6 @@
 
 <hr />
 
-<hr />
-<p>layout: default
-title: Get help from companies
-subtitle: When you can’t get help quick enough or you need direct support
-—</p>
-
 <h2 id="commercial">Commercial Wicket Support</h2>
 
 <p>The Wicket community is not only supported by volunteers but several
diff --git a/_includes/friends.md b/_includes/friends.md
index d6695da..87db6ce 100644
--- a/_includes/friends.md
+++ b/_includes/friends.md
@@ -1,8 +1,3 @@
----
-layout: default
-title: Friend projects
-subtitle: Apache projects using Wicket 
----
 
 Being a member of the Apache Software Foundation creates opportunities
 for communities to collaborate and stand on one's shoulders. The
diff --git a/_includes/support.md b/_includes/support.md
index 417d20e..e799463 100644
--- a/_includes/support.md
+++ b/_includes/support.md
@@ -1,8 +1,3 @@
----
-layout: default
-title: Get help from companies
-subtitle: When you can't get help quick enough or you need direct support
----
 
 ## Commercial Wicket Support {#commercial}
 
diff --git a/content/apache/index.html b/content/apache/index.html
index b9e59f6..b1dc8cd 100644
--- a/content/apache/index.html
+++ b/content/apache/index.html
@@ -119,12 +119,6 @@
         <section>
             <h2 id="friends">Friends</h2>
 
-<hr />
-<p>layout: default
-title: Friend projects
-subtitle: Apache projects using Wicket 
-—</p>
-
 <p>Being a member of the Apache Software Foundation creates opportunities
 for communities to collaborate and stand on one’s shoulders. The
 following friends within the Apache community are proud members using
diff --git a/content/atom.xml b/content/atom.xml
index 01ec500..3edfbaa 100644
--- a/content/atom.xml
+++ b/content/atom.xml
@@ -3,7 +3,7 @@
     <title>Apache Wicket</title>
     <link href="http://wicket.apache.org/atom.xml" rel="self"/>
     <link href="http://wicket.apache.org/"/>
-    <updated>2020-06-23T21:03:07+02:00</updated>
+    <updated>2020-06-23T23:34:50+02:00</updated>
     <id>http://wicket.apache.org/</id>
     <author>
         <name>Apache Wicket</name>
diff --git a/content/help/index.html b/content/help/index.html
index 38f7064..2bdb594 100644
--- a/content/help/index.html
+++ b/content/help/index.html
@@ -367,12 +367,6 @@
 
 <hr />
 
-<hr />
-<p>layout: default
-title: Get help from companies
-subtitle: When you can’t get help quick enough or you need direct support
-—</p>
-
 <h2 id="commercial">Commercial Wicket Support</h2>
 
 <p>The Wicket community is not only supported by volunteers but several